lato_cms 3.0.0 → 3.0.2

data/app/views/lato_cms/pages/fields/_image.html.erb

@@ -3,35 +3,63 @@
 <% settings = field_config['settings'] || {} %>
 <% accept = settings['accept'] || 'image/*' %>
 <% current_file = page_field&.files&.attached? ? page_field.files.first : nil %>
+<% files_input_name = lato_cms_field_input_name(field_id, 'files', input_name_prefix: local_assigns[:input_name_prefix], multiple: true) %>
+<% remove_input_name = lato_cms_field_input_name(field_id, 'remove_file_ids', input_name_prefix: local_assigns[:input_name_prefix], multiple: true) %>
+<% input_id = lato_cms_field_dom_id(field_id, 'files', dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
 <label class="form-label">
   <%= label %><%= ' *' if required %>
 </label>
 
-<div data-controller="lato-cms-image-field">
+<div data-controller="lato-cms-image-field"
+     data-field-id="<%= field_id %>"
+     data-new-badge-label="<%= t('lato_cms.field_image_new_badge') %>"
+     data-remove-label="<%= t('lato_cms.field_image_remove') %>"
+     data-remove-pending-label="<%= t('lato_cms.field_image_remove_pending') %>"
+     data-undo-label="<%= t('lato_cms.field_file_remove_undo') %>">
   <% if current_file %>
-    <div class="mb-2" data-lato-cms-image-field-target="currentContainer">
-      <div class="position-relative d-inline-block">
-        <img src="<%= lato_cms_attachment_path(current_file) %>" class="img-thumbnail lato-cms-image-field__thumb" data-lato-cms-image-field-target="currentImage" alt="<%= current_file.filename %>">
-        <label class="lato-cms-image-field__remove-btn" title="<%= t('lato_cms.field_image_remove') %>">
-          <input type="checkbox" class="d-none" name="fields[<%= field_id %>][remove_file_ids][]" value="<%= current_file.id %>" data-lato-cms-image-field-target="removeCheck" data-action="change->lato-cms-image-field#toggleRemove">
-          <i class="bi bi-x-lg"></i>
-        </label>
+    <div class="lato-cms-file-field__item lato-cms-image-field__item" data-lato-cms-image-field-target="currentContainer" data-attachment-id="<%= current_file.id %>">
+      <div class="lato-cms-image-field__preview">
+        <img src="<%= lato_cms_attachment_path(current_file) %>" class="lato-cms-image-field__thumb" data-lato-cms-image-field-target="currentImage" alt="<%= current_file.filename %>">
+      </div>
+      <div class="lato-cms-file-field__info">
+        <i class="bi bi-image"></i>
+        <span><%= current_file.blob.filename %></span>
+        <span class="text-muted small">(<%= number_to_human_size(current_file.blob.byte_size) %>)</span>
+      </div>
+      <button type="button" class="btn btn-sm btn-outline-danger" data-action="lato-cms-image-field#remove">
+        <i class="bi bi-trash me-1"></i><%= t('lato_cms.field_image_remove') %>
+      </button>
+      <div class="lato-cms-image-field__removed d-none" data-lato-cms-image-field-target="removedNotice">
+        <span class="text-danger small">
+          <i class="bi bi-trash me-1"></i><%= t('lato_cms.field_image_remove_pending') %>
+        </span>
+        <button type="button" class="btn btn-link btn-sm p-0" data-action="lato-cms-image-field#undo">
+          <%= t('lato_cms.field_file_remove_undo') %>
+        </button>
       </div>
     </div>
   <% end %>
 
-  <div class="mb-2 d-none" data-lato-cms-image-field-target="newPreviewContainer">
-    <div class="position-relative d-inline-block">
-      <img src="" class="img-thumbnail lato-cms-image-field__thumb" data-lato-cms-image-field-target="newPreview" alt="">
-      <span class="badge bg-success lato-cms-image-field__new-badge"><%= t('lato_cms.field_image_new_badge') %></span>
+  <div class="lato-cms-file-field__item lato-cms-file-field__item--new lato-cms-image-field__item d-none" data-lato-cms-image-field-target="newPreviewContainer">
+    <div class="lato-cms-image-field__preview">
+      <img src="" class="lato-cms-image-field__thumb" data-lato-cms-image-field-target="newPreview" alt="">
+    </div>
+    <div class="lato-cms-file-field__info">
+      <i class="bi bi-image"></i>
+      <span data-lato-cms-image-field-target="newPreviewName"></span>
+      <span class="text-muted small" data-lato-cms-image-field-target="newPreviewSize"></span>
+      <span class="badge bg-success"><%= t('lato_cms.field_image_new_badge') %></span>
     </div>
+    <button type="button" class="btn btn-sm btn-outline-danger" data-action="lato-cms-image-field#removeNew">
+      <i class="bi bi-trash me-1"></i><%= t('lato_cms.field_image_remove') %>
+    </button>
   </div>
 
   <input type="file"
     class="form-control"
-    name="fields[<%= field_id %>][files][]"
-    id="fields_<%= field_id %>_files"
+    name="<%= files_input_name %>"
+    id="<%= input_id %>"
     accept="<%= accept %>"
     data-lato-cms-image-field-target="input"
     data-action="change->lato-cms-image-field#preview"

data/app/views/lato_cms/pages/fields/_json.html.erb

@@ -5,15 +5,17 @@
 <% if current_value.present? %>
   <% begin; current_value = JSON.pretty_generate(JSON.parse(current_value)); rescue JSON::ParserError; end %>
 <% end %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <div data-controller="lato-cms-json-field">
   <textarea
     class="form-control font-monospace"
-    name="fields[<%= field_id %>][value]"
-    id="fields_<%= field_id %>_value"
+    name="<%= input_name %>"
+    id="<%= input_id %>"
     rows="<%= settings['rows'] || 6 %>"
     data-lato-cms-json-field-target="input"
     data-action="input->lato-cms-json-field#validate"

data/app/views/lato_cms/pages/fields/_multiselect.html.erb

@@ -3,14 +3,16 @@
 <% settings = field_config['settings'] || {} %>
 <% options = settings['options'] || [] %>
 <% current_values = begin; page_field&.value.present? ? JSON.parse(page_field.value) : []; rescue; []; end %>
+<% input_name = lato_cms_field_input_name(field_id, 'value', input_name_prefix: local_assigns[:input_name_prefix], multiple: true) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <select
   class="form-select"
-  name="fields[<%= field_id %>][value][]"
-  id="fields_<%= field_id %>_value"
+  name="<%= input_name %>"
+  id="<%= input_id %>"
   multiple
   size="<%= [options.length, 6].min %>"
   <%= 'required' if required %>>

data/app/views/lato_cms/pages/fields/_number.html.erb

@@ -2,14 +2,16 @@
 <% required = field_config['required'] == true %>
 <% settings = field_config['settings'] || {} %>
 <% current_value = page_field&.value || '' %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <input type="number"
   class="form-control"
-  name="fields[<%= field_id %>][value]"
-  id="fields_<%= field_id %>_value"
+  name="<%= input_name %>"
+  id="<%= input_id %>"
   value="<%= current_value %>"
   <%= 'required' if required %>
   <% if settings['min'] %>min="<%= settings['min'] %>"<% end %>

data/app/views/lato_cms/pages/fields/_select.html.erb

@@ -3,14 +3,16 @@
 <% settings = field_config['settings'] || {} %>
 <% options = settings['options'] || [] %>
 <% current_value = page_field&.value || '' %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <select
   class="form-select"
-  name="fields[<%= field_id %>][value]"
-  id="fields_<%= field_id %>_value"
+  name="<%= input_name %>"
+  id="<%= input_id %>"
   <%= 'required' if required %>>
   <option value=""><%= t('lato_cms.field_select_placeholder') %></option>
   <% options.each do |option| %>

data/app/views/lato_cms/pages/fields/_string.html.erb

@@ -2,14 +2,16 @@
 <% required = field_config['required'] == true %>
 <% settings = field_config['settings'] || {} %>
 <% current_value = page_field&.value || '' %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <input type="text"
   class="form-control"
-  name="fields[<%= field_id %>][value]"
-  id="fields_<%= field_id %>_value"
+  name="<%= input_name %>"
+  id="<%= input_id %>"
   value="<%= current_value %>"
   <%= 'required' if required %>
   <% if settings['placeholder'] %>placeholder="<%= settings['placeholder'] %>"<% end %>

data/app/views/lato_cms/pages/fields/_text.html.erb

@@ -1,8 +1,10 @@
 <% label = field_config['name'] || field_id.humanize %>
 <% required = field_config['required'] == true %>
 <% current_value = page_field&.value || '' %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 
@@ -73,8 +75,8 @@
 
   <%# ── Hidden input submitted with the form ───────────────────────────── %>
   <input type="hidden"
-         name="fields[<%= field_id %>][value]"
-         id="fields_<%= field_id %>_value"
+          name="<%= input_name %>"
+          id="<%= input_id %>"
          data-lato-cms-text-field-target="input"
          value="<%= CGI.escapeHTML(current_value) %>">
 </div>

data/app/views/lato_cms/pages/fields/_textarea.html.erb

@@ -2,14 +2,16 @@
 <% required = field_config['required'] == true %>
 <% settings = field_config['settings'] || {} %>
 <% current_value = page_field&.value || '' %>
+<% input_name = lato_cms_field_input_name(field_id, input_name_prefix: local_assigns[:input_name_prefix]) %>
+<% input_id = lato_cms_field_dom_id(field_id, dom_id_prefix: local_assigns[:dom_id_prefix]) %>
 
-<label class="form-label" for="fields_<%= field_id %>_value">
+<label class="form-label" for="<%= input_id %>">
   <%= label %><%= ' *' if required %>
 </label>
 <textarea
   class="form-control"
-  name="fields[<%= field_id %>][value]"
-  id="fields_<%= field_id %>_value"
+  name="<%= input_name %>"
+  id="<%= input_id %>"
   rows="<%= settings['rows'] || 4 %>"
   <%= 'required' if required %>
   <% if settings['placeholder'] %>placeholder="<%= settings['placeholder'] %>"<% end %>

data/config/locales/en.yml

@@ -48,13 +48,19 @@ en:
     component_required_cannot_disable: Required component cannot be disabled
     component_disabled_cannot_save: Disabled component cannot be saved
     fields_save_component: Save
+    repeater_add_item: Add item
+    repeater_remove_item: Remove
     fields_component_missing_alert_html: "Component <strong>%{component_id}</strong> not found. The component configuration may have been removed."
     fields_previously_saved_data: "Previously saved data:"
     field_file_remove: Remove
+    field_file_remove_pending: File will be removed on save
+    field_file_remove_undo: Undo
+    field_file_new_badge: New
     field_gallery_empty: No images yet. Add images below.
     field_gallery_add_images: Add images
     field_gallery_drag_to_reorder: Drag to reorder
     field_image_remove: Remove
+    field_image_remove_pending: Image will be removed on save
     field_image_new_badge: New
     field_multiselect_hint: Hold Ctrl/Cmd to select multiple
     field_select_placeholder: "-- Select --"

data/config/locales/it.yml

@@ -48,13 +48,19 @@ it:
     component_required_cannot_disable: Una componente obbligatoria non puo essere disattivata
     component_disabled_cannot_save: Una componente disattivata non puo essere salvata
     fields_save_component: Salva
+    repeater_add_item: Aggiungi elemento
+    repeater_remove_item: Rimuovi
     fields_component_missing_alert_html: "Componente <strong>%{component_id}</strong> non trovato. La configurazione del componente potrebbe essere stata rimossa."
     fields_previously_saved_data: "Dati salvati in precedenza:"
     field_file_remove: Rimuovi
+    field_file_remove_pending: Il file verra rimosso al salvataggio
+    field_file_remove_undo: Annulla
+    field_file_new_badge: Nuovo
     field_gallery_empty: Nessuna immagine presente. Aggiungi immagini qui sotto.
     field_gallery_add_images: Aggiungi immagini
     field_gallery_drag_to_reorder: Trascina per riordinare
     field_image_remove: Rimuovi
+    field_image_remove_pending: L'immagine verra rimossa al salvataggio
     field_image_new_badge: Nuovo
     field_multiselect_hint: Tieni premuto Ctrl/Cmd per selezionare piu opzioni
     field_select_placeholder: "-- Seleziona --"

data/lib/lato_cms/version.rb

@@ -1,3 +1,3 @@
 module LatoCms
-  VERSION = "3.0.0"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Gregorio Galante
@@ -82,10 +82,12 @@ files:
 - app/assets/javascripts/lato_cms/controllers/lato_cms_component_accordion_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_component_form_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_component_toggle_controller.js
+- app/assets/javascripts/lato_cms/controllers/lato_cms_file_field_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_gallery_field_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_image_field_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_json_field_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_page_preview_controller.js
+- app/assets/javascripts/lato_cms/controllers/lato_cms_repeater_controller.js
 - app/assets/javascripts/lato_cms/controllers/lato_cms_text_field_controller.js
 - app/assets/stylesheets/lato_cms/application.scss
 - app/controllers/lato_cms/api/pages_controller.rb
@@ -102,6 +104,8 @@ files:
 - app/views/lato_cms/pages/_fields_editor.html.erb
 - app/views/lato_cms/pages/_form_create.html.erb
 - app/views/lato_cms/pages/_form_update.html.erb
+- app/views/lato_cms/pages/_repeater.html.erb
+- app/views/lato_cms/pages/_repeater_item.html.erb
 - app/views/lato_cms/pages/create.html.erb
 - app/views/lato_cms/pages/fields/_boolean.html.erb
 - app/views/lato_cms/pages/fields/_color.html.erb