promethee 4.1.7 → 4.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273ea8989bee7c01520af11dcedbf568122937eac2c54f57ee493394604f69cf
-  data.tar.gz: 001cfbf000acf02f23daeba707d03156f2bb45eafe9317c355cc54df463460b1
+  metadata.gz: 5c791f3fc87492c74cf0943f04ee9d7c65731ed6769688294dfbe45baee5d663
+  data.tar.gz: e584208ada91f6c1d8e38f2f10d10e6605d3e44db13219c2dbb5f9300e235f43
 SHA512:
-  metadata.gz: e8d5b0383e16473baf45140e8907275e5831fd994c0b6c02127234fa3cb27b991376ec632b53eb556673b6ac96e8a1a504f7c989be802579cf1e99b6355a6eda
-  data.tar.gz: 9e43292b6a4d035c6a6b0a54fd17f115eb63bcc245ff3d561744702e0b5cf22353bed3495b7048471679ab41a198b4456fee21180b82c4f92841ce19a5f3d596
+  metadata.gz: 3c1de9aed61106c72bc8db3e9dcd3fc2481edc42bddfc5ca8adc3015b5cb6620e84f0b991f61a3b7d58f7bbef4eb34eda76705d2265f1d9ce315aac05462d83a
+  data.tar.gz: 0e829aabd72bd3e964cd6d0d8d0ce5872d05f69281e88f114e87d72aaae5268f44e50c4e4206f74331312f07eacf7949be2ff9cc11d70bcda565c9f4e35fb147

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/_localize.html.erb

@@ -53,11 +53,17 @@ promethee_masters_multiple = Promethee::Data::MastersMultiple.new master_data, o
     $scope.data = <%= promethee_data.to_json.html_safe %>;
     $scope.masters = mastersMultiple;
     $scope.masters.set(<%= promethee_masters_multiple.to_json.html_safe %>);
+
     $scope.$watch('data', function(new_val, old_val) {
       if (old_val != new_val) {
         window.warnBeforeUnload.lock();
       }
     }, true);
+
+    $scope.freezeData = function (data) {
+      return JSON.parse(JSON.stringify(data));
+    };
+
     $scope.copyTranslations = function(event) {
       event.preventDefault();
       if (confirm('Warning: this will overwrite every translations!')) {
@@ -97,7 +103,9 @@ promethee_masters_multiple = Promethee::Data::MastersMultiple.new master_data, o
      ng-controller="PrometheeLocalizerController as prometheeLocalizerController">
 
   <script type="text/ng-template" id="promethee/localize/component">
-    <span class="hidden d-none">{{ master = masters.masterForComponent(component) }}</span>
+    <span class="hidden d-none" ng-init="frozen_component = freezeData(component)">
+      {{ master = masters.masterForComponent(component) }}
+    </span>
     <ng-include src="'promethee/components/' + component.type + '/localize'"></ng-include>
   </script>
 

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

@@ -14,7 +14,7 @@
     </div>
   </div>
 
-  <div class="row" ng-show="master.attributes.collapsed_content.value">
+  <div class="row" ng-show="master.attributes.collapsed_content.value || frozen_component.attributes.collapsed_content.value">
     <div class="col-md-6">
       <b>Aside collapsed content</b>
       <div ng-bind-html="master.attributes.collapsed_content.value | htmlSafe"></div>
@@ -27,7 +27,7 @@
     </div>
   </div>
 
-  <div class="row" ng-show="master.attributes.collapsed_content.value">
+  <div class="row" ng-show="master.attributes.open_label.value || frozen_component.attributes.open_label.value">
     <div class="col-md-6">
       <b>Button label</b>
       <div ng-bind-html="master.attributes.open_label.value | htmlSafe"></div>

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/_localize.html.erb

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/blockquote/localize">
-  <div ng-show="master.attributes.body.value">
+  <div ng-show="master.attributes.body.value || frozen_component.attributes.body.value">
     <hr>
     <div class="row">
       <div class="col-md-6">
@@ -15,7 +15,7 @@
     </div>
   </div>
 
-  <div class="row" ng-show="master.attributes.author.value">
+  <div class="row" ng-show="master.attributes.author.value || frozen_component.attributes.author.value">
     <div class="col-md-6">
       <b>Author</b>
       <p>{{master.attributes.author.value}}</p>

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/_localize.html.erb

@@ -1,8 +1,8 @@
 <script type="text/ng-template" id="promethee/components/collection_item/localize">
-  <div ng-show="master.attributes.caption.value !== '' || master.attributes.media_type.value == 'video'">
+  <div ng-show="master.attributes.caption.value || frozen_component.attributes.caption.value || master.attributes.media_type.value == 'video'">
     <hr>
 
-    <div class="row" ng-show="master.attributes.caption.value !== ''">
+    <div class="row" ng-show="master.attributes.caption.value || frozen_component.attributes.caption.value">
       <div class="col-md-6">
         <b>Collection Item Caption</b>
         <div class="promethee-edit__wrapper" ng-bind-html="master.attributes.caption.value | htmlSafe"></div>

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/_localize.html.erb

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/cover/localize">
-  <div ng-show="master.attributes.surtitle.value || master.attributes.title.value || master.attributes.subtitle.value">
+  <div ng-show="master.attributes.surtitle.value || frozen_component.attributes.surtitle.value || master.attributes.title.value || frozen_component.attributes.title.value || master.attributes.subtitle.value || frozen_component.attributes.subtitle.value">
     <hr>
 
     <div class="row">
@@ -8,7 +8,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.surtitle.value">
+    <div class="row" ng-show="master.attributes.surtitle.value || frozen_component.attributes.surtitle.value">
       <div class="col-md-6">
         <b>Surtitle</b>
         <p>{{master.attributes.surtitle.value}}</p>
@@ -21,7 +21,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.title.value">
+    <div class="row" ng-show="master.attributes.title.value || frozen_component.attributes.title.value">
       <div class="col-md-6">
         <b>Title</b>
         <p>{{master.attributes.title.value}}</p>
@@ -34,7 +34,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.subtitle.value">
+    <div class="row" ng-show="master.attributes.subtitle.value || frozen_component.attributes.subtitle.value">
       <div class="col-md-6">
         <b>Subtitle</b>
         <p>{{master.attributes.subtitle.value}}</p>

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/_localize.html.erb

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/faq_item/localize">
-  <div ng-show="master.attributes.title.value">
+  <div ng-show="master.attributes.title.value || frozen_component.attributes.title.value">
     <hr>
     <div class="row">
       <div class="col-md-6">

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/_localize.html.erb

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/image/localize">
-  <div ng-show="master.attributes.alt.value || master.attributes.caption.value">
+  <div ng-show="master.attributes.alt.value || frozen_component.attributes.alt.value || master.attributes.caption.value || frozen_component.attributes.caption.value">
     <hr>
 
     <div class="row">
@@ -11,7 +11,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.caption.value">
+    <div class="row" ng-show="master.attributes.caption.value || frozen_component.attributes.caption.value">
       <div class="col-md-6">
         <b>Caption</b>
         <p>{{master.attributes.caption.value}}</p>
@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <div class="row" ng-show="master.attributes.alt.value">
+  <div class="row" ng-show="master.attributes.alt.value || frozen_component.attributes.alt.value">
     <div class="col-md-6">
       <b>Alt</b>
       <p>{{master.attributes.alt.value}}</p>

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/_localize.html.erb

@@ -15,7 +15,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.description.value">
+    <div class="row" ng-show="master.attributes.description.value || frozen_component.attributes.description.value">
       <div class="col-md-6">
         <div>
           <b>Page description</b>

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/_localize.html.erb

@@ -1,8 +1,8 @@
 <script type="text/ng-template" id="promethee/components/slider_item/localize">
-  <div ng-show="master.attributes.caption.value !== '' || master.attributes.media_type.value == 'video'">
+  <div ng-show="master.attributes.caption.value || frozen_component.attributes.caption.value || master.attributes.media_type.value == 'video'">
     <hr>
 
-    <div class="row" ng-show="master.attributes.caption.value !== ''">
+    <div class="row" ng-show="master.attributes.caption.value || frozen_component.attributes.caption.value">
       <div class="col-md-6">
         <b>Slider Item Caption</b>
         <div class="promethee-edit__wrapper" ng-bind-html="master.attributes.caption.value | htmlSafe"></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/table_cell/_localize.html.erb

@@ -1,14 +1,12 @@
 <script type="text/ng-template" id="promethee/components/table_cell/localize">
-  <div ng-show="master.attributes.text.value !== ''">
-    <div class="row mt-2" ng-show="master.attributes.text.value !== ''">
-      <div class="col-md-6">
-        <b>Text</b>
-        <p>{{ master.attributes.text.value }}</p>
-      </div>
-      <div class="col-md-6">
-        <b>Text</b>
-        <input class="form-control" ng-model="component.attributes.text.value" type="text">
-      </div>
+  <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>
+    <div class="col-md-6">
+      <b>Text</b>
+      <input class="form-control" ng-model="component.attributes.text.value" type="text">
     </div>
   </div>
 </script>

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

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/text/localize">
-  <div ng-show="master.attributes.body.value">
+  <div ng-show="master.attributes.body.value || frozen_component.attributes.body.value">
     <hr>
     <div class="row">
       <div class="col-md-6">

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/_localize.html.erb

@@ -1,5 +1,5 @@
 <script type="text/ng-template" id="promethee/components/video/localize">
-  <div ng-show="master.attributes.url.value !== ''">
+  <div ng-show="master.attributes.url.value || frozen_component.attributes.url.value">
     <hr>
     <div class="row">
       <div class="col-md-6">

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/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

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.7'
+    VERSION = '4.1.12'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.12
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page