promethee 4.1.2 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc4afceb6c4315b9d5728d0c3e1b2d2ed3f800a28ac60aac2cc13754316db5b
-  data.tar.gz: b5e05bc16cd784f62be3b04750f7c5cf01e77fd083c2f2ffa38b8d9afe2cd421
+  metadata.gz: 273ea8989bee7c01520af11dcedbf568122937eac2c54f57ee493394604f69cf
+  data.tar.gz: 001cfbf000acf02f23daeba707d03156f2bb45eafe9317c355cc54df463460b1
 SHA512:
-  metadata.gz: 2e1dfc1eea044db0d8d4ab9d6da90012ef45ece957a48479e7514698e2c6683ea124611d5fc6b6d9f8df3cea435564a92ec5af5dabe7cdcbfa0be50f11a5b44f
-  data.tar.gz: c31ddf29e3aad80ca4066ea2427c375c401b9169ded619450fbfd3e7bd8794eef47eb050f1b7c77780a832bca14448d12c276d0524b029c3ca9294741b2fe356
+  metadata.gz: e8d5b0383e16473baf45140e8907275e5831fd994c0b6c02127234fa3cb27b991376ec632b53eb556673b6ac96e8a1a504f7c989be802579cf1e99b6355a6eda
+  data.tar.gz: 9e43292b6a4d035c6a6b0a54fd17f115eb63bcc245ff3d561744702e0b5cf22353bed3495b7048471679ab41a198b4456fee21180b82c4f92841ce19a5f3d596

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

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

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/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.2'
+    VERSION = '4.1.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.7
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,22 +14,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -118,16 +124,16 @@ dependencies:
   name: summernote-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge_existing_keys
   requirement: !ruby/object:Gem::Requirement