lato_cms 3.4.0 → 3.5.0

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

@@ -4,7 +4,8 @@
 <% 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="<%= input_id %>">
+<%# Names the editable area through aria-labelledby: `for` cannot target a contenteditable, and the hidden input is not focusable. %>
+<label class="form-label" id="<%= input_id %>_label">
   <%= label %><%= ' *' if required %>
 </label>
 
@@ -13,59 +14,66 @@
      data-lato-cms-text-field-attributes-value="<%= LatoCms::PageField::RICH_TEXT_ATTRIBUTES.join(' ') %>">
 
   <%# ── Toolbar ──────────────────────────────────────────────────────────── %>
-  <div class="lato-cms-wysiwyg-toolbar border border-bottom-0 rounded-top bg-light px-2 py-1 d-flex flex-wrap gap-1 align-items-center"
+  <div role="toolbar" aria-label="<%= t('lato_cms.field_text_toolbar_label') %>" aria-controls="<%= input_id %>_editor"
+       class="lato-cms-wysiwyg-toolbar border border-bottom-0 rounded-top bg-light px-2 py-1 d-flex flex-wrap gap-1 align-items-center"
        data-lato-cms-text-field-target="toolbar">
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_bold') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_bold') %>" aria-label="<%= t('lato_cms.field_text_toolbar_bold') %>"
             data-action="click->lato-cms-text-field#bold">
-      <i class="bi bi-type-bold"></i>
+      <i class="bi bi-type-bold" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_italic') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_italic') %>" aria-label="<%= t('lato_cms.field_text_toolbar_italic') %>"
             data-action="click->lato-cms-text-field#italic">
-      <i class="bi bi-type-italic"></i>
+      <i class="bi bi-type-italic" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_underline') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_underline') %>" aria-label="<%= t('lato_cms.field_text_toolbar_underline') %>"
             data-action="click->lato-cms-text-field#underline">
-      <i class="bi bi-type-underline"></i>
+      <i class="bi bi-type-underline" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_strikethrough') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_strikethrough') %>" aria-label="<%= t('lato_cms.field_text_toolbar_strikethrough') %>"
             data-action="click->lato-cms-text-field#strikethrough">
-      <i class="bi bi-type-strikethrough"></i>
+      <i class="bi bi-type-strikethrough" aria-hidden="true"></i>
     </button>
     <span class="vr mx-1"></span>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_left') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_left') %>" aria-label="<%= t('lato_cms.field_text_toolbar_align_left') %>"
             data-action="click->lato-cms-text-field#alignLeft">
-      <i class="bi bi-text-left"></i>
+      <i class="bi bi-text-left" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_center') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_center') %>" aria-label="<%= t('lato_cms.field_text_toolbar_align_center') %>"
             data-action="click->lato-cms-text-field#alignCenter">
-      <i class="bi bi-text-center"></i>
+      <i class="bi bi-text-center" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_right') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_align_right') %>" aria-label="<%= t('lato_cms.field_text_toolbar_align_right') %>"
             data-action="click->lato-cms-text-field#alignRight">
-      <i class="bi bi-text-right"></i>
+      <i class="bi bi-text-right" aria-hidden="true"></i>
     </button>
     <span class="vr mx-1"></span>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_unordered_list') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_unordered_list') %>" aria-label="<%= t('lato_cms.field_text_toolbar_unordered_list') %>"
             data-action="click->lato-cms-text-field#insertUnorderedList">
-      <i class="bi bi-list-ul"></i>
+      <i class="bi bi-list-ul" aria-hidden="true"></i>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_ordered_list') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_ordered_list') %>" aria-label="<%= t('lato_cms.field_text_toolbar_ordered_list') %>"
             data-action="click->lato-cms-text-field#insertOrderedList">
-      <i class="bi bi-list-ol"></i>
+      <i class="bi bi-list-ol" aria-hidden="true"></i>
     </button>
 
     <%# ── Source toggle ────────────────────────────────────────────────── %>
     <span class="vr mx-1 ms-auto"></span>
-    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_toggle_html_source') %>"
+    <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-1" title="<%= t('lato_cms.field_text_toolbar_toggle_html_source') %>" aria-label="<%= t('lato_cms.field_text_toolbar_toggle_html_source') %>"
             data-action="click->lato-cms-text-field#toggleSource"
+            aria-pressed="false"
             data-lato-cms-text-field-target="sourceBtn">
-      <i class="bi bi-code-slash"></i>
+      <i class="bi bi-code-slash" aria-hidden="true"></i>
     </button>
   </div>
 
   <%# ── Editable area (WYSIWYG) ─────────────────────────────────────────── %>
   <div class="form-control lato-cms-wysiwyg-editor rounded-0 rounded-bottom"
        contenteditable="true"
+       id="<%= input_id %>_editor"
+       role="textbox"
+       aria-multiline="true"
+       aria-labelledby="<%= input_id %>_label"
+       <%= 'aria-required="true"'.html_safe if required %>
        style="min-height: 150px; overflow-y: auto; line-height: 1.6;"
        data-lato-cms-text-field-target="editor"><%= current_value.html_safe %></div>
 
@@ -73,6 +81,7 @@
   <textarea class="form-control lato-cms-wysiwyg-source rounded-0 rounded-bottom font-monospace d-none"
             style="min-height: 150px; font-size: 0.8rem; resize: vertical; white-space: pre;"
             spellcheck="false"
+            aria-label="<%= label %> — <%= t('lato_cms.field_text_source_label') %>"
             data-lato-cms-text-field-target="source"></textarea>
 
   <%# ── Hidden input submitted with the form ───────────────────────────── %>

data/app/views/lato_cms/pages/index.html.erb

@@ -12,8 +12,9 @@
     <% end %>
 
     <div class="dropdown ms-auto" title="<%= t('lato_cms.cta_actions') %>" data-controller="lato-tooltip">
-      <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown">
-        <i class="bi bi-three-dots"></i>
+      <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"
+              aria-label="<%= t('lato_cms.cta_actions') %>">
+        <i class="bi bi-three-dots" aria-hidden="true"></i>
       </button>
       <ul class="dropdown-menu dropdown-menu-end">
         <li>

data/app/views/lato_cms/pages/show.html.erb

@@ -1,19 +1,23 @@
-<%= lato_page_head @page.title, [
+<%# h(): the title is user content and lato_page_head renders it raw. %>
+<%= lato_page_head h(@page.title), [
   { label: t('lato_cms.pages_index_title'), path: lato_cms.pages_path },
   { label: @page.title }
 ] %>
 
-<div data-controller="lato-cms-advanced-editor" data-lato-cms-advanced-editor-list-path-value="<%= lato_cms.pages_path %>">
+<div data-controller="lato-cms-advanced-editor" data-lato-cms-advanced-editor-list-path-value="<%= lato_cms.pages_path %>"
+     data-lato-cms-advanced-editor-unsaved-message-value="<%= t('lato_cms.fields_unsaved_changes_confirm') %>">
   <div class="row align-items-stretch lato-cms-advanced-editor__row lato-cms-advanced-editor__row--active">
 
     <%# ── Preview column ─────────────────────────────────────────────────── %>
     <div class="col-12 col-lg-6 mb-4 lato-cms-advanced-editor__preview-col">
-      <% if @page.frontend_url.present? %>
+      <% if (preview_url = @page.safe_frontend_url) %>
         <div class="card h-100" style="overflow: hidden;" data-controller="lato-cms-page-preview">
           <div class="card-header d-flex justify-content-between align-items-center py-2 gap-2">
-            <div class="btn-group btn-group-sm" role="group">
+            <div class="btn-group btn-group-sm" role="group" aria-label="<%= t('lato_cms.show_preview_devices_label') %>">
               <button type="button" class="btn btn-outline-secondary active"
                       title="<%= t('lato_cms.show_preview_desktop_tooltip') %>"
+                      aria-label="<%= t('lato_cms.show_preview_desktop_tooltip') %>"
+                      aria-pressed="true"
                       data-controller="lato-tooltip"
                       data-action="click->lato-cms-page-preview#setDevice"
                       data-device="desktop"
@@ -22,6 +26,8 @@
               </button>
               <button type="button" class="btn btn-outline-secondary"
                       title="<%= t('lato_cms.show_preview_tablet_tooltip') %>"
+                      aria-label="<%= t('lato_cms.show_preview_tablet_tooltip') %>"
+                      aria-pressed="false"
                       data-controller="lato-tooltip"
                       data-action="click->lato-cms-page-preview#setDevice"
                       data-device="tablet"
@@ -30,6 +36,8 @@
               </button>
               <button type="button" class="btn btn-outline-secondary"
                       title="<%= t('lato_cms.show_preview_mobile_tooltip') %>"
+                      aria-label="<%= t('lato_cms.show_preview_mobile_tooltip') %>"
+                      aria-pressed="false"
                       data-controller="lato-tooltip"
                       data-action="click->lato-cms-page-preview#setDevice"
                       data-device="mobile"
@@ -40,6 +48,7 @@
             <div class="d-flex align-items-center gap-2">
               <div class="input-group input-group-sm" style="width: 130px;">
                 <input type="number" class="form-control" min="320" max="3840" step="1"
+                       aria-label="<%= t('lato_cms.show_preview_custom_width_tooltip') %>"
                        placeholder="<%= t('lato_cms.show_preview_custom_width_placeholder') %>"
                        title="<%= t('lato_cms.show_preview_custom_width_tooltip') %>"
                        data-controller="lato-tooltip"
@@ -51,7 +60,13 @@
             </div>
           </div>
           <div class="lato-cms-page-preview__viewport" data-lato-cms-page-preview-target="viewport">
-            <iframe src="<%= @page.frontend_url %>" data-lato-cms-page-preview-target="iframe"></iframe>
+            <%# sandbox keeps the frontend from navigating the panel or opening
+                dialogs on it; scripts/same-origin stay on so the site renders
+                and the preview can postMessage the open component. %>
+            <iframe src="<%= preview_url %>" title="<%= t('lato_cms.show_preview_title') %>"
+                    sandbox="allow-scripts allow-same-origin allow-forms allow-popups"
+                    referrerpolicy="strict-origin-when-cross-origin"
+                    data-lato-cms-page-preview-target="iframe"></iframe>
           </div>
         </div>
       <% else %>
@@ -80,14 +95,15 @@
             <span class="vr"></span>
             <%= lato_cms_page_actions_dropdown(@page, show_edit: lato_cms_admin?, show_translations: lato_cms_admin?, show_delete: lato_cms_admin?, hide_show: true) %>
             <span class="vr"></span>
-            <button class="btn btn-sm btn-outline-primary"
+            <button type="button" class="btn btn-sm btn-outline-primary"
                     title="<%= t('lato_cms.show_hide_panel_tooltip') %>"
+                    aria-label="<%= t('lato_cms.show_hide_panel_tooltip') %>"
                     data-controller="lato-tooltip"
                     data-action="click->lato-cms-advanced-editor#toggleSidebar">
               <i class="bi bi-layout-sidebar-reverse"></i>
             </button>
             <%= link_to lato_cms.pages_path, class: 'btn btn-sm btn-outline-danger',
-              title: t('lato_cms.show_back_to_list_tooltip'), data: { controller: 'lato-tooltip' } do %>
+              title: t('lato_cms.show_back_to_list_tooltip'), 'aria-label': t('lato_cms.show_back_to_list_tooltip'), data: { controller: 'lato-tooltip' } do %>
               <i class="bi bi-box-arrow-left"></i>
             <% end %>
           </div>
@@ -106,7 +122,7 @@
           <% elsif !@page.template_available? %>
             <div class="alert alert-warning">
               <i class="bi bi-exclamation-triangle me-1"></i>
-              <%= t('lato_cms.show_template_unavailable', template_id: @page.template_id) %>
+              <%= t('lato_cms.show_template_unavailable_html', template_id: @page.template_id) %>
               <% if lato_cms_admin? %>
                 <%= link_to t('lato_cms.show_edit_settings_cta'), lato_cms.pages_update_path(@page), class: 'btn btn-sm btn-outline-warning ms-2',
                   data: { lato_action_target: 'trigger', turbo_frame: dom_id(@page, 'form'), action_title: t('lato_cms.page_update_title') } %>
@@ -137,9 +153,10 @@
   </div>
 
   <%# ── Re-open sidebar tab (visible only in advanced mode + sidebar closed) %>
-  <button class="lato-cms-advanced-editor__reopen-btn"
+  <button type="button" class="lato-cms-advanced-editor__reopen-btn"
           hidden
           title="<%= t('lato_cms.show_show_editor_panel_tooltip') %>"
+          aria-label="<%= t('lato_cms.show_show_editor_panel_tooltip') %>"
           data-controller="lato-tooltip"
           data-action="click->lato-cms-advanced-editor#toggleSidebar"
           data-lato-cms-advanced-editor-target="reopenBtn">

data/config/locales/en.yml

@@ -63,7 +63,7 @@ en:
     show_preview_custom_width_placeholder: Width
     show_no_template_title: No template assigned
     show_no_template_description: Assign a template to start editing fields.
-    show_template_unavailable: "The template <strong>%{template_id}</strong> is no longer available. Please assign a different template."
+    show_template_unavailable_html: "The template <strong>%{template_id}</strong> is no longer available. Please assign a different template."
     show_previously_saved_fields: "Previously saved fields:"
     fields_component_not_found_badge: Component not found
     component_required_badge: Required
@@ -162,3 +162,29 @@ en:
     field_text_toolbar_unordered_list: Unordered list
     field_text_toolbar_ordered_list: Ordered list
     field_text_toolbar_toggle_html_source: Toggle HTML source
+    field_text_toolbar_label: Text formatting
+    field_text_source_label: HTML source
+    field_color_clear: Clear color
+    field_color_empty: No color
+    field_json_valid: Valid JSON
+    field_json_invalid: "Invalid JSON: %{error}"
+    field_render_error: "Field \"%{field_id}\" cannot be rendered. Check its configuration."
+    fields_saving: Saving...
+    fields_save_failed: Failed to save fields
+    fields_save_error: An error occurred while saving
+    fields_unsaved_changes_confirm: There are unsaved changes. Leave this page and lose them?
+    component_not_in_template: This component or one of its fields is not part of the page template
+    rate_limited: Too many requests, please wait a minute and try again.
+    cta_page_settings: Page settings
+    show_preview_title: Frontend preview
+    show_preview_devices_label: Preview size
+    form_template_change_warning: Fields saved under the current template are hidden if you switch template.
+    media_delete_confirm: Are you sure you want to delete this media?
+    media_content_type_not_allowed: "type %{content_type} is not allowed"
+    media_file_too_large: "is larger than the maximum size (%{size})"
+    media_search_label: Search media
+    media_search_cta: Search
+    media_move_before: Move before
+    media_move_after: Move after
+    media_field_select: "Select %{name}"
+    translation_select_label: "Page to link for %{locale}"

data/config/locales/it.yml

@@ -63,7 +63,7 @@ it:
     show_preview_custom_width_placeholder: Larghezza
     show_no_template_title: Nessun template assegnato
     show_no_template_description: Assegna un template per iniziare a modificare i campi.
-    show_template_unavailable: "Il template <strong>%{template_id}</strong> non e piu disponibile. Assegna un template diverso."
+    show_template_unavailable_html: "Il template <strong>%{template_id}</strong> non e piu disponibile. Assegna un template diverso."
     show_previously_saved_fields: "Campi salvati in precedenza:"
     fields_component_not_found_badge: Componente non trovato
     component_required_badge: Obbligatoria
@@ -162,3 +162,29 @@ it:
     field_text_toolbar_unordered_list: Elenco puntato
     field_text_toolbar_ordered_list: Elenco numerato
     field_text_toolbar_toggle_html_source: Mostra/nascondi sorgente HTML
+    field_text_toolbar_label: Formattazione testo
+    field_text_source_label: Sorgente HTML
+    field_color_clear: Rimuovi colore
+    field_color_empty: Nessun colore
+    field_json_valid: JSON valido
+    field_json_invalid: "JSON non valido: %{error}"
+    field_render_error: "Il campo \"%{field_id}\" non può essere mostrato. Controlla la sua configurazione."
+    fields_saving: Salvataggio...
+    fields_save_failed: Salvataggio dei campi non riuscito
+    fields_save_error: Si è verificato un errore durante il salvataggio
+    fields_unsaved_changes_confirm: Ci sono modifiche non salvate. Uscire dalla pagina e perderle?
+    component_not_in_template: Questo componente o uno dei suoi campi non fa parte del template della pagina
+    rate_limited: Troppe richieste, attendi un minuto e riprova.
+    cta_page_settings: Impostazioni pagina
+    show_preview_title: Anteprima del frontend
+    show_preview_devices_label: Dimensione anteprima
+    form_template_change_warning: Se cambi template, i campi salvati con quello attuale non vengono più mostrati.
+    media_delete_confirm: Sei sicuro di voler eliminare questo media?
+    media_content_type_not_allowed: "di tipo %{content_type} non è consentito"
+    media_file_too_large: "supera la dimensione massima (%{size})"
+    media_search_label: Cerca media
+    media_search_cta: Cerca
+    media_move_before: Sposta prima
+    media_move_after: Sposta dopo
+    media_field_select: "Seleziona %{name}"
+    translation_select_label: "Pagina da collegare per %{locale}"

data/lib/lato_cms/config.rb

@@ -5,7 +5,7 @@ module LatoCms
   class Config
     attr_accessor :locales, :templates_path, :admin_roles, :media_url_mode, :llm_api_url, :llm_model,
                   :llm_api_key, :llm_generate_alt_text, :llm_generate_title, :llm_alt_text_prompt,
-                  :llm_title_prompt
+                  :llm_title_prompt, :media_allowed_content_types, :media_max_file_size, :llm_max_image_size
 
     # How the URLs of media files are built (see LatoCms::Media#url).
     # - :redirect — Rails answers 302 with a signed URL that expires; on a
@@ -70,12 +70,37 @@ module LatoCms
       # LLM_PROMPT_VARIABLES placeholders.
       @llm_alt_text_prompt = nil
       @llm_title_prompt = nil
+
+      # Server-side upload limits for the media library (the picker `accept`
+      # attribute is only a hint to the browser). Set either to nil to lift it.
+      @media_allowed_content_types = DEFAULT_MEDIA_ALLOWED_CONTENT_TYPES.dup
+      @media_max_file_size = 100.megabytes
+
+      # Images larger than this are not sent to the LLM: the whole file is
+      # read in memory and base64-encoded into the request.
+      @llm_max_image_size = 20.megabytes
     end
 
+    # Media uploads accepted by default: images, audio, video, PDFs, plain
+    # text/CSV, office documents and zip archives. HTML and scripts are left
+    # out on purpose. A trailing `*` matches any subtype.
+    DEFAULT_MEDIA_ALLOWED_CONTENT_TYPES = %w[
+      image/* video/* audio/*
+      application/pdf text/plain text/csv application/zip
+      application/msword application/vnd.ms-excel application/vnd.ms-powerpoint
+      application/vnd.openxmlformats-officedocument.* application/vnd.oasis.opendocument.*
+    ].freeze
+
     def media_url_proxy?
       media_url_mode.to_sym == :proxy
     end
 
+    def media_content_type_allowed?(content_type)
+      return true if media_allowed_content_types.nil?
+
+      Array(media_allowed_content_types).any? { |pattern| File.fnmatch?(pattern.to_s, content_type.to_s) }
+    end
+
     def llm_configured?
       llm_api_url.present? && llm_model.present? && llm_api_key.present?
     end

data/lib/lato_cms/version.rb

@@ -1,3 +1,3 @@
 module LatoCms
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

data/lib/tasks/lato_cms_tasks.rake

@@ -5,7 +5,7 @@ namespace :lato_cms do
     desc 'Install Lato CMS engine and create example templates'
     # Usage: rails lato_cms:install:application
     task application: :environment do
-      base_path = Rails.root.join('config', 'lato_cms')
+      base_path = Rails.root.join(LatoCms.config.templates_path)
       templates_path = base_path.join('templates')
       components_path = base_path.join('components')
 
@@ -34,10 +34,8 @@ namespace :lato_cms do
                 placeholder: "Enter a subtitle"
             image:
               name: Background Image
-              type: file
+              type: image
               required: false
-              settings:
-                accept: "image/*"
         YAML
         puts "Created #{component_file}"
       else
@@ -105,17 +103,22 @@ namespace :lato_cms do
 
       abort "Component file already exists: #{file}" if File.exist?(file)
 
-      valid_types = %w[string textarea file number date datetime boolean select multiselect color json text]
+      # `custom` is left out: it needs a `render` partial path, which a
+      # field_id:type pair cannot carry (see the custom_field task).
+      valid_types = LatoCms::PagesHelper::BUILTIN_FIELD_TYPES
 
-      # Parse field pairs from extra args
+      # Parse field pairs from extra args. An unknown type aborts instead of
+      # silently becoming a string field.
       fields = {}
       (args.extras || []).each do |arg|
         parts = arg.split(':')
-        next unless parts.length == 2
+        abort "Invalid field definition \"#{arg}\": use field_id:type" unless parts.length == 2
 
         field_id = parts[0].parameterize(separator: '_')
         field_type = parts[1]
-        field_type = 'string' unless valid_types.include?(field_type)
+        unless valid_types.include?(field_type)
+          abort "Unsupported field type \"#{field_type}\" for #{field_id}. Supported: #{valid_types.join(', ')}"
+        end
 
         fields[field_id] = {
           'name' => field_id.humanize,
@@ -155,20 +158,24 @@ namespace :lato_cms do
       file = views_path.join("_#{field_id}.html.erb")
       abort "Custom field partial already exists: #{file}" if File.exist?(file)
 
+      # Names and ids come from the engine helpers so the field also works
+      # inside a repeater (where both carry the item prefix).
       File.write(file, <<~ERB)
         <% label = field_config['name'] || field_id.humanize %>
         <% required = field_config['required'] == true %>
         <% settings = field_config['settings'] || {} %>
         <% current_value = page_field&.value.to_s %>
+        <% 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 %>
           placeholder="<%= settings['placeholder'] %>">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato_cms
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Gregorio Galante
@@ -57,20 +57,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement