promethee 4.1.11 → 4.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127788b2baff0c77cb441f018c0adc511e4aaff84bfba93276930a3e4a171fda
-  data.tar.gz: e95d0e73b4f55a49e413b26cd4dd1f33201ed6789333a6c096ea1bbdb509ef30
+  metadata.gz: 310831237cbf7ee4493331c7bd1101275bc33c5ab5f34a6742104f9bdc4a6da8
+  data.tar.gz: efc159fd105c74f764acd164a69e72753a1b581f76e1e08e22b7ee020ec1a9dc
 SHA512:
-  metadata.gz: 6bf1217f025ca8a000451e857364077ce3b59b690eb8be6258a977023e42483333a4452a6e34939ca24465093743ce8347c31f241f808e19bf76ec692cfd8c00
-  data.tar.gz: ea9aaecf392990eb231a1311b41fb50e32a942e16c677f3dd45eb57bd6ee0b71f28ac0245e64e3a93831d966d05732d9cf09562ba2d8f922fd21214594eaedb4
+  metadata.gz: 42ef37255720cc041e58f3092ba3731a97a58b80196e7bee290839c64f0e7b9222bc0d0aa8c56e3f45b40d4190da0bf03533a4152f873d9a29fade61cda869b7
+  data.tar.gz: d8aadec0f132cca1fcf21e1dad8ce35f8221c63807131ff76910a726ad547a100c433c1068bb37b3a91cb109ac6ea196a4ba021dcd0bbd02d4c86833b9d3a386

data/app/assets/stylesheets/promethee.sass

@@ -160,6 +160,18 @@ $black: #000000 !default
             .fontawesome-carousel-control .fa
                 font-size: 30px
 
+        &__table
+            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
         &__page > &__blockquote,

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

@@ -9,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

@@ -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
       }
     }
   }
@@ -26,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/_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

@@ -14,7 +14,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.11'
+    VERSION = '4.1.16'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.11
+  version: 4.1.16
 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.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page