promethee 4.1.8 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a33ce9e6312e37485cedecf012ec40d94192351e6e401167e32422eef6e190
-  data.tar.gz: 9dd9dd15ca827d6b5ddca45fe561b97b9bd866160c0e2ae2e159ba12fe0bf71d
+  metadata.gz: 5995134837ab9a1ecff1e378a5cd6c2c773661bba57fb3a5a4a312421b689ac6
+  data.tar.gz: 3a832f11734ccbcbddd6f725d4842b71ab924a2ea882481028b43d0feec3ff2f
 SHA512:
-  metadata.gz: 392c05d4d2adafd32d51056c221d3a8c9f690e2a7c46c1b57ebdae481667dce00cf0790841a9db746ec3bec9c4be2200e81720d592b3aa5ac753480b358c761f
-  data.tar.gz: 65c267a80b55d9dd606f49d4980f38ea875c13a2d69e92587407093b40e399d8d87857e01e9ec972ec1db343ad7c4e1891c53e08ed1c3e895fb6588ef0d08045
+  metadata.gz: 79e066c623432ba0eaefab072649c311fa0d6ca72f329f6813b55db52e0b19b44feff6961420c894c14ee656825e926e636b4ad4deed735eec6cca5f4b589d68
+  data.tar.gz: e392f5c4b4a3c56b0f19d896ab287e0624a24c2db5429d7bfa8d2e117415e94b950846a040fe477a92e53457156604cc8c69735fb72064cd274929c826e1436e

data/app/assets/stylesheets/promethee.sass

@@ -160,6 +160,14 @@ $black: #000000 !default
             .fontawesome-carousel-control .fa
                 font-size: 30px
 
+        &__table
+            tr.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,16 @@ 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 %>
-  <%= caption %>
+  <div class="carousel-item__content__caption">
+    <%= caption %>
+  </div>
 </div>

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

@@ -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/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.8'
+    VERSION = '4.1.13'
   end
 end

metadata

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