promethee 1.6.5 → 1.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: '08125f7faef9badeece264244f72637423f7d1a2'
4
- data.tar.gz: ba33475c608f571f6d580fa735b3eca2ae3fedea
3
+ metadata.gz: '088c2f96fdd7c4aa85f66ffeba61f607c43c6267'
4
+ data.tar.gz: 23845bd663c225840b4f6622043b4a2bfa5b41c3
5
5
  SHA512:
6
- metadata.gz: 8effce622206394fe1ce63d9733e17ec318804678202a0045a3730bcfcb3fbeeea9f3ac8e5c417f8f1ff68a6f2949d46309012192769900f20ad8012d1794dbb
7
- data.tar.gz: efe0fa99fa56e87bb900577232ab5207da410e46d4aeed941a78a3c60475449098c932b445e8727d5c82ed860fc4a6b086839942e960a96e1bbdca5071124375
6
+ metadata.gz: 8b79c7e2683f66661fc7cd21d2e67d90ac704d3906f1b6dd2ea6f063d52ff00561b21a9bcc19100345239d7770f6e6f9707e355d9d7199e45641d2db0b1c9411
7
+ data.tar.gz: e4c29abb2873d467bf297fcb2f46a2aa9ae4eda43fb3ce2c11235ebe958119c207a1a3a64144df80e19a1f278feec3930e0f5d8b99c2d1ced7920df219c37b5d
@@ -3,11 +3,13 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Aside',
5
5
  icon: #{render('promethee/components/aside/icon').to_json.html_safe},
6
+ position: 30,
6
7
  data: {
7
8
  type: 'aside',
8
9
  attributes: {
9
10
  visible_content: '<p>Edit me</p>',
10
- collapsed_content: ''
11
+ collapsed_content: '',
12
+ open_label: 'See more'
11
13
  },
12
14
  children: []
13
15
  }
@@ -8,4 +8,9 @@
8
8
  <label class="label-control">Collapsed content</label>
9
9
  <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.collapsed_content"></summernote>
10
10
  </div>
11
+
12
+ <div class="form-group">
13
+ <label class="label-control">Button label</label>
14
+ <input ng-model="promethee.inspected.attributes.open_label" class="form-control" type="text"/>
15
+ </div>
11
16
  </script>
@@ -3,7 +3,7 @@
3
3
  <aside ng-show="component.attributes.collapsed_content" ng-init="collapsed = true">
4
4
  <div ng-bind-html="component.attributes.visible_content | htmlSafe"></div>
5
5
  <div ng-hide="collapsed" ng-bind-html="component.attributes.collapsed_content | htmlSafe"></div>
6
- <a class="btn btn-default btn-block" ng-click="collapsed = !collapsed">{{collapsed ? 'Read more' : 'Reduce'}}</a>
6
+ <a class="btn btn-default btn-block" ng-click="collapsed = !collapsed" ng-show="collapsed" ng-bind-html="component.attributes.open_label | htmlSafe"></a>
7
7
  </aside>
8
8
 
9
9
  <aside ng-hide="component.attributes.collapsed_content" ng-bind-html="component.attributes.visible_content | htmlSafe"></aside>
@@ -11,10 +11,9 @@ open_label = component[:attributes][:open_label].to_s
11
11
  <div class="collapse" id="aside-collapse-<%= component[:id] %>">
12
12
  <%= collapsed_content.html_safe %>
13
13
  </div>
14
- <div>
15
- <a class="collapse show" href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse" onclick="$(this).collapse('hide')">
16
- <%= open_label %>
17
- </a>
14
+ <div id="aside-open-<%= component[:id] %>" class="collapse show in" data-toggle="collapse" class="collapse show" data-target="#aside-open-<%= component[:id] %>" aria-expanded="true" style="overflow: hidden;">
15
+ <a href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse"><%= open_label %></a>
18
16
  </div>
17
+
19
18
  <% end %>
20
19
  </aside>
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Collection',
5
5
  icon: #{render('promethee/components/collection/icon').to_json.html_safe},
6
+ position: 20,
6
7
  data: {
7
8
  type: 'collection',
8
9
  attributes: {
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Column',
5
5
  icon: #{render('promethee/components/column/icon').to_json.html_safe},
6
+ position: -1,
6
7
  data: {
7
8
  type: 'column',
8
9
  attributes: {
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Cover',
5
5
  icon: #{render('promethee/components/cover/icon').to_json.html_safe},
6
+ position: 10,
6
7
  data: {
7
8
  type: 'cover',
8
9
  attributes: {
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Image',
5
5
  icon: #{render('promethee/components/image/icon').to_json.html_safe},
6
+ position: 2,
6
7
  data: {
7
8
  type: 'image',
8
9
  attributes: {
@@ -23,12 +23,12 @@
23
23
 
24
24
  <div class="row" ng-show="component.master.attributes.caption">
25
25
  <div class="col-md-6">
26
- <b>Description</b>
26
+ <b>Caption</b>
27
27
  <p>{{component.master.attributes.caption}}</p>
28
28
  </div>
29
29
  <div class="col-md-6">
30
30
  <div class="form-group">
31
- <label class="label-control">Description</label>
31
+ <label class="label-control">Caption</label>
32
32
  <input class="form-control" ng-model="component.attributes.caption" type="text">
33
33
  </div>
34
34
  </div>
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Row',
5
5
  icon: #{render('promethee/components/row/icon').to_json.html_safe},
6
+ position: -2,
6
7
  data: {
7
8
  type: 'row',
8
9
  attributes: {},
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Slider',
5
5
  icon: #{render('promethee/components/slider/icon').to_json.html_safe},
6
+ position: 15,
6
7
  data: {
7
8
  type: 'slider',
8
9
  attributes: {
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Text',
5
5
  icon: #{render('promethee/components/text/icon').to_json.html_safe},
6
+ position: 1,
6
7
  data: {
7
8
  type: 'text',
8
9
  attributes: {
@@ -3,6 +3,7 @@
3
3
  promethee.definitions.push({
4
4
  name: 'Video',
5
5
  icon: #{render('promethee/components/video/icon').to_json.html_safe},
6
+ position: 3,
6
7
  data: {
7
8
  type: 'video',
8
9
  attributes: {
@@ -41,6 +41,7 @@ promethee
41
41
  $('.promethee-edit__move').addClass('promethee-edit__move--dragging promethee-edit__move--dragging--' + type);
42
42
  var listId = $elementDragged.data('list-id');
43
43
  var listIndex = $elementDragged.data('list-index');
44
+ // FIXME no jquery hide
44
45
  $('.promethee-edit__move__droppable[data-id="' + listId + '"][data-index="' + listIndex + '"]').hide();
45
46
  },
46
47
  stop: function() {
@@ -49,6 +50,7 @@ promethee
49
50
  $('.promethee-edit__move').removeClass('promethee-edit__move--dragging promethee-edit__move--dragging--' + type);
50
51
  var listId = $elementDragged.data('list-id');
51
52
  var listIndex = $elementDragged.data('list-index');
53
+ // FIXME no jquery show
52
54
  $('.promethee-edit__move__droppable[data-id="' + listId + '"][data-index="' + listIndex + '"]').show();
53
55
  }
54
56
  });
@@ -117,7 +119,7 @@ promethee
117
119
  droppedToList.splice(droppedToIndex, 0, component);
118
120
 
119
121
  scope.promethee.inspected = component
120
-
122
+
121
123
  scope.$apply();
122
124
  }
123
125
  });
@@ -132,7 +134,7 @@ promethee
132
134
  <div class="promethee-edit__library-header">Library</div>
133
135
  <div class="promethee-edit__library-content">
134
136
  <div class="row">
135
- <div ng-repeat="definition in promethee.definitions"
137
+ <div ng-repeat="definition in promethee.definitions | orderBy:'position'"
136
138
  class="col-md-12 col-lg-6">
137
139
  <div addable
138
140
  class="promethee-edit__library__item"
@@ -146,7 +148,7 @@ promethee
146
148
  <div class="promethee-edit__library-header">Presets</div>
147
149
  <div class="promethee-edit__library-content">
148
150
  <div class="row">
149
- <div ng-repeat="preset in promethee.presets" class="col-md-12 col-lg-6">
151
+ <div ng-repeat="preset in promethee.presets | orderBy:'position'" class="col-md-12 col-lg-6">
150
152
  <div addable class="promethee-edit__library__item" data-type="text" data-preset="{{preset.name}}">
151
153
  <div class="promethee-edit__library__item__icon" ng-bind-html="preset.icon | htmlSafe"></div>
152
154
  <div class="promethee-edit__library__item__name">{{preset.name}}</div>
@@ -166,7 +168,7 @@ promethee
166
168
  </div>
167
169
  <div class="promethee-edit__inspect-content">
168
170
  <ng-include src="'promethee/components/page/edit/inspect'" ng-show="promethee.inspected.type == 'page'"></ng-include>
169
- <div ng-repeat="definition in promethee.definitions">
171
+ <div ng-repeat="definition in promethee.definitions | orderBy:'position'">
170
172
  <ng-include src="'promethee/components/' + definition.data.type + '/edit/inspect'"
171
173
  ng-show="promethee.inspected.type == definition.data.type"></ng-include>
172
174
  </div>
@@ -2,6 +2,7 @@
2
2
  angular.injector(['ng', 'Promethee']).get('presets').push({
3
3
  name: 'Image with text',
4
4
  icon: <%= render('promethee/presets/icon.image-with-text').to_json.html_safe %>,
5
+ position: 1,
5
6
  components: [
6
7
  {
7
8
  "type": "row",
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.6.5'
3
+ VERSION = '1.6.6'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: promethee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.5
4
+ version: 1.6.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2018-05-31 00:00:00.000000000 Z
16
+ date: 2018-06-07 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails