promethee 4.1.3 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91ca04c762aa3d0a47a07c44702de24ee1d34f1b6d488623c72f7b94198cd6a
-  data.tar.gz: b5b97483969c8cac91180a2e04b351b393c17e61a986dffa3fcc3c716dfab390
+  metadata.gz: 90a33ce9e6312e37485cedecf012ec40d94192351e6e401167e32422eef6e190
+  data.tar.gz: 9dd9dd15ca827d6b5ddca45fe561b97b9bd866160c0e2ae2e159ba12fe0bf71d
 SHA512:
-  metadata.gz: b7952215fec899231ef7f66a4d8c23bed46418b92b2845816fa6f19885f1958268aa69a4cd7a6757e44e783c0ca66215038d981f435a139f633e025c391ceb10
-  data.tar.gz: bd26801c9f12d5cfa9f6bff198738e6453842574f6473b6c26a1bd9e3e5b1b11200a096de91434d5b449e37c5a8dd75518e3dedd8de0b896d718ab2facd47705
+  metadata.gz: 392c05d4d2adafd32d51056c221d3a8c9f690e2a7c46c1b57ebdae481667dce00cf0790841a9db746ec3bec9c4be2200e81720d592b3aa5ac753480b358c761f
+  data.tar.gz: 65c267a80b55d9dd606f49d4980f38ea875c13a2d69e92587407093b40e399d8d87857e01e9ec972ec1db343ad7c4e1891c53e08ed1c3e895fb6588ef0d08045

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

@@ -6,10 +6,12 @@
         line-height: 100%
         &__inner
             border: 1px solid #CCCCCC
-            min-height: 50px
+            display: flex
+            flex-direction: column
+            justify-content: center
+            min-height: 70px
             position: relative
             p.text-empty
-                line-height: 50px
                 margin-bottom: 0
         &--selected
             > .promethee-edit__component__inner

data/app/assets/stylesheets/promethee.sass

@@ -164,20 +164,26 @@ $black: #000000 !default
         // component direct in root
         &__page > &__blockquote,
         &__page > &__cover
-            .promethee__component__content
-                @extend .col-md-8
-                @extend .offset-md-2 !optional
-                @extend .col-md-offset-2 !optional
+            .promethee__component
+                &__row
+                    @extend .row
+                &__content
+                    @extend .col-md-8
+                    @extend .offset-md-2 !optional
+                    @extend .col-md-offset-2 !optional
 
         &__page > &__aside,
         &__page > &__faq,
         &__page > &__image,
         &__page > &__text,
         &__page > &__video
-            .promethee__component__content
-                @extend .col-md-10
-                @extend .offset-md-1 !optional
-                @extend .col-md-offset-1 !optional
+            .promethee__component
+                &__row
+                    @extend .row
+                &__content
+                    @extend .col-md-10
+                    @extend .offset-md-1 !optional
+                    @extend .col-md-offset-1 !optional
 
 
         @media screen and (max-width: 767.98px)
@@ -187,6 +193,9 @@ $black: #000000 !default
             &__page > &__video
                 padding-left: 0
                 padding-right: 0
+                .promethee__component__row
+                    margin-left: 0
+                    margin-right: 0
                 .promethee__component__content
                     padding-left: 0
                     padding-right: 0

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

@@ -17,9 +17,9 @@
   <div class="form-group">
     <label class="label-control">Button label position</label>
     <div>
-      <label class="radio-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="left" />Left </label>
-      <label class="radio-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="center" />Center </label>
-      <label class="radio-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="right" />Right </label>
+      <label class="radio-inline form-check form-check-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="left" class="form-check-input" />Left </label>
+      <label class="radio-inline form-check form-check-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="center" class="form-check-input" />Center </label>
+      <label class="radio-inline form-check form-check-inline"> <input ng-model="promethee.inspected.attributes.open_label_position.value" type="radio" value="right" class="form-check-input" />Right </label>
     </div>
   </div>
 </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/blockquote/_edit.define.html.erb

@@ -16,7 +16,7 @@
           },
           author: {
             searchable: true,
-            translatable: false,
+            translatable: true,
             type: 'string',
             value: ''
           }

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/collection/_edit.inspect.html.erb

@@ -3,16 +3,16 @@
     <label class="label-control">Items per line (on desktop):</label>
     <div class="row">
       <div class="col-xs-2 col-2">
-        <input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="2"> 2
+        <label class="radio-inline form-check form-check-inline"><input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="2" class="form-check-input">2</label>
       </div>
       <div class="col-xs-2 col-2">
-        <input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="3"> 3
+        <label class="radio-inline form-check form-check-inline"><input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="3" class="form-check-input">3</label>
       </div>
       <div class="col-xs-2 col-2">
-        <input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="4"> 4
+        <label class="radio-inline form-check form-check-inline"><input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="4" class="form-check-input">4</label>
       </div>
       <div class="col-xs-2 col-2">
-        <input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="6"> 6
+        <label class="radio-inline form-check form-check-inline"><input ng-model="promethee.inspected.attributes.items_per_line.value" type="radio" ng-value="6" class="form-check-input">6</label>
       </div>
     </div>
   </div>

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

@@ -2,8 +2,8 @@
   <div class="form-group">
     <label class="label-control">Media type</label>
     <div>
-      <label class="radio-inline"> <input ng-model="promethee.inspected.attributes.media_type.value" type="radio" value="image" />Image </label>
-      <label class="radio-inline"> <input ng-model="promethee.inspected.attributes.media_type.value" type="radio" value="video" />Video </label>
+      <label class="radio-inline form-check form-check-inline"> <input ng-model="promethee.inspected.attributes.media_type.value" type="radio" value="image" class="form-check-input" />Image </label>
+      <label class="radio-inline form-check form-check-inline"> <input ng-model="promethee.inspected.attributes.media_type.value" type="radio" value="video" class="form-check-input" />Video </label>
     </div>
   </div>
 

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

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

data/app/views/promethee/show/_image.srcset.html.erb

@@ -3,7 +3,7 @@
 <%  image_width = blob.metadata.has_key?(:width) ? blob.metadata[:width] : ActiveStorage::Analyzer::ImageAnalyzer.new(blob).metadata[:width] %>
 
 <% if image_zoomable %>
-  <a data-fancybox title="<%= strip_tags(caption) %>" href="<%= fullsize_url %>">
+  <a data-fancybox="gallery" title="<%= strip_tags(caption) %>" href="<%= fullsize_url %>">
 <% end %>
     <img src="<%= fullsize_url %>"
         srcset="

data/lib/promethee/data/localization.rb

@@ -11,11 +11,13 @@ class Promethee::Data::Localization < Promethee::Data
 
   # We want to be up to date with the master, so this method will:
   # 1.take the master's components flattened
-  # 2 substitute what's already localized, based on the component id
+  # 2 substitute values of what's already localized, based on the component id
   # Consequences of step 1 are:
   # 1 it adds new components from the master
   # 2 it removes components not in the master anymore
   # 3 it takes the order from the master
+  # 4 use all translatable attributes from the master
+  # 5 merge them with translation values if they exist
   def merge
     @data_before_merge = @data.deep_dup
     @data = {
@@ -23,11 +25,10 @@ class Promethee::Data::Localization < Promethee::Data
       components: []
     }
     @master_data.flat.each do |master_component|
+      translatable_master_component = get_component_without_attributes_values(master_component)
       localized_component = find_localized_component master_component[:id]
-      # We take the localized component if it exists, the master component otherwise
-      component = localized_component || get_component_without_attributes_values(master_component)
-      component[:attributes] ||= {}
-      # We add it to the list of localized components
+
+      component = get_merged_translatable_component(translatable_master_component, localized_component)
       @data[:components] << component
     end
   end
@@ -43,6 +44,21 @@ class Promethee::Data::Localization < Promethee::Data
     clean_component
   end
 
+  def get_merged_translatable_component(master_component, localized_component)
+    # Not found in translation, we use the prepared master component
+    return master_component if localized_component.nil?
+
+    master_component[:attributes] ||= {}
+    localized_component[:attributes] ||= {}
+
+    # Merge values with the prepared master, allowing to add missing attributes from translation
+    master_component[:attributes].each do |attr_key, attr_value|
+      attr_value[:value] = localized_component.dig(:attributes, attr_key, :value) || ''
+    end
+
+    master_component
+  end
+
   def find_localized_component(id)
     return unless @data_before_merge
     return unless @data_before_merge.include? :components

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.3'
+    VERSION = '4.1.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.8
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,22 +14,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: angularjs-rails
   requirement: !ruby/object:Gem::Requirement