promethee 4.1.9 → 4.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70442f21dcf78fd221ab2fd1d4043434e3ce8b6ef962ae7834179a439234de6
-  data.tar.gz: 79359c33b7f75ac12791c50c3dd400775557ffd6238c2a032b39263fe378fa0d
+  metadata.gz: a0f9aa0e77a8e849cdd8342fe18743536c033f23799c5d9102b2b385dabaae32
+  data.tar.gz: ff506afde6c8864d8044157b6975e5af4dad9b149f96152ca493b0557f90cfaf
 SHA512:
-  metadata.gz: 03c978f8966ce1437e326ee439c0cc50cbf2868fda3efabef784138932f9c0040580650a1550a585f21ef81e4e995304d56dbc1742bbe8f7500f89cdea8f9643
-  data.tar.gz: 101c397d3e626b2e862654741456e7978cd35cb29c916d7385809c657a4dc62c50c01240145fbb97763a1b5b4f8351ed5395d4fb2769923bfa3ddc5118f35edd
+  metadata.gz: be067209b5e1bdcb607bdfa54af4e929369f2d3a66b3d395bd12ea1c23f6088fb658527a762638acf8f3ea6c27a0067cd05895663af81ff99b2b12a5d826e9b3
+  data.tar.gz: 260e42af1d557b4d78cfe26cc549b7921e51b3ed65561646a13b0cbd64de25bd2a7f123e0ec720156c5dd1b7736933607a0c607a69aeb59e4129c9e6480e6ee6

data/app/assets/stylesheets/promethee.sass

@@ -160,6 +160,17 @@ $black: #000000 !default
             .fontawesome-carousel-control .fa
                 font-size: 30px
 
+        &__table
+            tr
+                p
+                    margin-bottom: 0
+                &.empty
+                    background-color: #EEEEEE
+                    td
+                        line-height: 1px
+                        padding-bottom: 1px
+                        padding-top: 1px
+
 
         // component direct in root
         &__page > &__blockquote,

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

@@ -5,7 +5,8 @@
   open_label_position = component[:attributes].dig(:open_label_position, :value)&.to_s
 %>
 
-<aside class="<%= promethee_class_for component %> aside">
+<aside  class="<%= promethee_class_for component %> aside"
+        id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
         <div class="aside__content">

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

@@ -3,7 +3,8 @@
   author = component[:attributes].dig(:author, :value)&.to_s
 %>
 
-<div class="<%= promethee_class_for(component) %>">
+<div  class="<%= promethee_class_for(component) %>"
+      id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
       <blockquote class="blockquote">

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

@@ -12,7 +12,8 @@
   end
 %>
 
-<div class="row <%= promethee_class_for component %>">
+<div  class="row <%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <% component[:children].each.with_index do |child, n| %>
     <div class="<%= col_classes %>">
         <%= render 'promethee/show/component', component: child %>

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

@@ -17,8 +17,8 @@ when 'video'
   end
 end
 %>
-<div class="collection-item__content">
-
+<div  class="<%= promethee_class_for component %> collection-item__content"
+      id="<%= promethee_id_for component %>">
   <% if iframe_src.present? %>
   <div class="embed-responsive embed-responsive-16by9">
     <iframe frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" src="<%= iframe_src %>"></iframe>
@@ -26,5 +26,7 @@ end
   <% elsif image_blob.present? %>
   <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: caption %>
   <% end %>
-  <%= caption %>
+  <div class="collection-item__content__caption">
+    <%= caption %>
+  </div>
 </div>

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

@@ -41,6 +41,7 @@ if component[:attributes].dig(:mobile, :value, :enabled, :value)
   classes += " col-xs-#{size} col-xs-offset-#{offset}" # BS3, does nothing for BS4
 end
 %>
-<div class="<%= classes %> <%= promethee_class_for component %>">
+<div  class="<%= classes %> <%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <%= render 'promethee/show/components', components: component[:children] %>
 </div>

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

@@ -5,7 +5,9 @@ surtitle = component[:attributes].dig(:surtitle, :value)&.to_s
 title = component[:attributes].dig(:title, :value)&.to_s
 subtitle = component[:attributes].dig(:subtitle, :value)&.to_s
 %>
-<div id="component-<%= component[:id] %>" class="<%= promethee_class_for(component) %>" style="background-image: url(<%= url_for(blob.variant(resize: '1920>', quality: 95)) if blob %>)">
+<div  class="<%= promethee_class_for(component) %>"
+      id="<%= promethee_id_for component %>"
+      style="background-image: url(<%= url_for(blob.variant(resize: '1920>', quality: 95)) if blob %>)">
     <div class="container">
       <div class="promethee__component__row">
         <div class="promethee__component__content">

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

@@ -1,4 +1,5 @@
-<div class="<%= promethee_class_for component %>">
+<div  class="<%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
       <% component[:children].each do |child| %>

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

@@ -6,7 +6,8 @@ special_question = component[:attributes].dig(:special_question, :value)
 image_blob = blob_from_data component[:attributes].dig(:image, :value)
 %>
 
-<div class="<%= promethee_class_for component %> <%= 'promethee__component__faq_item--special' if special_question %>">
+<div  class="<%= promethee_class_for component %> <%= 'promethee__component__faq_item--special' if special_question %>"
+      id="<%= promethee_id_for component %>">
   <h4 data-toggle="collapse"
       data-target="#collapse-faq-<%= component[:id] %>"
       aria-expanded="false"

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

@@ -4,7 +4,8 @@ blob = blob_from_data component[:attributes].dig(:image, :value)
 alt = component[:attributes].dig(:alt, :value)&.to_s
 caption = component[:attributes].dig(:caption, :value)&.to_s
 %>
-<figure class="<%= promethee_class_for component %>">
+<figure class="<%= promethee_class_for component %>"
+        id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
       <%= render 'promethee/show/image.srcset', blob: blob, alt: alt, caption: caption if blob %>

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

@@ -11,6 +11,7 @@
   <script><%= javascripts %></script>
 <% end %>
 
-<div class="<%= promethee_class_for component %>">
+<div  class="<%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <%= render 'promethee/show/components', components: component[:children] %>
 </div>

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

@@ -22,6 +22,7 @@ end
 %>
 
 <div  class="row <%= promethee_class_for component %><%= ' promethee__component__row--background' if has_background %>"
+      id="<%= promethee_id_for component %>"
       style="background-color: <%= background_color %>; <%= background_images.count > 0 ? "background-repeat: no-repeat; background-image: #{background_images.join(', ')}; background-position: #{background_positions.join(', ')}; background-size: #{background_sizes.join(', ')};" : '' %>">
   <%= render 'promethee/show/components', components: component[:children] %>
 </div>

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

@@ -1,4 +1,6 @@
-<div id="slider-<%= component[:id] %>" class="carousel slide <%= promethee_class_for component %>" data-ride="carousel">
+<div  class="carousel slide <%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>"
+      data-ride="carousel">
   <div class="carousel-inner">
     <% component[:children].each.with_index do |item, n| %>
     <div class="carousel-item item<%= ' active' if n.zero? %>">
@@ -7,10 +9,12 @@
     <% end %>
   </div>
 
-  <a class="left carousel-control fontawesome-carousel-control carousel-control-prev" href="#slider-<%= component[:id] %>" data-slide="prev">
-    <%= icon('fa', 'chevron-left') %>
-  </a>
-  <a class="right carousel-control fontawesome-carousel-control carousel-control-next" href="#slider-<%= component[:id] %>" data-slide="next">
-    <%= icon('fa', 'chevron-right') %>
-  </a>
+  <% if component[:children].many? %>
+    <a class="left carousel-control fontawesome-carousel-control carousel-control-prev" href="#<%= promethee_id_for component %>" data-slide="prev">
+      <%= icon('fa', 'chevron-left') %>
+    </a>
+    <a class="right carousel-control fontawesome-carousel-control carousel-control-next" href="#<%= promethee_id_for component %>" data-slide="next">
+      <%= icon('fa', 'chevron-right') %>
+    </a>
+  <% end %>
 </div>

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

@@ -17,13 +17,14 @@ when 'video'
   end
 end
 %>
-<div class="carousel-item__content">
+<div class="<%= promethee_class_for component %> carousel-item__content"
+     id="<%= promethee_id_for component %>">
   <% if iframe_src.present? %>
   <div class="embed-responsive embed-responsive-16by9">
     <iframe frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" src="<%= iframe_src %>"></iframe>
   </div>
   <% elsif image_blob.present? %>
-    <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: caption %>
+    <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: caption, image_zoomable: false %>
   <% end %>
   <div class="carousel-item__content__caption">
     <%= caption %>

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

@@ -48,9 +48,7 @@
             {{ getTableCell(getHeaderCellUids()[$index]).attributes.text.value }}
           </span>
           <br/>
-          <input  type="text"
-                  ng-model="getTableCell(cellUid).attributes.text.value"
-                  class="form-control" />
+          <summernote config="summernoteConfig" ng-model="getTableCell(cellUid).attributes.text.value"></summernote>
         </div>
       </div>
       <hr>

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

@@ -5,14 +5,14 @@
           <thead>
             <tr>
               <th ng-repeat="cellUid in component.attributes.structure.value[0]">
-                {{getTableCell(cellUid).attributes.text.value}}
+                <div ng-bind-html="getTableCell(cellUid).attributes.text.value | htmlSafe"></div>
               </th>
             </tr>
           </thead>
           <tbody>
             <tr ng-repeat="row in component.attributes.structure.value" ng-if="$index > 0">
               <td ng-repeat="cellUid in row">
-                {{getTableCell(cellUid).attributes.text.value}}
+                <div ng-bind-html="getTableCell(cellUid).attributes.text.value | htmlSafe"></div>
               </td>
             </tr>
           </tbody>

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

@@ -4,7 +4,7 @@
     row.map { |cellUid|
       {
         uid: cellUid,
-        text: cells.find { |cell| cell[:id] == cellUid }.dig(:attributes, :text, :value)
+        text: cells.find { |cell| cell[:id] == cellUid }.dig(:attributes, :text, :value)&.html_safe
       }
     }
   }
@@ -12,7 +12,8 @@
   headerRow = rows.shift
 %>
 
-<div id="component-<%= component[:id] %>" class="<%= promethee_class_for(component) %>">
+<div  class="<%= promethee_class_for(component) %>"
+      id="<%= promethee_id_for component %>">
   <% unless headerRow.nil? %>
     <div class="table-responsive">
       <table class="table">
@@ -25,7 +26,13 @@
         </thead>
         <tbody>
           <% rows.each do |row| %>
-            <tr>
+            <%
+              row_class = 'empty'
+              row.each do |cell|
+                row_class = '' unless cell[:text].blank?
+              end
+            %>
+            <tr class="<%= row_class %>">
               <% row.each do |cell| %>
                 <td><%= cell[:text] %></td>
               <% end %>

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

@@ -11,7 +11,7 @@
           text: {
             searchable: true,
             translatable: true,
-            type: 'string',
+            type: 'text',
             value: ''
           }
         }

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

@@ -0,0 +1 @@
+<%# Defined in components/table/_edit.inspect.html.erb %>

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

@@ -0,0 +1 @@
+<%# Defined in components/table/_edit.move.html.erb %>

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

@@ -2,11 +2,11 @@
   <div class="row mt-2" ng-show="master.attributes.text.value || frozen_component.attributes.text.value">
     <div class="col-md-6">
       <b>Text</b>
-      <p>{{ master.attributes.text.value }}</p>
+      <div ng-bind-html="master.attributes.text.value | htmlSafe"></div>
     </div>
     <div class="col-md-6">
       <b>Text</b>
-      <input class="form-control" ng-model="component.attributes.text.value" type="text">
+      <summernote config="summernoteConfig" ng-model="component.attributes.text.value"></summernote>
     </div>
   </div>
 </script>

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

@@ -0,0 +1 @@
+<%# Defined in components/table/_show.html.erb %>

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

@@ -1,7 +1,8 @@
 <%
 body = component[:attributes].dig(:body, :value)&.to_s&.html_safe
 %>
-<div class="<%= promethee_class_for component %>">
+<div  class="<%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
         <%= body %>

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

@@ -14,7 +14,8 @@ else
   iframe_src = url
 end
 %>
-<div class="<%= promethee_class_for component %>">
+<div  class="<%= promethee_class_for component %>"
+      id="<%= promethee_id_for component %>">
   <div class="promethee__component__row">
     <div class="promethee__component__content">
         <div class="embed-responsive embed-responsive-16by9">

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

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

data/lib/promethee/core_ext/tags.rb

@@ -9,7 +9,8 @@ module ActionView
           @options[:master_data] = object.send @method_name unless object.nil?
           @options[:master_data] = @options[:value] if @options.key?(:value)
           @options[:disable_page_attributes] ||= false
-          ApplicationController.renderer.render partial: 'promethee/edit', locals: @options
+
+          @template_object.render partial: 'promethee/edit', locals: @options
         end
       end
 
@@ -18,15 +19,16 @@ module ActionView
           localization_data = object.send @method_name unless object.nil?
           localization_data = @options[:value] if @options.include? :value
           @options[:disable_page_attributes] ||= false
-          ApplicationController.renderer.render partial: 'promethee/localize',
-                                                locals: {
-                                                  object_name: @object_name,
-                                                  method_name: @method_name,
-                                                  localization_data: localization_data,
-                                                  master_data: @options[:master],
-                                                  other_data: @options[:other],
-                                                  disable_page_attributes: @options[:disable_page_attributes]
-                                                }
+
+          @template_object.render partial: 'promethee/localize',
+                                  locals: {
+                                    object_name: @object_name,
+                                    method_name: @method_name,
+                                    localization_data: localization_data,
+                                    master_data: @options[:master],
+                                    other_data: @options[:other],
+                                    disable_page_attributes: @options[:disable_page_attributes]
+                                  }
         end
       end
     end

data/lib/promethee/rails/helper.rb

@@ -3,7 +3,7 @@ module Promethee::Rails::Helper
     render partial: 'promethee/show', locals: { master_data: data, localization_data: options[:l] }
   end
 
-  def promethee_class_for component, *modifiers
+  def promethee_class_for(component, *modifiers)
     base = "promethee__component"
     component_base = "#{base}__#{component[:type]}"
 
@@ -14,6 +14,10 @@ module Promethee::Rails::Helper
     ].flatten.select(&:present?).join ' '
   end
 
+  def promethee_id_for(component)
+    "promethee-component-#{component[:id]}"
+  end
+
   def promethee_component_partials
     promethee_partials_for 'components/*/_edit.*.html.erb'
   end
@@ -22,6 +26,10 @@ module Promethee::Rails::Helper
     render("promethee/components/#{icon}/icon.svg").to_json.html_safe
   end
 
+  def promethee_preset_render_icon(icon)
+    render("promethee/presets/icon.#{icon}.svg").to_json.html_safe
+  end
+
   def promethee_util_partials
     promethee_partials_for 'utils/_*.html.erb'
   end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.9'
+    VERSION = '4.1.14'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.14
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails