promethee 1.6.16 → 1.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e704bb85e5f68b9d1d6fcd2347a22659a6f4925d
-  data.tar.gz: edc127b5995199bfe7261b6c4932729223965034
+  metadata.gz: eadbe1653fb8f723a4c972f26f2af9a415e107ff
+  data.tar.gz: b8bf99925f39eeb1a2800bfb0eb10bfb00ee09d5
 SHA512:
-  metadata.gz: 5119c95e2c68bdbe8cab7b4710aa97da222c6564988ebcc98a98255eb8e3d316376bcd69663c55e5b6b34a50355d2d5d7e52f1adbc8ff4c6dd67d575df44b780
-  data.tar.gz: 1c3a097856ecae048e0b60de4b56bda0cfe6e58c53cd8e11743a0c060dcc7a431159f7b459c921a57fa84d8f96f36bd1760340a1fd0e1cc6bf59a75461fe9f1d
+  metadata.gz: 5c6a02f7fc2f433581233a8d3e7fda86904c9056ebc7530905e009100a5cd67165d35c6e5b76bed559852e81dada85b1eed9a63a42f7f8c64d10ad3d8bbe0589
+  data.tar.gz: 93883a402aeb50f5971b05d5ae7b000034ef2643ddf42287ad840bc781b3040d0ca506f15e6b4f09f2e0c94c61b1dd8e1f58c9cf9f02331a61f1483692489b75

data/README.md

@@ -120,6 +120,15 @@ This would do quite the same thing:
 </form>
 ```
 
+You can specify a preview url:
+
+```erb
+<%= form_for @page do |f| %>
+  <%= f.promethee :data, preview_url: some_preview_path %>
+  <%= f.submit %>
+<% end %>
+```
+
 You can specify a back link url to go to when closing the editor without saving:
 
 ```erb

data/app/assets/stylesheets/promethee-edit/_move.sass

@@ -26,6 +26,37 @@
       font-size: 12px
       line-height: 12px
       z-index: 1
+
+    &--slider
+      .carousel
+        display: flex
+        justify-content: space-around
+        align-items: stretch
+        .col-xs-8, .col-xs-1
+          padding: 0
+
+        .col-xs-1
+          display: flex
+          justify-content: center
+          align-items: center
+      .dots
+        text-align: center
+        margin-top: 5px
+
+        & > span
+          display: inline-block
+          width: 8px
+          height: 8px
+          margin: 0 2px
+          background-color: #aaa
+          border-radius: 50%
+          color: transparent
+
+          &.active
+            background-color: #777
+    &--slider_item
+      .slider-item-text
+        margin: 10px 0 5px 0
   &__columns
     .row
       user-select: none
@@ -61,6 +92,7 @@
     margin-bottom: 5px
   &__component
     user-select: none
+
   &__droppable
     visibility: hidden
     opacity: .2

data/app/views/promethee/_edit.html.erb

@@ -1,5 +1,6 @@
 <%
 promethee_data = Promethee::Data.new master_data
+preview_url ||= promethee_preview_path.to_json.html_safe
 back_url ||= nil
 logo = File.read "#{__dir__}/../../assets/images/icon-promethee.svg"
 %>
@@ -23,7 +24,7 @@ var promethee = angular
 
 <script type="text/javascript">
 promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'presets', '$filter', function($scope, summernoteConfig, presets, $filter) {
-  
+
   $scope.generateIdentifier = function() {
     // https://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
     function s4() {
@@ -62,9 +63,9 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
   };
 
   $scope.findDefinitionByType = function(type) {
-    return $filter('filter')($scope.promethee.definitions, {'data':{'type':type}})[0]; 
+    return $filter('filter')($scope.promethee.definitions, {'data':{'type':type}})[0];
   }
-  
+
   $scope.addComponentByType = function(type, target, index = -1) {
     var definition = $scope.findDefinitionByType(type);
     $scope.addComponent(definition, target, index);
@@ -83,7 +84,7 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     var component = angular.copy(definition.data);
     component.id = $scope.generateIdentifier();
     return component;
-  } 
+  }
 
   $scope.inspect = function(component, event) {
     if(event.target.closest('.promethee-edit__component') === event.currentTarget) {
@@ -101,7 +102,7 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     var form = document.createElement('form');
     document.body.appendChild(form);
     form.method = 'POST';
-    form.action = <%= promethee_preview_path.to_json.html_safe %>;
+    form.action = <%= preview_url %>;
     form.target = target;
 
     var input = document.createElement('input');

data/app/views/promethee/components/aside/_edit.move.html.erb

@@ -6,8 +6,7 @@
         <div  ng-hide="collapsed" 
               ng-bind-html="component.attributes.searchable_collapsed_content | htmlSafe"></div>
         <a    class="btn btn-default btn-block" 
-              ng-click="collapsed = !collapsed" 
-              ng-show="collapsed" 
+              ng-click="collapsed = !collapsed"
               ng-bind-html="component.attributes.searchable_open_label | htmlSafe"></a>
       </aside>
       <aside  ng-hide="component.attributes.searchable_collapsed_content" 

data/app/views/promethee/components/row/_edit.inspect.html.erb

@@ -4,7 +4,7 @@
           ng-click="addComponentByType('column', promethee.inspected.children)">
       Add column
     </div>
-    <div  ng-show="promethee.inspected.children.length > 1">
+    <div ng-show="promethee.inspected.children.length > 1">
       <br><br>
       <label class="label-control">Drag the columns below to reorder them:</label>
       <ul ui-sortable

data/app/views/promethee/components/row/_edit.move.html.erb

@@ -2,13 +2,18 @@
   <%= render 'promethee/edit/move.header', type: 'row' %>
       <div class="header">Row</div>
       <div class="row">
-        <div ng-init="components = component.children">
-          <div ng-repeat="component in components"
-            class="<%= promethee_bem_classes 'promethee-edit__move__draggable', '--{{component.type}}' %>">
-            <ng-include src="'promethee/move/component'"></ng-include>
-          </div>
-        </div>
+         <ng-include src="'promethee/components/row/edit/move/columns'"></ng-include>
       </div>
     </div>
   </div>
 </script>
+
+<script type="text/ng-template" id="promethee/components/row/edit/move/columns">
+  // Scope of components must be local, so the row can be removed from its parent components
+  <div ng-init="components = component.children">
+    <div  ng-repeat="component in components"
+          class="<%= promethee_bem_classes 'promethee-edit__move__draggable', '--{{component.type}}' %>">
+      <ng-include src="'promethee/move/component'"></ng-include>
+    </div>
+  </div>
+</script>

data/app/views/promethee/components/slider/_edit.move.html.erb

@@ -1,11 +1,17 @@
 <script type="text/ng-template" id="promethee/components/slider/edit/move">
   <%= render 'promethee/edit/move.header', type: 'slider' %>
       <div class="header">Slider</div>
-      <div class="row" ng-controller="SliderMoveController">
-        <div class="col-md-2" ng-repeat-start="component in components">
-          <ng-include src="'promethee/move/component'"></ng-include>
+      <div ng-controller="SliderMoveController">
+        <div class="row carousel">
+          <div class="col-xs-1" ng-click="selectedIndex = (selectedIndex == 0) ? (components.length - 1) : (selectedIndex - 1)"><span><</span></div>
+          <div class="col-xs-8" ng-repeat="component in components" ng-show="$index == selectedIndex">
+            <ng-include src="'promethee/move/component'"></ng-include>
+          </div>
+          <div class="col-xs-1" ng-click="selectedIndex = (selectedIndex == components.length - 1) ? 0 : (selectedIndex + 1)"><span>></span></div>
+        </div>
+        <div class="row dots">
+          <span ng-repeat="component in components" ng-click="setIndex($index)" ng-class="($index == selectedIndex) ? 'active' : ''">&bull;</span>
         </div>
-        <div class="clearfix" ng-if="$index%6 === 5" ng-repeat-end></div>
       </div>
     </div>
   </div>
@@ -15,5 +21,10 @@
   promethee.controller('SliderMoveController', ['$scope', function($scope) {
     $scope.parent = $scope.component;
     $scope.components = $scope.component.children;
+    $scope.selectedIndex = 0
+
+    $scope.setIndex = function(index) {
+      $scope.selectedIndex = index
+    }
   }]);
 </script>

data/app/views/promethee/components/slider_item/_edit.move.html.erb

@@ -7,7 +7,7 @@
             <ng-include src="'promethee/move/component'"></ng-include>
           </div>
         </div>
-        <div class="col-xs-12" ng-show="component.attributes.text !== ''">Text</div>
+        <div class="col-xs-12 slider-item-text" ng-show="component.attributes.text !== ''">Text</div>
       </div>
     </div>
   </div>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.6.16'
+    VERSION = '1.6.18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.6.16
+  version: 1.6.18
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails