promethee 1.6.14 → 1.6.16

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

@@ -4,10 +4,8 @@
       <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-bind-html="parent.attributes.contents['content-' + component.id] | htmlSafe"></div>
         </div>
         <div class="clearfix" ng-if="$index%6 === 5" ng-repeat-end></div>
-        <pre class="hidden">{{component.attributes.search = concatenateChildrenSearch(component)}}</pre>
       </div>
     </div>
   </div>
@@ -16,18 +14,6 @@
 <script>
   promethee.controller('SliderMoveController', ['$scope', function($scope) {
     $scope.parent = $scope.component;
-    $scope.parent_id = $scope.component.id;
-    $scope.parent_type = $scope.component.type;
     $scope.components = $scope.component.children;
-
-    $scope.$watch('component.children.length', function() {
-      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/_show.html.erb

@@ -1,10 +1,9 @@
 <div id="slider-<%= component[:id] %>" class="carousel slide <%= promethee_class_for component %>" data-ride="carousel">
   <div class="carousel-inner">
-    <% 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>
+    <% component[:children].each.with_index do |item, n| %>
+    <div class="item<%= ' active' if n.zero? %>">
+      <%= render 'promethee/show/component', component: item %>
+    </div>
     <% end %>
   </div>
 

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

@@ -0,0 +1,18 @@
+<%
+  init = <<~JAVASCRIPT
+    promethee.definitions.push({
+      name: 'Slider Item',
+      icon: #{ promethee_component_render_icon 'slider' },
+      position: 15,
+      library: false,
+      data: {
+        type: 'slider_item',
+        attributes: {
+          media: {},
+          text: ""
+        }
+      }
+    })
+  JAVASCRIPT
+%>
+<div ng-init="<%= init %>"></div>

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

@@ -0,0 +1,52 @@
+<script type="text/ng-template" id="promethee/components/slider_item/edit/inspect">
+  <div ng-if="promethee.inspected.attributes.media.type !== undefined">
+    <div class="row" ng-controller="SliderItemMediaInspectorController">
+      <div class="col-xs-9">
+        <span class="label label-info">{{component.type}}</span>
+      </div>
+      <div class="col-xs-3">
+        <ng-include src="'promethee/move/component'"></ng-include>
+      </div>
+    </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.text"></summernote>
+      </div>
+    </div>
+  </div>
+
+  <div class="pull-right btn-toolbar" ng-controller="SliderItemInspectorController">
+    <span ng-show="promethee.inspected.attributes.media.type === undefined" ng-repeat="definition in itemDefinitions" class="btn btn-default" ng-click="setMedia(definition)">Set {{definition.name}}</span>
+    <span ng-show="promethee.inspected.attributes.media.type !== undefined" class="btn btn-danger" ng-click="removeMedia()">Remove Media</span>
+  </div>
+</script>
+
+<script>
+  promethee.controller('SliderItemInspectorController', ['$scope', function($scope) {
+    var availableComponents = ['image', 'video'];
+
+    $scope.itemDefinitions = $scope.promethee.definitions.filter(function(definition) {
+      return availableComponents.includes(definition.data.type);
+    });
+
+    $scope.setMedia = function(definition) {
+      var media = JSON.parse(JSON.stringify(definition.data));
+      $scope.promethee.inspected.attributes.media = media;
+    };
+
+    $scope.removeMedia = function() {
+      $scope.promethee.inspected.attributes.media = {};
+    };
+  }])
+
+  promethee.controller('SliderItemMediaInspectorController', ['$scope', function($scope) {
+    $scope.component = $scope.promethee.inspected.attributes.media;
+    $scope.$watch("promethee.inspected", function() {
+      $scope.component = $scope.promethee.inspected.attributes.media;
+    })
+  }])
+</script>

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

@@ -0,0 +1,14 @@
+<script type="text/ng-template" id="promethee/components/slider_item/edit/move">
+  <%= render 'promethee/edit/move.header', type: 'slider_item' %>
+      <div class="header">Slider Item</div>
+      <div class="row">
+        <div class="col-xs-12" ng-if="component.attributes.media.type !== undefined">
+          <div ng-init="component = component.attributes.media">
+            <ng-include src="'promethee/move/component'"></ng-include>
+          </div>
+        </div>
+        <div class="col-xs-12" ng-show="component.attributes.text !== ''">Text</div>
+      </div>
+    </div>
+  </div>
+</script>

data/app/views/promethee/components/slider_item/_icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
+  <path fill="#FFF" d="M30.3,35.9 L30.3,64.4 L70.9,64.4 L70.9,35.9 L30.3,35.9 Z M71.9,34.9 L71.9,65.4 L29.3,65.4 L29.3,34.9 L71.9,34.9 Z M75,32 L75,68.2 L26.1,68.2 L26.1,32 L75,32 Z M73,34 L28.1,34 L28.1,66.2 L73,66.2 L73,34 Z M90,37.7 L77,37.7 L77,35.7 L92,35.7 L92,64.5 L77,64.5 L77,62.5 L90,62.5 L90,37.7 Z M11,62.5 L24,62.5 L24,64.5 L9,64.5 L9,35.7 L24,35.7 L24,37.7 L11,37.7 L11,62.5 Z"/>
+</svg>

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

@@ -0,0 +1,15 @@
+<script type="text/ng-template" id="promethee/components/slider_item/localize">
+  <div ng-show="component.master.attributes.text !== ''">
+    <hr>
+    <div class="row">
+      <div class="col-md-6">
+        <b>Slide Item Text</b>
+        <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.text | htmlSafe"></div>
+      </div>
+      <div class="col-md-6">
+        <label class="label-control">Slide Item Text</label>
+        <summernote config="summernoteConfig" ng-model="component.attributes.text"></summernote>
+      </div>
+    </div>
+  </div>
+</script>

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

@@ -0,0 +1,5 @@
+<% media = component[:attributes][:media] %>
+<div class="carousel-item__content">
+  <%= render 'promethee/show/component', component: media if defined?(media[:type]) %>
+  <%= component[:attributes][:text].to_s.html_safe %>
+</div>

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

@@ -8,7 +8,7 @@
       data: {
         type: 'text',
         attributes: {
-          body: 'Edit me'
+          searchable_body: 'Edit me'
         }
       }
     })

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

@@ -1,8 +1,8 @@
 <script type="text/ng-template" id="promethee/components/text/edit/inspect">
   <div class="form-group">
-    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.body"></summernote>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.searchable_body"></summernote>
   </div>
 
-  {{promethee.inspected.attributes.body | textContentFromHTML | numberOfWords}} words<br>
-  {{promethee.inspected.attributes.body | textContentFromHTML | numberOfCharacters}} characters
+  {{promethee.inspected.attributes.searchable_body | textContentFromHTML | numberOfWords}} words<br>
+  {{promethee.inspected.attributes.searchable_body | textContentFromHTML | numberOfCharacters}} characters
 </script>

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

@@ -1,7 +1,6 @@
 <script type="text/ng-template" id="promethee/components/text/edit/move">
   <%= render 'promethee/edit/move.header', type: 'text' %>
-      <div ng-bind-html="component.attributes.body | htmlSafe"></div>
-      <pre class="hidden">{{component.attributes.search = (component.attributes.body | textContentFromHTML)}}</pre>
+      <div ng-bind-html="component.attributes.searchable_body | htmlSafe"></div>
     </div>
   </div>
 </script>

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

@@ -1,16 +1,14 @@
 <script type="text/ng-template" id="promethee/components/text/localize">
-  <div ng-show="component.master.attributes.body">
+  <div ng-show="component.master.attributes.searchable_body">
     <hr>
-
     <div class="row">
       <div class="col-md-6">
         <b>Text</b>
-        <div ng-bind-html="component.master.attributes.body | htmlSafe"></div>
+        <div ng-bind-html="component.master.attributes.searchable_body | htmlSafe"></div>
       </div>
       <div class="col-md-6">
         <b>Text</b>
-        <summernote config="summernoteConfig" ng-model="component.attributes.body"></summernote>
-        <pre class="hidden">{{component.attributes.search = (component.attributes.body | textContentFromHTML)}}</pre>
+        <summernote config="summernoteConfig" ng-model="component.attributes.searchable_body"></summernote>
       </div>
     </div>
   </div>

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

@@ -1,6 +1,6 @@
 <%
-body = component[:attributes][:body].to_s
+searchable_body = component[:attributes][:searchable_body].to_s
 %>
 <div class="<%= promethee_class_for component %>">
-  <%= body.html_safe %>
+  <%= searchable_body.html_safe %>
 </div>

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

@@ -1,6 +1,8 @@
 <script type="text/ng-template" id="promethee/components/video/edit/inspect">
   <div class="form-group">
-    <label class="label-control">Url</label>
-    <input ng-model="promethee.inspected.attributes.url" class="form-control" type="text"/>
+    <label  class="label-control">Url</label>
+    <input  ng-model="promethee.inspected.attributes.url" 
+            class="form-control" 
+            type="text" />
   </div>
 </script>

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

@@ -2,7 +2,12 @@
   <%= render 'promethee/edit/move.header', type: 'video' %>
       <div ng-controller="VideoController">
         <div class="embed-responsive embed-responsive-16by9">
-          <iframe ng-if="embed" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" ng-src="{{embed | urlSafe}}"></iframe>
+          <iframe ng-if="embed" 
+                  frameborder="0" 
+                  webkitallowfullscreen="" 
+                  mozallowfullscreen="" 
+                  allowfullscreen="allowfullscreen" 
+                  ng-src="{{embed | urlSafe}}"></iframe>
           <div class="video-neutralizing-overlay"></div>
         </div>
       </div>

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

@@ -1,3 +1,2 @@
 <script type="text/ng-template" id="promethee/components/video/localize">
-
 </script>

data/app/views/promethee/edit/_inspect.advanced.html.erb

@@ -0,0 +1,7 @@
+<hr>
+<div class="btn btn-default btn-xs" ng-click="advancedConfigurationOpen = !advancedConfigurationOpen">
+  Advanced configuration
+  <%= fa_icon 'angle-down', 'ng-class': "{'fa-rotate-180': advancedConfigurationOpen}" %>
+</div>
+<br><br>
+<div ng-show="advancedConfigurationOpen">

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

@@ -36,22 +36,12 @@ promethee
           refreshPositions: true,
           cursor: 'move',
           start: function() {
-            var $elementDragged = $(element[0]);
-            var type = $elementDragged.data('type');
+            var type = $(element[0]).data('type');
             $('.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() {
-            var $elementDragged = $(element[0]);
-            var type = $elementDragged.data('type');
+            var type = $(element[0]).data('type');
             $('.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();
           }
         });
       }
@@ -185,13 +175,12 @@ promethee
   <div ng-init="parent_id = component.id; parent_type = component.type; components = component.children">
     <div
       droppable
-      class="<%= promethee_bem_classes 'promethee-edit__move__droppable', '--{{parent_type}}', '--first' %>"
+      class="<%= promethee_bem_classes 'promethee-edit__move__droppable', '--{{parent_type}}' %>"
       data-id="{{parent_id}}"
       data-type="{{parent_type}}"
       data-index="0"
       >
     </div>
-    <div class="<%= promethee_bem_classes 'promethee-edit__move__droppable-substitute', '--{{parent_type}}', '--first' %>"></div>
     <div
       draggable
       ng-repeat="component in components"
@@ -211,7 +200,6 @@ promethee
         data-index="{{$index+1}}"
         >
       </div>
-      <div class="<%= promethee_bem_classes 'promethee-edit__move__droppable-substitute', '--{{parent_type}}' %>"></div>
     </div>
   </div>
 </script>

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

@@ -0,0 +1,8 @@
+<div class="form-group">
+  <label class="label-control"><%= label %></label>
+  <div style="margin-left: 2px">
+    <% values.each do |value| %>
+      <label class="radio-inline"> <input ng-model="background.<%= attribute %>" type="radio" value="<%= value %>" /><%= value.humanize %> </label>
+    <% end %>
+  </div>
+</div>

data/app/views/promethee/templates/_uploader.html.erb

@@ -1,8 +1,12 @@
 <script type="text/ng-template" id="promethee_uploader">
   <div class="form-group" ngf-drop="prometheeUploader.upload($file)" ngf-pattern="{{limits || ''}}">
-    <label class="label-control">{{label}}</label>
-    <p>{{ngModel.name}}</p>
-    <div class="button btn btn-default" ngf-select="prometheeUploader.upload($file, ngModel)" ngf-accept="{{limits || ''}}" class="drop-box">Select an image</div>
+    <div class="label-control" ng-show="label != ''">{{label}}</div>
+    <div class="button btn btn-default" ngf-select="prometheeUploader.upload($file, ngModel)" ngf-accept="{{limits || ''}}" class="drop-box" style="margin-top: 5px; margin-bottom: 5px;">Select an image</div>
+    <div ng-show="ngModel.id != undefined" class="promethee_uploader--preview">
+      <img ng-src="/promethee/blob/{{ngModel.id}}" />
+      {{ngModel.name}}
+      <span class="promethee_uploader--preview__delete fa fa-trash" ng-click="ngModel = { id: undefined, name: '' }"></span>
+    </div>
     <div class="progress" ng-show="prometheeUploader.upload_progress != undefined && prometheeUploader.upload_progress != 0 && prometheeUploader.upload_progress != 100">
       <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{prometheeUploader.upload_progress}}%"></div>
     </div>

data/lib/promethee/rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.6.16
 platform: ruby
 authors:
 - Julien Dargelos
@@ -232,6 +232,12 @@ files:
 - app/views/promethee/components/slider/_icon.svg
 - app/views/promethee/components/slider/_localize.html.erb
 - app/views/promethee/components/slider/_show.html.erb
+- app/views/promethee/components/slider_item/_edit.define.html.erb
+- app/views/promethee/components/slider_item/_edit.inspect.html.erb
+- app/views/promethee/components/slider_item/_edit.move.html.erb
+- app/views/promethee/components/slider_item/_icon.svg
+- app/views/promethee/components/slider_item/_localize.html.erb
+- app/views/promethee/components/slider_item/_show.html.erb
 - app/views/promethee/components/text/_edit.define.html.erb
 - app/views/promethee/components/text/_edit.inspect.html.erb
 - app/views/promethee/components/text/_edit.move.html.erb
@@ -244,10 +250,12 @@ files:
 - app/views/promethee/components/video/_icon.svg
 - app/views/promethee/components/video/_localize.html.erb
 - app/views/promethee/components/video/_show.html.erb
+- app/views/promethee/edit/_inspect.advanced.html.erb
 - app/views/promethee/edit/_move.header.html.erb
 - app/views/promethee/edit/_move.html.erb
 - app/views/promethee/edit/_move.remove.html.erb
 - app/views/promethee/edit/_preview.html.erb
+- app/views/promethee/edit/_radiobuttons.html.erb
 - app/views/promethee/presets/_icon.image-with-text.svg
 - app/views/promethee/presets/_image-with-text.html.erb
 - app/views/promethee/preview.html.erb