promethee 4.1.13 → 4.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5995134837ab9a1ecff1e378a5cd6c2c773661bba57fb3a5a4a312421b689ac6
-  data.tar.gz: 3a832f11734ccbcbddd6f725d4842b71ab924a2ea882481028b43d0feec3ff2f
+  metadata.gz: c4fec398977caedb678199760eda8f8048a8ad3578a575fe6750ec8ab0829294
+  data.tar.gz: a8ead5a99ade251233f48277368067b2b0c283de4a4019dc92dd7f4a21979f21
 SHA512:
-  metadata.gz: 79e066c623432ba0eaefab072649c311fa0d6ca72f329f6813b55db52e0b19b44feff6961420c894c14ee656825e926e636b4ad4deed735eec6cca5f4b589d68
-  data.tar.gz: e392f5c4b4a3c56b0f19d896ab287e0624a24c2db5429d7bfa8d2e117415e94b950846a040fe477a92e53457156604cc8c69735fb72064cd274929c826e1436e
+  metadata.gz: 182b0e99d95aee2780171efcd08518d47fbe200dfca49c0d10122b87d2c2987301e890b5848ec04589f6570252c9b69c3fe8b3fc13e7143d7bc2e9c48db9c636
+  data.tar.gz: 042ee1425887e10eeb3bd1d3a8ca8d4ab28ac179c19843260863487468021c9445b56685629e298c04cfe214cfd64bbb4f82b81e7c30d1fe372bd5cc0c848520

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

@@ -140,8 +140,8 @@
 
     &__component--blockquote
         text-align: center
-
         .blockquote
+            padding-top: 20px
             &::before, &::after
                 display: inline-block
             &::before
@@ -151,6 +151,8 @@
             p
                 display: inline
                 line-height: 1.4rem
+                &:last-child
+                    margin-bottom: 0
 
 
 @media (min-width: 768px)

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

@@ -8,7 +8,7 @@
             border: 1px solid #CCCCCC
             display: flex
             flex-direction: column
-            justify-content: center
+            justify-content: flex-start
             min-height: 70px
             position: relative
             p.text-empty
@@ -21,14 +21,38 @@
                     color: white
         &__remove
             background: white
-            font-size: 12px
-            line-height: 12px
-            padding: 1px 2px 1px 3px
+            font-size: 10px
+            line-height: 10px
+            padding: 1px 3px
             position: absolute
-            right: 4px
+            right: 5px
             top: 4px
             z-index: 1
 
+        &--row
+            .row
+                margin-left: -10px
+                margin-right: -10px
+            .promethee-edit__component--column
+                padding-bottom: 5px
+                padding-top: 5px
+
+        &--text
+            .promethee-edit__component__inner
+                padding: 10px
+            h1, h2, h3
+                margin-top: 0
+            p
+                line-height: 1.2
+                &:last-of-type
+                    margin-bottom: 0
+
+        &--image
+            figure
+                margin-bottom: 0
+            figcaption
+                padding: 5px
+
         &--aside
             .btn
                 &.left
@@ -57,6 +81,9 @@
                     align-items: center
                     display: flex
                     justify-content: center
+                p
+                    &:last-of-type
+                        margin-bottom: 0
             .dots
                 margin-top: 5px
                 text-align: center
@@ -118,24 +145,23 @@
         color: white
         font-size: 8px
         margin-bottom: 5px
-        padding: 4px 5px 5px
+        padding: 5px 10px
         text-transform: uppercase
     &__component
         user-select: none
 
     &__droppable
         background: white
-        border: 1px dashed #253742
+        border: 0 dashed #253742
         box-sizing: border-box
-        height: 20px
-        margin: 2px 0
         opacity: .2
         position: relative
-        transition: width .2s, height .2s, opacity .2s
-        visibility: hidden
-        width: 100%
+        transition: all .5s
+        width: calc(100% - 4px)
         &.ui-droppable-active
-            visibility: visible
+            border-width: 1px
+            height: 20px
+            margin: 2px
         &.ui-droppable-hover
             height: 100px
             opacity: 1
@@ -157,7 +183,7 @@
             padding: 30px 20px 15px
             position: fixed
             top: 50px
-            width: calc(50vw - 365px)
+            width: calc(50vw - 367px)
             z-index: 1000
             &-header
                 font-size: 18px

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

@@ -7,7 +7,7 @@
 
     <div class="form-group">
       <label class="label-control">Description</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.description.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.description.value"></textarea>
     </div>
   <% end %>
 
@@ -16,12 +16,12 @@
 
     <div class="form-group">
       <label class="label-control">Stylesheets</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.stylesheets.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.stylesheets.value"></textarea>
     </div>
 
     <div class="form-group">
       <label class="label-control">Javascripts</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.javascripts.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.javascripts.value"></textarea>
     </div>
   </div>
 </script>

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

@@ -25,7 +25,7 @@
       <div class="col-md-6">
         <div class="form-group">
           <b>Page description</b>
-          <textarea class="form-control" ng-model="component.attributes.description.value"></textarea>
+          <textarea class="form-control" rows="6" ng-model="component.attributes.description.value"></textarea>
         </div>
       </div>
     </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
       }
     }
   }

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/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/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.13'
+    VERSION = '4.1.18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.13
+  version: 4.1.18
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-11-13 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