promethee 3.0.2 → 4.0.0

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

@@ -1,3 +1,2 @@
 <script type="text/ng-template" id="promethee/components/column/localize">
-
 </script>

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

@@ -1,6 +1,6 @@
 <%
-#         576   768   992   1200 
-#          |     |     |     |   
+#         576   768   992   1200
+#          |     |     |     |
 # BS4   xs | sm  | md  | lg  | xl
 # BS3      xs    | sm  | md  | lg
 
@@ -14,16 +14,16 @@
 # - BS3 treats tablets as mobile (wrong behaviour for us)
 
 # Desktop
-size = component[:attributes][:size]
-offset = component[:attributes][:offset]
+size = component[:attributes].dig(:size, :value)
+offset = component[:attributes].dig(:offset, :value)
 classes  = " col-lg-#{size} offset-lg-#{offset} col-lg-offset-#{offset}" # BS4 desktop+, BS3 desktop large
 
 # Tablet override
 # - md for BS4
 # - sm for BS3
-if component[:attributes][:tablet] && component[:attributes][:tablet][:enabled]
-  size = component[:attributes][:tablet][:size]
-  offset = component[:attributes][:tablet][:offset]
+if component[:attributes].dig(:tablet, :value, :enabled, :value)
+  size = component[:attributes].dig(:tablet, :value, :size, :value)
+  offset = component[:attributes].dig(:tablet, :value, :offset, :value)
   classes += " col-md-#{size} col-md-offset-#{offset} offset-md-#{offset}" # BS4, breaks small desktop for BS3
   classes += " col-sm-#{size} col-sm-offset-#{offset} offset-sm-#{offset}" # BS3, breaks mobile landscape for BS4
 else
@@ -34,9 +34,9 @@ end
 # Mobile override
 # - no class for BS4 (xs disappears, sm is treated in the same way)
 # - xs for BS3
-if component[:attributes][:mobile] && component[:attributes][:mobile][:enabled]
-  size = component[:attributes][:mobile][:size]
-  offset = component[:attributes][:mobile][:offset]
+if component[:attributes].dig(:mobile, :value, :enabled, :value)
+  size = component[:attributes].dig(:mobile, :value, :size, :value)
+  offset = component[:attributes].dig(:mobile, :value, :offset, :value)
   classes += " col-#{size} offset-#{offset}" # BS4, does nothing for BS3
   classes += " col-xs-#{size} col-xs-offset-#{offset}" # BS3, does nothing for BS4
 end

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

@@ -9,15 +9,35 @@
         type: 'cover',
         attributes: {
           image: {
-            id: undefined,
-            name: ''
+            searchable: false,
+            translatable: false,
+            type: 'blob',
+            value: {
+              id: undefined,
+              name: ''
+            }
           },
-          searchable_surtitle: '',
-          searchable_title: '',
-          searchable_subtitle: ''
+          surtitle: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          },
+          title: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          },
+          subtitle: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          }
         }
       }
     })
   JAVASCRIPT
 %>
-<div ng-init="<%= init %>"></div>
+<div ng-init="<%= init %>"></div>

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

@@ -1,18 +1,18 @@
 <script type="text/ng-template" id="promethee/components/cover/edit/inspect">
-  <promethee-uploader ng-model="promethee.inspected.attributes.image" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
+  <promethee-uploader ng-model="promethee.inspected.attributes.image.value" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
 
   <div class="form-group">
     <label class="label-control">Surtitle</label>
-    <input ng-model="promethee.inspected.attributes.searchable_surtitle" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.surtitle.value" class="form-control" type="text"/>
   </div>
 
   <div class="form-group">
     <label class="label-control">Title</label>
-    <input ng-model="promethee.inspected.attributes.searchable_title" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.title.value" class="form-control" type="text"/>
   </div>
 
   <div class="form-group">
     <label class="label-control">Subtitle</label>
-    <input ng-model="promethee.inspected.attributes.searchable_subtitle" class="form-control" type="text"/>
+    <input ng-model="promethee.inspected.attributes.subtitle.value" class="form-control" type="text"/>
   </div>
 </script>

data/app/views/promethee/components/cover/_edit.move.html.erb

@@ -2,11 +2,11 @@
   <%= render 'promethee/edit/move.header', type: 'cover' %>
       <div  class=" promethee-edit__wrapper
                     promethee-edit__cover-content"
-            style="background-image:url('{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '' }}')">
+            style="background-image:url('{{ component.attributes.image.value.id ? '/promethee/blob/' + component.attributes.image.value.id : '' }}')">
         <hgroup>
-          <h2 class="surtitle">{{component.attributes.searchable_surtitle}}</h2>
-          <h1>{{component.attributes.searchable_title}}</h1>
-          <h2 class="subtitle">{{component.attributes.searchable_subtitle}}</h2>
+          <h2 class="surtitle">{{component.attributes.surtitle.value}}</h2>
+          <h1>{{component.attributes.title.value}}</h1>
+          <h2 class="subtitle">{{component.attributes.subtitle.value}}</h2>
         </hgroup>
       </div>
     </div>

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

@@ -1,48 +1,48 @@
 <script type="text/ng-template" id="promethee/components/cover/localize">
-  <div ng-show="master.attributes.searchable_surtitle || master.attributes.searchable_title || master.attributes.searchable_subtitle">
+  <div ng-show="master.attributes.surtitle.value || master.attributes.title.value || master.attributes.subtitle.value">
     <hr>
 
     <div class="row">
       <div class="col-md-6">
-        <img ng-src="/promethee/blob/{{master.attributes.image.id}}" class="img-fluid img-responsive">
+        <img ng-src="/promethee/blob/{{master.attributes.image.value.id}}" class="img-fluid img-responsive" style="max-width: 200px">
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.searchable_surtitle">
+    <div class="row" ng-show="master.attributes.surtitle.value">
       <div class="col-md-6">
         <b>Surtitle</b>
-        <p>{{master.attributes.searchable_surtitle}}</p>
+        <p>{{master.attributes.surtitle.value}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Surtitle</label>
-          <input class="form-control" ng-model="component.attributes.searchable_surtitle" type="text">
+          <b>Surtitle</b>
+          <input class="form-control" ng-model="component.attributes.surtitle.value" type="text">
         </div>
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.searchable_title">
+    <div class="row" ng-show="master.attributes.title.value">
       <div class="col-md-6">
         <b>Title</b>
-        <p>{{master.attributes.searchable_title}}</p>
+        <p>{{master.attributes.title.value}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Title</label>
-          <input class="form-control" ng-model="component.attributes.searchable_title" type="text">
+          <b>Title</b>
+          <input class="form-control" ng-model="component.attributes.title.value" type="text">
         </div>
       </div>
     </div>
 
-    <div class="row" ng-show="master.attributes.searchable_subtitle">
+    <div class="row" ng-show="master.attributes.subtitle.value">
       <div class="col-md-6">
         <b>Subtitle</b>
-        <p>{{master.attributes.searchable_subtitle}}</p>
+        <p>{{master.attributes.subtitle.value}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Subtitle</label>
-          <input class="form-control" ng-model="component.attributes.searchable_subtitle" type="text">
+          <b>Subtitle</b>
+          <input class="form-control" ng-model="component.attributes.subtitle.value" type="text">
         </div>
       </div>
     </div>

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

@@ -1,21 +1,21 @@
 <%
-blob = blob_from_data component[:attributes][:image]
+blob = blob_from_data component[:attributes].dig(:image, :value)
 
-searchable_surtitle = component[:attributes][:searchable_surtitle].to_s
-searchable_title = component[:attributes][:searchable_title].to_s
-searchable_subtitle = component[:attributes][:searchable_subtitle].to_s
+surtitle = component[:attributes].dig(:surtitle, :value)&.to_s
+title = component[:attributes].dig(:title, :value)&.to_s
+subtitle = component[:attributes].dig(:subtitle, :value)&.to_s
 %>
 <div id="component-<%= component[:id] %>" class="<%= promethee_class_for(component) %>" style="background-image: url(<%= url_for(blob.variant(resize: '1920>', quality: 95)) if blob %>)">
-  <% if searchable_surtitle.present? %>
-    <p><%= searchable_surtitle %></p>
+  <% if surtitle.present? %>
+    <p><%= surtitle %></p>
   <% end %>
 
-  <% if searchable_title.present? %>
-    <h1><%= searchable_title %></h1>
+  <% if title.present? %>
+    <h1><%= title %></h1>
   <% end %>
 
-  <% if searchable_subtitle.present? %>
-    <p><%= searchable_subtitle %></p>
+  <% if subtitle.present? %>
+    <p><%= subtitle %></p>
   <% end %>
 
 </div>

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

@@ -9,12 +9,32 @@
         type: 'faq_item',
         attributes: {
           image: {
-            id: undefined,
-            name: ""
+            searchable: false,
+            translatable: false,
+            type: 'blob',
+            value: {
+              id: undefined,
+              name: ''
+            }
           },
-          searchable_title: "",
-          searchable_body: "",
-          special_question: false
+          title: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          },
+          body: {
+            searchable: true,
+            translatable: true,
+            type: 'text',
+            value: ''
+          },
+          special_question: {
+            searchable: false,
+            translatable: false,
+            type: 'boolean',
+            value: false
+          }
         }
       }
     })

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

@@ -1,18 +1,18 @@
 <script type="text/ng-template" id="promethee/components/faq_item/edit/inspect">
-  <promethee-uploader ng-model="promethee.inspected.attributes.image" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
+  <promethee-uploader ng-model="promethee.inspected.attributes.image.value" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
 
   <div class="form-group">
     <label class="label-control">Title</label>
-    <input class="form-control" ng-model="promethee.inspected.attributes.searchable_title" type="text">
+    <input class="form-control" ng-model="promethee.inspected.attributes.title.value" type="text">
   </div>
 
   <div class="form-group">
     <label class="label-control">Body</label>
-    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.searchable_body"></summernote>
+    <summernote config="summernoteConfig" ng-model="promethee.inspected.attributes.body.value"></summernote>
   </div>
 
   <div class="form-group">
-    <input ng-model="promethee.inspected.attributes.special_question" type="checkbox" />
+    <input ng-model="promethee.inspected.attributes.special_question.value" type="checkbox" />
     <label class="label-control"> Special question</label>
   </div>
 </script>

data/app/views/promethee/components/faq_item/_edit.move.html.erb

@@ -1,17 +1,17 @@
 <script type="text/ng-template" id="promethee/components/faq_item/edit/move">
   <%= render 'promethee/edit/move.header', type: 'faq_item' %>
       <div class="header">FAQ Item</div>
-      <div class="row promethee-edit__faq_item__content{{ component.attributes.special_question ? '--special' : '' }}">
+      <div class="row promethee-edit__faq_item__content{{ component.attributes.special_question.value ? '--special' : '' }}">
         <div class="col-9 col-xs-9">
-          <h4>{{component.attributes.searchable_title}}</h4>
-          <div ng-bind-html="component.attributes.searchable_body | htmlSafe"></div>
+          <h4>{{component.attributes.title.value}}</h4>
+          <div ng-bind-html="component.attributes.body.value | htmlSafe"></div>
         </div>
         <div class="col-3 col-xs-3">
-          <figure ng-show="component.attributes.image.id">
-            <img ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}" class="img-fluid img-responsive">
+          <figure ng-show="component.attributes.image.value.id">
+            <img ng-src="{{ component.attributes.image.value.id ? '/promethee/blob/' + component.attributes.image.value.id : '#' }}" class="img-fluid img-responsive">
           </figure>
         </div>
       </div>
     </div>
   </div>
-</script>
+</script>

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

@@ -1,27 +1,27 @@
 <script type="text/ng-template" id="promethee/components/faq_item/localize">
-  <div ng-show="master.attributes.searchable_title">
+  <div ng-show="master.attributes.title.value">
     <hr>
     <div class="row">
       <div class="col-md-6">
         <b>Title</b>
-        <p>{{master.attributes.searchable_title}}</p>
+        <p>{{master.attributes.title.value}}</p>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Title</label>
-          <input class="form-control" ng-model="component.attributes.searchable_title" type="text">
+          <b>Title</b>
+          <input class="form-control" ng-model="component.attributes.title.value" type="text">
         </div>
       </div>
     </div>
     <div class="row">
       <div class="col-md-6">
         <b>Body</b>
-        <div ng-bind-html="master.attributes.searchable_body | htmlSafe"></div>
+        <div ng-bind-html="master.attributes.body.value | htmlSafe"></div>
       </div>
       <div class="col-md-6">
         <div class="form-group">
-          <label class="label-control">Body</label>
-          <summernote config="summernoteConfig" ng-model="component.attributes.searchable_body"></summernote>
+          <b>Body</b>
+          <summernote config="summernoteConfig" ng-model="component.attributes.body.value"></summernote>
         </div>
       </div>
     </div>

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

@@ -1,9 +1,9 @@
 <%
-title = component[:attributes][:searchable_title].to_s
-body = component[:attributes][:searchable_body].to_s
-special_question = component[:attributes][:special_question]
+title = component[:attributes].dig(:title, :value)&.to_s
+body = component[:attributes].dig(:body, :value)&.to_s.html_safe
+special_question = component[:attributes].dig(:special_question, :value)
 
-image_blob = blob_from_data component[:attributes][:image]
+image_blob = blob_from_data component[:attributes].dig(:image, :value)
 %>
 
 <div class="<%= promethee_class_for component %> <%= 'promethee__component__faq_item--special' if special_question %>">
@@ -18,14 +18,14 @@ image_blob = blob_from_data component[:attributes][:image]
     <% if image_blob %>
       <div class="row ">
         <div class="col-9 col-xs-9">
-          <%= body.html_safe %>
+          <%= body %>
         </div>
         <div class="col-3 col-xs-3">
           <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: '' %>
         </div>
       </div>
     <% else %>
-      <%= body.html_safe %>
+      <%= body %>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -9,11 +9,26 @@
         type: 'image',
         attributes: {
           image: {
-            id: undefined,
-            name: ''
+            searchable: false,
+            translatable: false,
+            type: 'blob',
+            value: {
+              id: undefined,
+              name: ''
+            }
           },
-          searchable_alt: '',
-          searchable_caption: ''
+          alt: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          },
+          caption: {
+            searchable: true,
+            translatable: true,
+            type: 'string',
+            value: ''
+          }
         }
       }
     })

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

@@ -1,16 +1,16 @@
 <script type="text/ng-template" id="promethee/components/image/edit/inspect">
 
-  <promethee-uploader ng-model="promethee.inspected.attributes.image" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
+  <promethee-uploader ng-model="promethee.inspected.attributes.image.value" label="Image" limits="'.jpg,.jpeg,.png,.gif'"></promethee-uploader>
 
   <div class="form-group">
     <label class="label-control">Caption</label>
-    <input class="form-control" ng-model="promethee.inspected.attributes.searchable_caption">
+    <input class="form-control" ng-model="promethee.inspected.attributes.caption.value">
   </div>
 
   <%= render 'promethee/edit/inspect.advanced' %>
     <div class="form-group">
       <label class="label-control">Alt</label>
-      <input class="form-control" ng-model="promethee.inspected.attributes.searchable_alt">
+      <input class="form-control" ng-model="promethee.inspected.attributes.alt.value">
     </div>
   </div>
 </script>

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

@@ -1,13 +1,13 @@
 <script type="text/ng-template" id="promethee/components/image/edit/move">
   <%= render 'promethee/edit/move.header', type: 'image' %>
-      <figure ng-show="component.attributes.image.id">
-        <img  ng-src="{{ component.attributes.image.id ? '/promethee/blob/' + component.attributes.image.id : '#' }}"
+      <figure ng-show="component.attributes.image.value.id">
+        <img  ng-src="{{ component.attributes.image.value.id ? '/promethee/blob/' + component.attributes.image.value.id : '#' }}"
               class="img-fluid img-responsive">
-        <figcaption ng-show="component.attributes.searchable_caption">
-          {{component.attributes.searchable_caption}}
+        <figcaption ng-show="component.attributes.caption.value">
+          {{component.attributes.caption.value}}
         </figcaption>
       </figure>
-      <div  ng-hide="component.attributes.image.id">
+      <div  ng-hide="component.attributes.image.value.id">
         <p  ng-hide="editing"
             class="text-center text-empty">Click to set the image</p>
       </div>