promethee 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3977c58139169819464ec50d1e2350fce2269254
-  data.tar.gz: 25dd886efeabf6883ab05a93ac28edc930ad3e90
+  metadata.gz: 0e9310c26b839c49494d9aceffa60d8b46e37281
+  data.tar.gz: ac9017a60e6e5a019af5a7426575cbb0befb38a8
 SHA512:
-  metadata.gz: 608d2eedee387ea5e7e7dc2228030851dabb07b1623010aa28ba66fd0a3764cfffcfdba17c25ec2554435984037d6275ed20b14c72e7dadf7f1dfafc9dca1933
-  data.tar.gz: b4572f476050c5d1502c0e768b9e23ae0b0b21107b43b7866bc17463c0e0c9360db1978f0cc6a13134602afb469b34aac74080697e86145d06ca0afb0fb3096a
+  metadata.gz: 6cf9bbb70156397ace563ea34180c012b37ca8155b0d1f55cb367f362b05ea1eed917b983aa3d873a03ee83a2976f4c6813271a0c3ff14d48c4566a6fff78e0d
+  data.tar.gz: f2fc6e21b5635adb1c66a271f576c95976a1c8ae65e95327f6606dd989a448026789493e052ea333f17f3de4dac2b362fabad66493b5baa68127968716b755f6

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

@@ -10,12 +10,20 @@
   </div>
 
   <div class="form-group">
-    <label class="label-control">Alt</label>
-    <input class="form-control" ng-model="promethee.inspected.attributes.alt">
+    <label class="label-control">Caption</label>
+    <input class="form-control" ng-model="promethee.inspected.attributes.caption">
   </div>
 
-  <div class="form-group">
-    <label class="label-control">Caption</label>
-    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.caption"></summernote>
+  <div class="panel panel-default" ng-init="advancedConfigurationOpen = false">
+    <div class="panel-heading" ng-click="advancedConfigurationOpen = !advancedConfigurationOpen">
+      Advanced configuration
+      <%= fa_icon 'angle-down', class: 'fa-pull-right', 'ng-class': "{'fa-rotate-180': advancedConfigurationOpen}", style: 'font-size: 18px' %>
+    </div>
+    <div class="panel-body" ng-show="advancedConfigurationOpen">
+      <div class="form-group">
+        <label class="label-control">Alt</label>
+        <input class="form-control" ng-model="promethee.inspected.attributes.alt">
+      </div>
+    </div>
   </div>
 </script>

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

@@ -4,9 +4,9 @@
         <img  ng-src="/promethee/blob/{{component.attributes.blob.id}}"
               class="img-responsive">
         <figcaption ng-show="component.attributes.caption"
-                    ng-bind-html="component.attributes.caption | htmlSafe"></figcaption>
+                    ng-bind-html="component.attributes.caption"></figcaption>
       </figure>
-      <div  ng-hide="component.attributes.blob.id">
+      <div  ng-hide="component.attributes.blob_id">
         <p  ng-hide="editing"
             class="text-center">Click to set the image</p>
       </div>

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

@@ -7,8 +7,6 @@ caption = component[:attributes][:caption].to_s
 <figure class="<%= promethee_class_for component %>">
   <%= image_tag url_for(blob.variant(resize: '1920')), class: 'img-responsive', alt: alt if blob %>
   <% if caption.present? %>
-    <figcaption>
-      <%= caption.html_safe %>
-    </figcaption>
+    <figcaption><%= caption %></figcaption>
   <% end %>
 </figure>

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

@@ -5,7 +5,9 @@
       icon: #{render('promethee/components/slider/icon').to_json.html_safe},
       data: {
         type: 'slider',
-        attributes: {},
+        attributes: {
+          contents: {}
+        },
         children: []
       }
     })

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

@@ -1,11 +1,11 @@
 <script type="text/ng-template" id="promethee/components/slider/edit/inspect">
-  <div ui-sortable ng-model="promethee.inspected.children">
+  <div ui-sortable="{handle: '.handle'}" ng-model="promethee.inspected.children">
     <div
       class="panel panel-default"
       ng-repeat="component in promethee.inspected.children"
     >
       <div class="panel-body">
-        <div class="row">
+        <div class="row handle">
           <div class="col-xs-9">
             <span class="label label-default">#{{$index + 1}}</span>
             <span class="label label-info">{{component.type}}</span>
@@ -14,6 +14,15 @@
             <ng-include src="'promethee/move/component'"></ng-include>
           </div>
         </div>
+
+        <div class="row">
+          <div class="col-xs-12">
+            <div class="form-group">
+              <label class="label-control">Text</label>
+              <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.contents['content-' + component.id]"></summernote>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -33,7 +42,7 @@
 
     var clone = function(object) {
       return JSON.parse(JSON.stringify(object));
-    }
+    };
 
     $scope.addItem = function(definition) {
       var item = JSON.parse(JSON.stringify(definition.data));

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

@@ -16,5 +16,17 @@
     $scope.parent_id = $scope.component.id;
     $scope.parent_type = $scope.component.type;
     $scope.components = $scope.component.children;
+
+    $scope.$watch('component.children.length', function() {
+      console.log('watch');
+
+      var keys = $scope.component.children.map(function(component) {
+        return 'content-' + component.id;
+      });
+
+      for(var key in $scope.component.attributes.contents) {
+        if(!keys.includes(key)) delete $scope.component.attributes.contents[key];
+      }
+    });
   }]);
 </script>

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

@@ -1,3 +1,13 @@
 <script type="text/ng-template" id="promethee/components/slider/localize">
-
+  <div ng-repeat="key, content in component.master.attributes.contents">
+    <hr>
+    <div class="row">
+      <div class="col-md-6">
+        <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.contents[key] | htmlSafe"></div>
+      </div>
+      <div class="col-md-6" ng-prevent-drag="true">
+        <summernote config="options" ng-model="component.attributes.contents[key]"></summernote>
+      </div>
+    </div>
+  </div>
 </script>

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

@@ -3,6 +3,7 @@
     <% component[:children].each.with_index do |child, n| %>
       <div class="item<%= ' active' if n.zero? %>">
         <%= render 'promethee/show/component', component: child %>
+        <%= component[:attributes].dig(:contents, :"content-#{child.id}").to_s.html_safe %>
       </div>
     <% end %>
   </div>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Julien Dargelos
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page