promethee 4.1.10 → 4.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0beecf6dd37d65be3957b1610ebc4c938388e787b8e8c6991c0a5d467ffd665b
-  data.tar.gz: b897dd103018126be4ef58c662f59acf90ff43302db2c3d35ffa8627dcf25670
+  metadata.gz: 1e57882a0cb77abd8067687f897b6e06db45a0cb91daebfb46418fa225c72a36
+  data.tar.gz: 0050dcff099a4a343b347cc1e89c327bbf18c9ad6ec4cfbc7ddfa52507e11903
 SHA512:
-  metadata.gz: 9bb4b71ab5b06e25c62ae3ed09147f909bdf6cd65d6869242e55b9a05c723d75289958f4e84ddf89b0fc6886215aed0730219e5e4f7688e773ad63d330873955
-  data.tar.gz: 8ec5b9f95b687ec5d658df2260e896c30ef09fb7a962ec7ecf694e4762a16e5afd9cc86df57de4e8c82a7008bdefe6b82a3aae47b990d3fe2978481bae3a6a50
+  metadata.gz: d30d4542b80ae01b5291f476d8288ac95530562b88869723d9561f3785a2d63561e69327d2931c0f237ee369422b351964d24f13f69ffb06bcdd8dc81fe85edf
+  data.tar.gz: 121d035c280c9d759ba01340df50839135e6562a73950c1c57ee39c440fd6c5e1070e4279bb1e0700b89c3bc7bea688c5f1c6f67ea16d755c92ca050bc0f1bd5

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/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 %>
+    <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', 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/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.10'
+    VERSION = '4.1.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.15
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails