promethee 4.1.14 → 4.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f9aa0e77a8e849cdd8342fe18743536c033f23799c5d9102b2b385dabaae32
-  data.tar.gz: ff506afde6c8864d8044157b6975e5af4dad9b149f96152ca493b0557f90cfaf
+  metadata.gz: e0202c3a06adee87b027bd87f91fcddc40589f69b87ca0e8c339ada4d8c8bc1c
+  data.tar.gz: dc44a85d95c036e7722fef480429c463537b187fa82bad23da6ca77acf343192
 SHA512:
-  metadata.gz: be067209b5e1bdcb607bdfa54af4e929369f2d3a66b3d395bd12ea1c23f6088fb658527a762638acf8f3ea6c27a0067cd05895663af81ff99b2b12a5d826e9b3
-  data.tar.gz: 260e42af1d557b4d78cfe26cc549b7921e51b3ed65561646a13b0cbd64de25bd2a7f123e0ec720156c5dd1b7736933607a0c607a69aeb59e4129c9e6480e6ee6
+  metadata.gz: 31c67bce9a4ccebaa8329ec2588a0e8dc0f476f3d5cb5b3278c70d77f7557e1fc1f01265892cc77c9859ca698d84b760db22dc05b32804676ac227f2f073aa3e
+  data.tar.gz: 117054709489073c7fe9e14bf491e5b78c467466d1800213ef30bc5c643361c1f120338a5371e45996e9612982c0407a22bd26b12b26fb9aa193e98150738169

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

@@ -163,6 +163,7 @@ $black: #000000 !default
         &__table
             tr
                 p
+                    line-height: $line-height-base
                     margin-bottom: 0
                 &.empty
                     background-color: #EEEEEE

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/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.14'
+    VERSION = '4.1.19'
   end
 end

metadata

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