promethee 1.6.16 → 1.6.18

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: e704bb85e5f68b9d1d6fcd2347a22659a6f4925d
4
- data.tar.gz: edc127b5995199bfe7261b6c4932729223965034
3
+ metadata.gz: eadbe1653fb8f723a4c972f26f2af9a415e107ff
4
+ data.tar.gz: b8bf99925f39eeb1a2800bfb0eb10bfb00ee09d5
5
5
  SHA512:
6
- metadata.gz: 5119c95e2c68bdbe8cab7b4710aa97da222c6564988ebcc98a98255eb8e3d316376bcd69663c55e5b6b34a50355d2d5d7e52f1adbc8ff4c6dd67d575df44b780
7
- data.tar.gz: 1c3a097856ecae048e0b60de4b56bda0cfe6e58c53cd8e11743a0c060dcc7a431159f7b459c921a57fa84d8f96f36bd1760340a1fd0e1cc6bf59a75461fe9f1d
6
+ metadata.gz: 5c6a02f7fc2f433581233a8d3e7fda86904c9056ebc7530905e009100a5cd67165d35c6e5b76bed559852e81dada85b1eed9a63a42f7f8c64d10ad3d8bbe0589
7
+ data.tar.gz: 93883a402aeb50f5971b05d5ae7b000034ef2643ddf42287ad840bc781b3040d0ca506f15e6b4f09f2e0c94c61b1dd8e1f58c9cf9f02331a61f1483692489b75
data/README.md CHANGED
@@ -120,6 +120,15 @@ This would do quite the same thing:
120
120
  </form>
121
121
  ```
122
122
 
123
+ You can specify a preview url:
124
+
125
+ ```erb
126
+ <%= form_for @page do |f| %>
127
+ <%= f.promethee :data, preview_url: some_preview_path %>
128
+ <%= f.submit %>
129
+ <% end %>
130
+ ```
131
+
123
132
  You can specify a back link url to go to when closing the editor without saving:
124
133
 
125
134
  ```erb
@@ -26,6 +26,37 @@
26
26
  font-size: 12px
27
27
  line-height: 12px
28
28
  z-index: 1
29
+
30
+ &--slider
31
+ .carousel
32
+ display: flex
33
+ justify-content: space-around
34
+ align-items: stretch
35
+ .col-xs-8, .col-xs-1
36
+ padding: 0
37
+
38
+ .col-xs-1
39
+ display: flex
40
+ justify-content: center
41
+ align-items: center
42
+ .dots
43
+ text-align: center
44
+ margin-top: 5px
45
+
46
+ & > span
47
+ display: inline-block
48
+ width: 8px
49
+ height: 8px
50
+ margin: 0 2px
51
+ background-color: #aaa
52
+ border-radius: 50%
53
+ color: transparent
54
+
55
+ &.active
56
+ background-color: #777
57
+ &--slider_item
58
+ .slider-item-text
59
+ margin: 10px 0 5px 0
29
60
  &__columns
30
61
  .row
31
62
  user-select: none
@@ -61,6 +92,7 @@
61
92
  margin-bottom: 5px
62
93
  &__component
63
94
  user-select: none
95
+
64
96
  &__droppable
65
97
  visibility: hidden
66
98
  opacity: .2
@@ -1,5 +1,6 @@
1
1
  <%
2
2
  promethee_data = Promethee::Data.new master_data
3
+ preview_url ||= promethee_preview_path.to_json.html_safe
3
4
  back_url ||= nil
4
5
  logo = File.read "#{__dir__}/../../assets/images/icon-promethee.svg"
5
6
  %>
@@ -23,7 +24,7 @@ var promethee = angular
23
24
 
24
25
  <script type="text/javascript">
25
26
  promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'presets', '$filter', function($scope, summernoteConfig, presets, $filter) {
26
-
27
+
27
28
  $scope.generateIdentifier = function() {
28
29
  // https://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
29
30
  function s4() {
@@ -62,9 +63,9 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
62
63
  };
63
64
 
64
65
  $scope.findDefinitionByType = function(type) {
65
- return $filter('filter')($scope.promethee.definitions, {'data':{'type':type}})[0];
66
+ return $filter('filter')($scope.promethee.definitions, {'data':{'type':type}})[0];
66
67
  }
67
-
68
+
68
69
  $scope.addComponentByType = function(type, target, index = -1) {
69
70
  var definition = $scope.findDefinitionByType(type);
70
71
  $scope.addComponent(definition, target, index);
@@ -83,7 +84,7 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
83
84
  var component = angular.copy(definition.data);
84
85
  component.id = $scope.generateIdentifier();
85
86
  return component;
86
- }
87
+ }
87
88
 
88
89
  $scope.inspect = function(component, event) {
89
90
  if(event.target.closest('.promethee-edit__component') === event.currentTarget) {
@@ -101,7 +102,7 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
101
102
  var form = document.createElement('form');
102
103
  document.body.appendChild(form);
103
104
  form.method = 'POST';
104
- form.action = <%= promethee_preview_path.to_json.html_safe %>;
105
+ form.action = <%= preview_url %>;
105
106
  form.target = target;
106
107
 
107
108
  var input = document.createElement('input');
@@ -6,8 +6,7 @@
6
6
  <div ng-hide="collapsed"
7
7
  ng-bind-html="component.attributes.searchable_collapsed_content | htmlSafe"></div>
8
8
  <a class="btn btn-default btn-block"
9
- ng-click="collapsed = !collapsed"
10
- ng-show="collapsed"
9
+ ng-click="collapsed = !collapsed"
11
10
  ng-bind-html="component.attributes.searchable_open_label | htmlSafe"></a>
12
11
  </aside>
13
12
  <aside ng-hide="component.attributes.searchable_collapsed_content"
@@ -4,7 +4,7 @@
4
4
  ng-click="addComponentByType('column', promethee.inspected.children)">
5
5
  Add column
6
6
  </div>
7
- <div ng-show="promethee.inspected.children.length > 1">
7
+ <div ng-show="promethee.inspected.children.length > 1">
8
8
  <br><br>
9
9
  <label class="label-control">Drag the columns below to reorder them:</label>
10
10
  <ul ui-sortable
@@ -2,13 +2,18 @@
2
2
  <%= render 'promethee/edit/move.header', type: 'row' %>
3
3
  <div class="header">Row</div>
4
4
  <div class="row">
5
- <div ng-init="components = component.children">
6
- <div ng-repeat="component in components"
7
- class="<%= promethee_bem_classes 'promethee-edit__move__draggable', '--{{component.type}}' %>">
8
- <ng-include src="'promethee/move/component'"></ng-include>
9
- </div>
10
- </div>
5
+ <ng-include src="'promethee/components/row/edit/move/columns'"></ng-include>
11
6
  </div>
12
7
  </div>
13
8
  </div>
14
9
  </script>
10
+
11
+ <script type="text/ng-template" id="promethee/components/row/edit/move/columns">
12
+ // Scope of components must be local, so the row can be removed from its parent components
13
+ <div ng-init="components = component.children">
14
+ <div ng-repeat="component in components"
15
+ class="<%= promethee_bem_classes 'promethee-edit__move__draggable', '--{{component.type}}' %>">
16
+ <ng-include src="'promethee/move/component'"></ng-include>
17
+ </div>
18
+ </div>
19
+ </script>
@@ -1,11 +1,17 @@
1
1
  <script type="text/ng-template" id="promethee/components/slider/edit/move">
2
2
  <%= render 'promethee/edit/move.header', type: 'slider' %>
3
3
  <div class="header">Slider</div>
4
- <div class="row" ng-controller="SliderMoveController">
5
- <div class="col-md-2" ng-repeat-start="component in components">
6
- <ng-include src="'promethee/move/component'"></ng-include>
4
+ <div ng-controller="SliderMoveController">
5
+ <div class="row carousel">
6
+ <div class="col-xs-1" ng-click="selectedIndex = (selectedIndex == 0) ? (components.length - 1) : (selectedIndex - 1)"><span><</span></div>
7
+ <div class="col-xs-8" ng-repeat="component in components" ng-show="$index == selectedIndex">
8
+ <ng-include src="'promethee/move/component'"></ng-include>
9
+ </div>
10
+ <div class="col-xs-1" ng-click="selectedIndex = (selectedIndex == components.length - 1) ? 0 : (selectedIndex + 1)"><span>></span></div>
11
+ </div>
12
+ <div class="row dots">
13
+ <span ng-repeat="component in components" ng-click="setIndex($index)" ng-class="($index == selectedIndex) ? 'active' : ''">&bull;</span>
7
14
  </div>
8
- <div class="clearfix" ng-if="$index%6 === 5" ng-repeat-end></div>
9
15
  </div>
10
16
  </div>
11
17
  </div>
@@ -15,5 +21,10 @@
15
21
  promethee.controller('SliderMoveController', ['$scope', function($scope) {
16
22
  $scope.parent = $scope.component;
17
23
  $scope.components = $scope.component.children;
24
+ $scope.selectedIndex = 0
25
+
26
+ $scope.setIndex = function(index) {
27
+ $scope.selectedIndex = index
28
+ }
18
29
  }]);
19
30
  </script>
@@ -7,7 +7,7 @@
7
7
  <ng-include src="'promethee/move/component'"></ng-include>
8
8
  </div>
9
9
  </div>
10
- <div class="col-xs-12" ng-show="component.attributes.text !== ''">Text</div>
10
+ <div class="col-xs-12 slider-item-text" ng-show="component.attributes.text !== ''">Text</div>
11
11
  </div>
12
12
  </div>
13
13
  </div>
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.6.16'
3
+ VERSION = '1.6.18'
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.16
4
+ version: 1.6.18
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-06-13 00:00:00.000000000 Z
16
+ date: 2018-06-14 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails