promethee 4.1.12 → 4.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c791f3fc87492c74cf0943f04ee9d7c65731ed6769688294dfbe45baee5d663
-  data.tar.gz: e584208ada91f6c1d8e38f2f10d10e6605d3e44db13219c2dbb5f9300e235f43
+  metadata.gz: 0e6e42f0d4cb145f8b35d05d3f25bd1aa3a232893b582a33dd1b87f6ec12a043
+  data.tar.gz: bf7f8e5795187559af358cd49d9c765e410aba8636c3015e6b51f4f6b4dd11b6
 SHA512:
-  metadata.gz: 3c1de9aed61106c72bc8db3e9dcd3fc2481edc42bddfc5ca8adc3015b5cb6620e84f0b991f61a3b7d58f7bbef4eb34eda76705d2265f1d9ce315aac05462d83a
-  data.tar.gz: 0e829aabd72bd3e964cd6d0d8d0ce5872d05f69281e88f114e87d72aaae5268f44e50c4e4206f74331312f07eacf7949be2ff9cc11d70bcda565c9f4e35fb147
+  metadata.gz: 0b2631fe22a469a19b9e76dddb109c9b6829cffc46df68f123a4cc2fae106474c6927a93bcf2d6fd89af06a9f981dadf96683c74b365aabde8a2febfcb2ff3e9
+  data.tar.gz: 4f3b348bceb066ad90efecaf6b5bd7cc621cc57facab8cfba2de7c9a0917f02075e54a9c729bafe62eb106f49842ad57a2b24c7ba2be1794512fac3c00da113b

data/app/assets/stylesheets/promethee.sass

@@ -161,12 +161,16 @@ $black: #000000 !default
                 font-size: 30px
 
         &__table
-            tr.empty
-                background-color: #EEEEEE
-                td
-                    line-height: 1px
-                    padding-bottom: 1px
-                    padding-top: 1px
+            tr
+                p
+                    line-height: $line-height-base
+                    margin-bottom: 0
+                &.empty
+                    background-color: #EEEEEE
+                    td
+                        line-height: 1px
+                        padding-bottom: 1px
+                        padding-top: 1px
 
 
         // component direct in root

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

@@ -24,7 +24,7 @@ end
     <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: '', title: '', caption: caption %>
   <% end %>
   <div class="collection-item__content__caption">
     <%= caption %>

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

@@ -19,7 +19,7 @@ image_blob = blob_from_data component[:attributes].dig(:image, :value)
     <% if image_blob %>
       <div class="row ">
         <div class="col-3 col-xs-3">
-          <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: '' %>
+          <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', title: '', caption: '' %>
         </div>
         <div class="col-9 col-xs-9">
           <%= body %>

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

@@ -28,6 +28,12 @@
             translatable: true,
             type: 'string',
             value: ''
+          },
+          title: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
           }
         }
       }

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

@@ -12,5 +12,10 @@
       <label class="label-control">Alt</label>
       <input class="form-control" ng-model="promethee.inspected.attributes.alt.value">
     </div>
+
+    <div class="form-group">
+      <label class="label-control">Title</label>
+      <input class="form-control" ng-model="promethee.inspected.attributes.title.value">
+    </div>
   </div>
 </script>

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

@@ -37,4 +37,17 @@
       </div>
     </div>
   </div>
+
+  <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>
+    </div>
+    <div class="col-md-6">
+      <div class="form-group">
+        <b>Title</b>
+        <input class="form-control" ng-model="component.attributes.title.value" type="text">
+      </div>
+    </div>
+  </div>
 </script>

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

@@ -2,13 +2,14 @@
 blob = blob_from_data component[:attributes].dig(:image, :value)
 
 alt = component[:attributes].dig(:alt, :value)&.to_s
+title = component[:attributes].dig(:title, :value)&.to_s
 caption = component[:attributes].dig(:caption, :value)&.to_s
 %>
 <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 %>
+      <%= render 'promethee/show/image.srcset', blob: blob, alt: alt, title: title, caption: caption if blob %>
       <% unless caption.blank? %>
         <figcaption>
           <%= caption %>

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

@@ -24,7 +24,7 @@ end
     <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, image_zoomable: false %>
+    <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', title: '', 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
       }
     }
   }

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/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/app/views/promethee/show/_image.srcset.html.erb

@@ -1,6 +1,10 @@
-<% image_zoomable = true if image_zoomable.nil? # do not use ||= as image_zoomable may be "false" %>
-<% fullsize_url = url_for(blob) %>
-<%  image_width = blob.metadata.has_key?(:width) ? blob.metadata[:width] : ActiveStorage::Analyzer::ImageAnalyzer.new(blob).metadata[:width] %>
+<%
+image_zoomable = true if image_zoomable.nil? # do not use ||= as image_zoomable may be "false"
+fullsize_url = url_for(blob)
+image_width = blob.metadata.has_key?(:width) ? blob.metadata[:width] : ActiveStorage::Analyzer::ImageAnalyzer.new(blob).metadata[:width]
+alt ||= ''
+title ||= ''
+%>
 
 <% if image_zoomable %>
   <a data-fancybox="gallery" title="<%= strip_tags(caption) %>" href="<%= fullsize_url %>">
@@ -14,7 +18,8 @@
         "
         width="<%= image_width %>"
         sizes="100vw"
-        alt="<%= alt.html_safe %>"
+        alt="<%= j alt %>"
+        title="<%= j title %>"
         class="img-fluid img-responsive"
         >
 

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

@@ -26,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.12'
+    VERSION = '4.1.17'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.1.17
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-11-06 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.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page