promethee 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08125f7faef9badeece264244f72637423f7d1a2'
-  data.tar.gz: ba33475c608f571f6d580fa735b3eca2ae3fedea
+  metadata.gz: '088c2f96fdd7c4aa85f66ffeba61f607c43c6267'
+  data.tar.gz: 23845bd663c225840b4f6622043b4a2bfa5b41c3
 SHA512:
-  metadata.gz: 8effce622206394fe1ce63d9733e17ec318804678202a0045a3730bcfcb3fbeeea9f3ac8e5c417f8f1ff68a6f2949d46309012192769900f20ad8012d1794dbb
-  data.tar.gz: efe0fa99fa56e87bb900577232ab5207da410e46d4aeed941a78a3c60475449098c932b445e8727d5c82ed860fc4a6b086839942e960a96e1bbdca5071124375
+  metadata.gz: 8b79c7e2683f66661fc7cd21d2e67d90ac704d3906f1b6dd2ea6f063d52ff00561b21a9bcc19100345239d7770f6e6f9707e355d9d7199e45641d2db0b1c9411
+  data.tar.gz: e4c29abb2873d467bf297fcb2f46a2aa9ae4eda43fb3ce2c11235ebe958119c207a1a3a64144df80e19a1f278feec3930e0f5d8b99c2d1ced7920df219c37b5d

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

@@ -3,11 +3,13 @@
     promethee.definitions.push({
       name: 'Aside',
       icon: #{render('promethee/components/aside/icon').to_json.html_safe},
+      position: 30,
       data: {
         type: 'aside',
         attributes: {
           visible_content: '<p>Edit me</p>',
-          collapsed_content: ''
+          collapsed_content: '',
+          open_label: 'See more'
         },
         children: []
       }

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

@@ -8,4 +8,9 @@
     <label class="label-control">Collapsed content</label>
     <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.collapsed_content"></summernote>
   </div>
+
+  <div class="form-group">
+    <label class="label-control">Button label</label>
+    <input ng-model="promethee.inspected.attributes.open_label" class="form-control" type="text"/>
+  </div>
 </script>

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

@@ -3,7 +3,7 @@
       <aside ng-show="component.attributes.collapsed_content" ng-init="collapsed = true">
         <div ng-bind-html="component.attributes.visible_content | htmlSafe"></div>
         <div ng-hide="collapsed" ng-bind-html="component.attributes.collapsed_content | htmlSafe"></div>
-        <a class="btn btn-default btn-block" ng-click="collapsed = !collapsed">{{collapsed ? 'Read more' : 'Reduce'}}</a>
+        <a class="btn btn-default btn-block" ng-click="collapsed = !collapsed" ng-show="collapsed" ng-bind-html="component.attributes.open_label | htmlSafe"></a>
       </aside>
 
       <aside ng-hide="component.attributes.collapsed_content" ng-bind-html="component.attributes.visible_content | htmlSafe"></aside>

data/app/views/promethee/components/aside/_show.html.erb

@@ -11,10 +11,9 @@ open_label = component[:attributes][:open_label].to_s
     <div class="collapse" id="aside-collapse-<%= component[:id] %>">
       <%= collapsed_content.html_safe %>
     </div>
-    <div>
-      <a class="collapse show" href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse" onclick="$(this).collapse('hide')">
-        <%= open_label %>
-      </a>
+    <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;">
+      <a href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse"><%= open_label %></a>
     </div>
+
   <% end %>
 </aside>

data/app/views/promethee/components/collection/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Collection',
       icon: #{render('promethee/components/collection/icon').to_json.html_safe},
+      position: 20,
       data: {
         type: 'collection',
         attributes: {

data/app/views/promethee/components/column/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Column',
       icon: #{render('promethee/components/column/icon').to_json.html_safe},
+      position: -1,
       data: {
         type: 'column',
         attributes: {

data/app/views/promethee/components/cover/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Cover',
       icon: #{render('promethee/components/cover/icon').to_json.html_safe},
+      position: 10,
       data: {
         type: 'cover',
         attributes: {

data/app/views/promethee/components/image/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Image',
       icon: #{render('promethee/components/image/icon').to_json.html_safe},
+      position: 2,
       data: {
         type: 'image',
         attributes: {

data/app/views/promethee/components/image/_localize.html.erb

@@ -23,12 +23,12 @@
 
     <div class="row" ng-show="component.master.attributes.caption">
       <div class="col-md-6">
-        <b>Description</b>
+        <b>Caption</b>
         <p>{{component.master.attributes.caption}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Description</label>
+          <label class="label-control">Caption</label>
           <input class="form-control" ng-model="component.attributes.caption" type="text">
         </div>
       </div>

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

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Row',
       icon: #{render('promethee/components/row/icon').to_json.html_safe},
+      position: -2,
       data: {
         type: 'row',
         attributes: {},

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

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Slider',
       icon: #{render('promethee/components/slider/icon').to_json.html_safe},
+      position: 15,
       data: {
         type: 'slider',
         attributes: {

data/app/views/promethee/components/text/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Text',
       icon: #{render('promethee/components/text/icon').to_json.html_safe},
+      position: 1,
       data: {
         type: 'text',
         attributes: {

data/app/views/promethee/components/video/_edit.define.html.erb

@@ -3,6 +3,7 @@
     promethee.definitions.push({
       name: 'Video',
       icon: #{render('promethee/components/video/icon').to_json.html_safe},
+      position: 3,
       data: {
         type: 'video',
         attributes: {

data/app/views/promethee/edit/_move.html.erb

@@ -41,6 +41,7 @@ promethee
             $('.promethee-edit__move').addClass('promethee-edit__move--dragging promethee-edit__move--dragging--' + type);
             var listId = $elementDragged.data('list-id');
             var listIndex = $elementDragged.data('list-index');
+            // FIXME no jquery hide
             $('.promethee-edit__move__droppable[data-id="' + listId + '"][data-index="' + listIndex + '"]').hide();
           },
           stop: function() {
@@ -49,6 +50,7 @@ promethee
             $('.promethee-edit__move').removeClass('promethee-edit__move--dragging promethee-edit__move--dragging--' + type);
             var listId = $elementDragged.data('list-id');
             var listIndex = $elementDragged.data('list-index');
+            // FIXME no jquery show
             $('.promethee-edit__move__droppable[data-id="' + listId + '"][data-index="' + listIndex + '"]').show();
           }
         });
@@ -117,7 +119,7 @@ promethee
             droppedToList.splice(droppedToIndex, 0, component);
 
             scope.promethee.inspected = component
-            
+
             scope.$apply();
           }
         });
@@ -132,7 +134,7 @@ promethee
     <div class="promethee-edit__library-header">Library</div>
     <div class="promethee-edit__library-content">
       <div class="row">
-        <div  ng-repeat="definition in promethee.definitions"
+        <div  ng-repeat="definition in promethee.definitions | orderBy:'position'"
               class="col-md-12 col-lg-6">
           <div  addable
                 class="promethee-edit__library__item"
@@ -146,7 +148,7 @@ promethee
     <div class="promethee-edit__library-header">Presets</div>
     <div class="promethee-edit__library-content">
       <div class="row">
-        <div ng-repeat="preset in promethee.presets" class="col-md-12 col-lg-6">
+        <div ng-repeat="preset in promethee.presets | orderBy:'position'" class="col-md-12 col-lg-6">
           <div addable class="promethee-edit__library__item" data-type="text" data-preset="{{preset.name}}">
             <div class="promethee-edit__library__item__icon" ng-bind-html="preset.icon | htmlSafe"></div>
             <div class="promethee-edit__library__item__name">{{preset.name}}</div>
@@ -166,7 +168,7 @@ promethee
     </div>
     <div class="promethee-edit__inspect-content">
       <ng-include src="'promethee/components/page/edit/inspect'" ng-show="promethee.inspected.type == 'page'"></ng-include>
-      <div ng-repeat="definition in promethee.definitions">
+      <div ng-repeat="definition in promethee.definitions | orderBy:'position'">
         <ng-include src="'promethee/components/' + definition.data.type + '/edit/inspect'"
                     ng-show="promethee.inspected.type == definition.data.type"></ng-include>
       </div>

data/app/views/promethee/presets/_image-with-text.html.erb

@@ -2,6 +2,7 @@
   angular.injector(['ng', 'Promethee']).get('presets').push({
     name: 'Image with text',
     icon: <%= render('promethee/presets/icon.image-with-text').to_json.html_safe %>,
+    position: 1,
     components: [
       {
         "type": "row",

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.6.5'
+    VERSION = '1.6.6'
   end
 end

metadata

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