promethee 1.6.14 → 1.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819437689551204bc16094c0c28ecb78e5288f30
-  data.tar.gz: ef92040ac874a414134a9e7408ecfdbfdee6647e
+  metadata.gz: e704bb85e5f68b9d1d6fcd2347a22659a6f4925d
+  data.tar.gz: edc127b5995199bfe7261b6c4932729223965034
 SHA512:
-  metadata.gz: b38689f56183e01e71067451da849903e2a56093505007617dfc9153fbc275574871b6963bf6607f3cfad54b570c584ccdc3c01a5d60c4193fa37c332013a670
-  data.tar.gz: d3685352d28ee48cc2e7dd031cb1388571e2d076daea1b0f4155379760d5b0b407ff8a9ead57b588987806d02e5d4c41ada2429a37e5b50b0e347fdebd068846
+  metadata.gz: 5119c95e2c68bdbe8cab7b4710aa97da222c6564988ebcc98a98255eb8e3d316376bcd69663c55e5b6b34a50355d2d5d7e52f1adbc8ff4c6dd67d575df44b780
+  data.tar.gz: 1c3a097856ecae048e0b60de4b56bda0cfe6e58c53cd8e11743a0c060dcc7a431159f7b459c921a57fa84d8f96f36bd1760340a1fd0e1cc6bf59a75461fe9f1d

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

@@ -110,6 +110,17 @@ $promethee-color: #ff9900 !default
     right: 0
     bottom: 0
 
+.promethee_uploader--preview
+  float: right
+  margin-top: 5px
+  img
+    display: block
+    margin: 0 0 0 auto
+    max-height: 34px
+  &__delete
+    margin-left: 5px
+    cursor: pointer
+
 @media (min-width: 768px)
   .modal-dialog
     // default margin-top is 30px and the modal window is displayed UNDER the topbar

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

@@ -77,27 +77,6 @@
     &.ui-droppable-hover
       opacity: 1
       height: 100px
-    &--row
-      position: absolute
-      display: none
-      width: 10px
-      height: 100%
-      &.ui-droppable-active
-        width: 10px
-        height: 100%
-      &.ui-droppable-hover
-        opacity: 1
-        width: 20px
-        height: 100%
-      &--first
-        display: block
-        left: -10px
-        top: 10px
-        bottom: 20px
-      &--inside-column
-        display: block
-        right: -5px
-        top: -10px
 
   .ui-draggable-dragging
     z-index: 1000
@@ -106,27 +85,6 @@
     .promethee-edit__move__droppable
       visibility: hidden !important
 
-  // By default, nothing is dropped in rows
-  &--dragging
-    .promethee-edit__move__droppable--row
-      display: none
-
-    // Except for columns, which can be dropped only on rows
-    &--column
-      .promethee-edit__move__droppable
-        display: none
-        // But we don't want anything to move when the droppable disappear, so we show some substitutes
-        &-substitute
-          // This height is not perfect, some strange things move
-          height: 24px
-          // Except in rows
-          &.promethee-edit__move__droppable-substitute--row
-            height: 0
-        // It's a little specific, columns can be dropped on rows "first droppable", or on columns "inside droppables"
-        &--row--first,
-        &--row--inside-column
-          display: block
-
   .promethee-edit
     &__inspect, &__library
       min-width: 100px

data/app/assets/stylesheets/promethee.sass

@@ -17,10 +17,13 @@
         font-size: 30px
 
     &__aside
-      .aside__button--center
-        margin-left: auto
-        margin-right: auto
-      .aside__button--left
-        margin-right: auto
-      .aside__button--right
-        margin-left: auto
+      .aside__button
+        padding-top: 30px
+        a
+          display: inline-block
+        &--center
+          text-align: center
+        &--left
+          text-align: left
+        &--right
+          text-align: right

data/app/controllers/promethee_controller.rb

@@ -16,7 +16,8 @@ class PrometheeController < ApplicationController
   end
 
   def blob_show
+    # as this is called only from promethee preview it sends an image resized to 720
     blob = ActiveStorage::Blob.find params[:id]
-    redirect_to url_for(blob.variant(resize: '720'))
+    redirect_to url_for(blob.variant(resize: '720>'))
   end
 end

data/app/models/concerns/promethee_data.rb

@@ -1,8 +1,37 @@
 module PrometheeData
   extend ActiveSupport::Concern
 
+  def data_page_title
+    data['attributes']['searchable_title']
+  end
+
+  def data_page_description
+    data['attributes']['searchable_description']
+  end
+
   def data=(value)
     value = JSON.parse value if value.is_a? String
     super(value)
   end
+
+  def data_searchable
+    promethee_extract_searchable data
+  end
+
+  protected
+  
+  include ActionView::Helpers::SanitizeHelper
+  def promethee_extract_searchable(component)
+    searchable = ' '
+    component['attributes'].each do |key, value|
+      if key.starts_with? 'searchable_'
+        clean_value = strip_tags value
+        searchable += "#{clean_value} "
+      end
+    end if component.include? 'attributes'
+    component['children'].each do |child|
+      searchable += promethee_extract_searchable child
+    end if component.include? 'children'
+    searchable
+  end
 end

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

@@ -42,8 +42,8 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
       id: $scope.generateIdentifier(),
       type: 'page',
       attributes: {
-        title: 'New page',
-        description: '',
+        searchable_title: 'New page',
+        searchable_description: '',
         stylesheets: '',
         javascripts: ''
       },
@@ -132,16 +132,6 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
     $('#promethee').closest('form').submit();
   };
 
-  $scope.concatenateChildrenSearch = function(component) {
-    var search =  ''
-    angular.forEach(component.children, function(child) {
-      if (child.attributes && child.attributes.search) {
-        search += child.attributes.search + ' ';
-      }
-    });
-    return search;
-  }
-
   $scope.summernoteConfig = summernoteConfig;
   $scope.sendPreviewData('thumb-preview');
 }]);

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

@@ -24,17 +24,6 @@ promethee_data = Promethee::Data.new master_data, localization_data: localizatio
     $scope.component = {children: data.components};
 
     $scope.summernoteConfig = summernoteConfig;
-
-    $scope.concatenateSearch = function() {
-      var search =  ''
-      angular.forEach($scope.component.children, function(child) {
-        if (child.type !== 'page' && child.attributes && child.attributes.search) {
-          search += child.attributes.search + ' ';
-        }
-      });
-      return search;
-    }
-
   }]);
 </script>
 

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

@@ -8,9 +8,9 @@
       data: {
         type: 'aside',
         attributes: {
-          visible_content: '<p>Edit me</p>',
-          collapsed_content: '',
-          open_label: 'See more',
+          searchable_visible_content: '<p>Edit me</p>',
+          searchable_collapsed_content: '',
+          searchable_open_label: 'See more',
           open_label_position: 'left'
         },
         children: []

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

@@ -1,17 +1,17 @@
 <script type="text/ng-template" id="promethee/components/aside/edit/inspect">
   <div class="form-group">
     <label class="label-control">Visible content</label>
-    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.visible_content"></summernote>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.searchable_visible_content"></summernote>
   </div>
 
   <div class="form-group">
     <label class="label-control">Collapsed content</label>
-    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.collapsed_content"></summernote>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.searchable_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"/>
+    <input ng-model="promethee.inspected.attributes.searchable_open_label" class="form-control" type="text"/>
   </div>
 
   <div class="form-group">

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

@@ -1,14 +1,17 @@
 <script type="text/ng-template" id="promethee/components/aside/edit/move">
   <%= render 'promethee/edit/move.header', type: 'aside' %>
-      <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" ng-show="collapsed" ng-bind-html="component.attributes.open_label | htmlSafe"></a>
+      <aside  ng-show="component.attributes.searchable_collapsed_content" 
+              ng-init="collapsed = true">
+        <div  ng-bind-html="component.attributes.searchable_visible_content | htmlSafe"></div>
+        <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-bind-html="component.attributes.searchable_open_label | htmlSafe"></a>
       </aside>
-
-      <aside ng-hide="component.attributes.collapsed_content" ng-bind-html="component.attributes.visible_content | htmlSafe"></aside>
-
-      <pre class="hidden">{{component.attributes.search = ((component.attributes.visible_content | textContentFromHTML) + ' ' + (component.attributes.collapsed_content | textContentFromHTML))}}</pre>
+      <aside  ng-hide="component.attributes.searchable_collapsed_content" 
+              ng-bind-html="component.attributes.searchable_visible_content | htmlSafe"></aside>
     </div>
   </div>
 </script>

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

@@ -4,41 +4,39 @@
   <div class="row">
     <div class="col-md-6">
       <b>Aside visible content</b>
-      <div ng-bind-html="component.master.attributes.visible_content | htmlSafe"></div>
+      <div ng-bind-html="component.master.attributes.searchable_visible_content | htmlSafe"></div>
     </div>
     <div class="col-md-6">
       <div class="form-group">
         <label class="label-control">Aside visible content</label>
-        <summernote config="summernoteConfig" ng-model="component.attributes.visible_content"></summernote>
+        <summernote config="summernoteConfig" ng-model="component.attributes.searchable_visible_content"></summernote>
       </div>
     </div>
   </div>
 
-  <div class="row" ng-show="component.master.attributes.collapsed_content">
+  <div class="row" ng-show="component.master.attributes.searchable_collapsed_content">
     <div class="col-md-6">
       <b>Aside collapsed content</b>
-      <div ng-bind-html="component.master.attributes.collapsed_content | htmlSafe"></div>
+      <div ng-bind-html="component.master.attributes.searchable_collapsed_content | htmlSafe"></div>
     </div>
     <div class="col-md-6">
       <div class="form-group">
         <label class="label-control">Aside collapsed content</label>
-        <summernote config="summernoteConfig" ng-model="component.attributes.collapsed_content"></summernote>
+        <summernote config="summernoteConfig" ng-model="component.attributes.searchable_collapsed_content"></summernote>
       </div>
     </div>
   </div>
 
-  <div class="row" ng-show="component.master.attributes.collapsed_content">
+  <div class="row" ng-show="component.master.attributes.searchable_collapsed_content">
     <div class="col-md-6">
       <b>Button label</b>
-      <div ng-bind-html="component.master.attributes.open_label | htmlSafe"></div>
+      <div ng-bind-html="component.master.attributes.searchable_open_label | htmlSafe"></div>
     </div>
     <div class="col-md-6">
       <div class="form-group">
         <label class="label-control">Button label</label>
-        <input class="form-control" ng-model="component.attributes.open_label" type="text">
+        <input class="form-control" ng-model="component.attributes.searchable_open_label" type="text">
       </div>
     </div>
   </div>
-
-  <pre class="hidden">{{component.attributes.search = ((component.attributes.visible_content | textContentFromHTML) + ' ' + (component.attributes.collapsed_content | textContentFromHTML))}}</pre>
 </script>

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

@@ -1,21 +1,21 @@
 <%
-  visible_content = component[:attributes][:visible_content].to_s
-  collapsed_content = component[:attributes][:collapsed_content].to_s
-  open_label = component[:attributes][:open_label].to_s
+  searchable_visible_content = component[:attributes][:searchable_visible_content].to_s
+  searchable_collapsed_content = component[:attributes][:searchable_collapsed_content].to_s
+  searchable_open_label = component[:attributes][:searchable_open_label].to_s
   open_label_position = component[:attributes][:open_label_position].to_s
 %>
 
 <aside class="<%= promethee_class_for component %> aside">
-  <%= visible_content.html_safe %>
+  <%= searchable_visible_content.html_safe %>
 
-  <% if collapsed_content.present? %>
+  <% if searchable_collapsed_content.present? %>
 
       <div class="collapse aside__collapse" id="aside-collapse-<%= component[:id] %>">
-        <%= collapsed_content.html_safe %>
+        <%= searchable_collapsed_content.html_safe %>
       </div>
 
       <div class="aside__button">
-        <a href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse" class="aside__button--<%= open_label_position %>"><%= open_label %></a>
+        <a href="#aside-collapse-<%= component[:id] %>" data-toggle="collapse" class="aside__button--<%= open_label_position %>"><%= searchable_open_label %></a>
       </div>
 
   <% end %>

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

@@ -6,7 +6,6 @@
           <ng-include src="'promethee/move/component'"></ng-include>
         </div>
         <div class="clearfix" ng-if="$index%itemsPerLine === itemsPerLine - 1" ng-repeat-end></div>
-        <pre class="hidden">{{component.attributes.search = concatenateChildrenSearch(component)}}</pre>
       </div>
     </div>
   </div>

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

@@ -9,14 +9,6 @@
       <%= render 'promethee/edit/move.remove' %>
         <div class="header">Column {{$index + 1}}</div>
         <ng-include src="'promethee/move/components'"></ng-include>
-        <pre class="hidden">{{component.attributes.search = concatenateChildrenSearch(component)}}</pre>
-        <div
-          droppable
-          class=" <%= promethee_bem_classes 'promethee-edit__move__droppable', '--row', '--inside-column' %>"
-          data-index="{{$index+1}}"
-          data-id="{{parent_id}}"
-          data-type="{{parent_type}}"
-          >
         </div>
       </div>
     </div>

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

@@ -12,9 +12,9 @@
             id: undefined,
             name: ''
           },
-          surtitle: '',
-          title: '',
-          subtitle: ''
+          searchable_surtitle: '',
+          searchable_title: '',
+          searchable_subtitle: ''
         }
       }
     })

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

@@ -3,16 +3,16 @@
 
   <div class="form-group">
     <label class="label-control">Surtitle</label>
-    <input ng-model="promethee.inspected.attributes.surtitle" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.searchable_surtitle" class="form-control" type="text"/>
   </div>
 
   <div class="form-group">
     <label class="label-control">Title</label>
-    <input ng-model="promethee.inspected.attributes.title" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.searchable_title" class="form-control" type="text"/>
   </div>
 
   <div class="form-group">
     <label class="label-control">Subtitle</label>
-    <input ng-model="promethee.inspected.attributes.subtitle" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.searchable_subtitle" class="form-control" type="text"/>
   </div>
 </script>

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

@@ -4,11 +4,10 @@
                     promethee-edit__cover-content"
             style="background-image:url('{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '' }}')">
         <hgroup>
-          <h2 class="surtitle">{{component.attributes.surtitle}}</h2>
-          <h1>{{component.attributes.title}}</h1>
-          <h2 class="subtitle">{{component.attributes.subtitle}}</h2>
+          <h2 class="surtitle">{{component.attributes.searchable_surtitle}}</h2>
+          <h1>{{component.attributes.searchable_title}}</h1>
+          <h2 class="subtitle">{{component.attributes.searchable_subtitle}}</h2>
         </hgroup>
-        <pre class="hidden">{{component.attributes.search = (component.attributes.title + ' ' + component.attributes.surtitle + ' ' + component.attributes.subtitle)}}</pre>
       </div>
     </div>
   </div>

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

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/cover/localize">
-  <div ng-show="component.master.attributes.surtitle || component.master.attributes.title || component.master.attributes.subtitle">
+  <div ng-show="component.master.attributes.searchable_surtitle || component.master.attributes.searchable_title || component.master.attributes.searchable_subtitle">
     <hr>
 
     <div class="row">
@@ -8,46 +8,43 @@
       </div>
     </div>
 
-    <div class="row" ng-show="component.master.attributes.surtitle">
+    <div class="row" ng-show="component.master.attributes.searchable_surtitle">
       <div class="col-md-6">
         <b>Surtitle</b>
-        <p>{{component.master.attributes.surtitle}}</p>
+        <p>{{component.master.attributes.searchable_surtitle}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
           <label class="label-control">Surtitle</label>
-          <input class="form-control" ng-model="component.attributes.surtitle" type="text">
+          <input class="form-control" ng-model="component.attributes.searchable_surtitle" type="text">
         </div>
       </div>
     </div>
 
-    <div class="row" ng-show="component.master.attributes.title">
+    <div class="row" ng-show="component.master.attributes.searchable_title">
       <div class="col-md-6">
         <b>Title</b>
-        <p>{{component.master.attributes.title}}</p>
+        <p>{{component.master.attributes.searchable_title}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
           <label class="label-control">Title</label>
-          <input class="form-control" ng-model="component.attributes.title" type="text">
+          <input class="form-control" ng-model="component.attributes.searchable_title" type="text">
         </div>
       </div>
     </div>
 
-    <div class="row" ng-show="component.master.attributes.subtitle">
+    <div class="row" ng-show="component.master.attributes.searchable_subtitle">
       <div class="col-md-6">
         <b>Subtitle</b>
-        <p>{{component.master.attributes.subtitle}}</p>
+        <p>{{component.master.attributes.searchable_subtitle}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
           <label class="label-control">Subtitle</label>
-          <input class="form-control" ng-model="component.attributes.subtitle" type="text">
+          <input class="form-control" ng-model="component.attributes.searchable_subtitle" type="text">
         </div>
       </div>
     </div>
   </div>
-
-  <pre class="hidden">{{component.attributes.search = (component.attributes.title + ' ' + component.attributes.surtitle + ' ' + component.attributes.subtitle)}}</pre>
-
 </script>