plum-cms 0.1.2 → 0.2.0

data/app/views/plum/cp/content_types/_form.html.erb

@@ -46,34 +46,28 @@
     </div>
   </div>
 
-  <div class="bg-white shadow rounded-lg p-6" data-controller="plum--blueprint">
+  <div class="bg-white shadow rounded-lg p-6" data-controller="plum--blueprint"
+       data-plum--blueprint-types-value="<%= Plum::FieldTypeRegistry.as_json.to_json %>"
+       data-plum--blueprint-nested-types-value="<%= Plum::FieldTypeRegistry.as_json.select { |type| Plum::FieldTypeRegistry::NESTED_FIELD_TYPES.include?(type[:handle]) }.to_json %>"
+       <% if content_type.persisted? %>data-plum--blueprint-apply-fieldset-url-value="<%= apply_fieldset_cp_content_type_path(content_type) %>"<% end %>>
     <h3 class="text-lg font-medium text-gray-900 mb-4">Blueprint</h3>
-    <p class="text-sm text-gray-500 mb-4">Define the fields for this content type using JSON format.</p>
+    <p class="text-sm text-gray-500 mb-4">Choose fields and configure how editors enter content.</p>
 
     <%= f.hidden_field :blueprint, value: (content_type.blueprint || { "fields" => [] }).to_json, data: { "plum--blueprint-target": "input" } %>
 
     <div class="space-y-4" data-plum--blueprint-target="fields">
       <% (content_type.fields || []).each_with_index do |field, index| %>
-        <div class="grid grid-cols-1 gap-4 p-4 bg-gray-50 rounded-lg sm:grid-cols-2 lg:grid-cols-5" data-plum--blueprint-target="field">
+        <div class="plum-blueprint-field" data-plum--blueprint-target="field">
+          <div class="plum-blueprint-field-header col-span-full">
+            <p class="plum-blueprint-field-title" data-field-summary><%= field["label"].presence || field["handle"].presence || "Untitled field" %><span class="plum-blueprint-field-type"><%= field["type"].presence || "text" %></span></p>
+            <button type="button" data-action="plum--blueprint#removeField" class="text-sm font-medium text-red-600 hover:text-red-700">Remove</button>
+          </div>
           <input type="text" value="<%= field['handle'] %>" placeholder="handle" data-field="handle"
                  data-action="input->plum--blueprint#inputChanged"
                  class="px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
           <select data-field="type" data-action="change->plum--blueprint#inputChanged"
                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 text-sm">
-            <option value="text" <%= 'selected' if field['type'] == 'text' %>>Text</option>
-            <option value="textarea" <%= 'selected' if field['type'] == 'textarea' %>>Textarea</option>
-            <option value="rich_text" <%= 'selected' if field['type'] == 'rich_text' %>>Rich Text</option>
-            <option value="number" <%= 'selected' if field['type'] == 'number' %>>Number</option>
-            <option value="boolean" <%= 'selected' if field['type'] == 'boolean' %>>Boolean</option>
-            <option value="date" <%= 'selected' if field['type'] == 'date' %>>Date</option>
-            <option value="select" <%= 'selected' if field['type'] == 'select' %>>Select</option>
-            <option value="checkboxes" <%= 'selected' if field['type'] == 'checkboxes' %>>Checkboxes</option>
-            <option value="color" <%= 'selected' if field['type'] == 'color' %>>Color</option>
-            <option value="url" <%= 'selected' if field['type'] == 'url' %>>URL</option>
-            <option value="taxonomy" <%= 'selected' if field['type'] == 'taxonomy' %>>Taxonomy</option>
-            <option value="image" <%= 'selected' if field['type'] == 'image' %>>Image</option>
-            <option value="relationship" <%= 'selected' if field['type'] == 'relationship' %>>Relationship</option>
-            <option value="blocks" <%= 'selected' if field['type'] == 'blocks' %>>Blocks</option>
+            <%= options_for_select(Plum::FieldTypeRegistry.options, field["type"]) %>
           </select>
           <input type="text" value="<%= field['label'] %>" placeholder="Label" data-field="label"
                  data-action="input->plum--blueprint#inputChanged"
@@ -81,17 +75,72 @@
           <input type="text" value="<%= field['content_type'] %>" placeholder="Related type handle" data-field="content_type" data-field-config="relationship"
                  data-action="input->plum--blueprint#inputChanged"
                  class="<%= 'hidden' unless field['type'] == 'relationship' %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
+          <label class="<%= 'hidden' unless field['type'] == 'relationship' %> flex items-center gap-2 text-sm text-gray-700" data-field-config="relationship"><input type="checkbox" data-field="multiple" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['multiple']) %>> Allow multiple entries</label>
           <input type="text" value="<%= field['taxonomy'] %>" placeholder="Taxonomy handle" data-field="taxonomy" data-field-config="taxonomy"
                  data-action="input->plum--blueprint#inputChanged"
                  class="<%= 'hidden' unless field['type'] == 'taxonomy' %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
-          <input type="text" value="<%= Array(field['options']).join(', ') %>" placeholder="Option 1, Option 2, Option 3" data-field="options" data-field-config="select checkboxes"
+          <textarea rows="4" placeholder="Published | published&#10;Draft | draft" data-field="options" data-field-config="select radio button_group checkboxes"
                  data-action="input->plum--blueprint#inputChanged"
-                 class="<%= 'hidden' unless %w[select checkboxes].include?(field['type']) %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 text-sm">
-          <button type="button" data-action="plum--blueprint#removeField" class="justify-self-start text-red-500 hover:text-red-700">
-            <svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
-            </svg>
-          </button>
+                 class="<%= 'hidden' unless %w[select radio button_group checkboxes].include?(field['type']) %> col-span-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm"><%= Plum::FieldOptions.editor_value(field['options']) %></textarea>
+          <div class="<%= 'hidden' unless %w[group repeater].include?(field['type']) %> col-span-full space-y-3 rounded-md border border-gray-200 bg-white p-3" data-field-config="group repeater" data-nested-editor>
+            <div class="flex items-center justify-between">
+              <p class="text-sm font-medium text-gray-700">Nested fields</p>
+              <button type="button" data-action="plum--blueprint#addNestedField" class="text-sm font-medium text-purple-600 hover:text-purple-700">+ Add nested field</button>
+            </div>
+            <div class="space-y-3" data-nested-fields>
+              <% Array(field["fields"]).each do |nested| %>
+                <div class="grid gap-2 rounded-md border border-gray-200 bg-gray-50 p-3 sm:grid-cols-3" data-nested-field>
+                  <input type="text" value="<%= nested['handle'] %>" placeholder="handle" data-nested="handle" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 font-mono text-sm">
+                  <select data-nested="type" data-action="change->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm"><%= options_for_select(Plum::FieldTypeRegistry.options.select { |_, handle| Plum::FieldTypeRegistry::NESTED_FIELD_TYPES.include?(handle) }, nested["type"]) %></select>
+                  <input type="text" value="<%= nested['label'] %>" placeholder="Label" data-nested="label" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['instructions'] %>" placeholder="Instructions" data-nested="instructions" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['placeholder'] %>" placeholder="Placeholder" data-nested="placeholder" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['default'] %>" placeholder="Default value" data-nested="default" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <label class="flex items-center gap-2 text-sm text-gray-700"><input type="checkbox" data-nested="required" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(nested['required']) %>> Required</label>
+                  <div class="flex gap-3">
+                    <button type="button" data-direction="-1" data-action="plum--blueprint#moveNestedField" class="text-sm text-gray-600">↑ Up</button>
+                    <button type="button" data-direction="1" data-action="plum--blueprint#moveNestedField" class="text-sm text-gray-600">↓ Down</button>
+                    <button type="button" data-action="plum--blueprint#removeNestedField" class="text-sm font-medium text-red-600">Remove</button>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+          </div>
+          <div class="<%= 'hidden' unless field['type'] == 'number' %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-4" data-field-config="number">
+            <%= select_tag nil, options_for_select([["Decimal", "decimal"], ["Integer", "integer"]], field["number_kind"]), data: { field: "number_kind", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="number" value="<%= field['min'] %>" placeholder="Minimum" data-field="min" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" value="<%= field['max'] %>" placeholder="Maximum" data-field="max" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" value="<%= field['step'] %>" placeholder="Step" data-field="step" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="text" value="<%= field['unit'] %>" placeholder="Unit (optional)" data-field="unit" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
+          <div class="<%= 'hidden' unless field['type'] == 'date' %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-3" data-field-config="date">
+            <%= select_tag nil, options_for_select([["Date", "date"], ["Time", "time"], ["Date and time", "datetime"]], field["date_mode"]), data: { field: "date_mode", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field['min'] %>" placeholder="Earliest value" data-field="min" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="text" value="<%= field['max'] %>" placeholder="Latest value" data-field="max" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
+          <div class="<%= 'hidden' unless %w[list repeater images].include?(field['type']) || (field['type'] == 'relationship' && field['multiple']) %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-3" data-field-config="list repeater images relationship" data-multiple-only>
+            <input type="number" min="0" value="<%= field['min_items'] %>" placeholder="Minimum items" data-field="min_items" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" min="0" value="<%= field['max_items'] %>" placeholder="Maximum items" data-field="max_items" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <label class="<%= 'hidden' unless field['type'] == 'list' %> flex items-center gap-2 text-sm text-gray-700" data-field-config="list"><input type="checkbox" data-field="unique" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['unique']) %>> Unique values</label>
+          </div>
+          <div class="col-span-full grid gap-3 border-t border-gray-200 pt-3 sm:grid-cols-3">
+            <input type="text" value="<%= field['instructions'] %>" placeholder="Instructions" data-field="instructions" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <input type="text" value="<%= field['placeholder'] %>" placeholder="Placeholder" data-field="placeholder" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <input type="text" value="<%= field['default'] %>" placeholder="Default value" data-field="default" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <label class="flex items-center gap-2 text-sm text-gray-700">
+              <input type="checkbox" data-field="required" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['required']) %>>
+              Required
+            </label>
+          </div>
+          <div class="col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-4">
+            <%= select_tag nil, options_for_select([["Full width", 12], ["Three quarters", 9], ["Two thirds", 8], ["Half width", 6], ["One third", 4], ["Quarter width", 3]], field["width"].presence || 12), data: { field: "width", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field.dig('condition', 'field') %>" placeholder="Show when field…" data-field="condition_field" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 font-mono text-sm">
+            <%= select_tag nil, options_for_select([["Equals", "equals"], ["Does not equal", "not_equals"], ["Contains", "contains"], ["Is empty", "empty"], ["Is not empty", "not_empty"]], field.dig("condition", "operator")), include_blank: "No condition", data: { field: "condition_operator", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field.dig('condition', 'value') %>" placeholder="Value" data-field="condition_value" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
         </div>
       <% end %>
     </div>
@@ -103,6 +152,14 @@
       </svg>
       Add Field
     </button>
+    <% if content_type.persisted? && @fieldsets.any? %>
+      <div class="mt-4 flex flex-wrap items-center gap-3 border-t border-gray-200 pt-4">
+        <%= select_tag nil, options_from_collection_for_select(@fieldsets, :id, :name), prompt: "Choose saved fieldset", data: { fieldset_picker: true }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+        <button type="button" data-action="plum--blueprint#applyFieldset" class="rounded-md border border-purple-200 bg-purple-50 px-3 py-2 text-sm font-semibold text-purple-700 hover:bg-purple-100">Insert fieldset</button>
+        <span class="hidden text-sm" data-fieldset-status></span>
+      </div>
+    <% end %>
+    <p class="mt-3 text-xs text-gray-500"><%= link_to "Manage reusable fieldsets", cp_fieldsets_path, class: "text-purple-600 hover:text-purple-700" %></p>
   </div>
 
   <div class="flex justify-end space-x-3">

data/app/views/plum/cp/custom_fields/_input.html.erb

@@ -0,0 +1,5 @@
+<%= text_field_tag "entry[data][#{field_handle}]", field_value,
+    id: field_id,
+    placeholder: field["placeholder"],
+    required: field["required"],
+    class: "mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-purple-500 focus:ring-purple-500" %>

data/app/views/plum/cp/entries/_form.html.erb

@@ -29,64 +29,90 @@
         </div>
 
         <!-- Dynamic fields based on blueprint -->
-        <div class="bg-white shadow rounded-lg p-6 space-y-6">
+        <div class="bg-white shadow rounded-lg p-6">
           <h3 class="text-lg font-medium text-gray-900">Content</h3>
+          <div class="mt-6 grid grid-cols-12 gap-6" data-controller="plum--conditional-fields">
           <% @content_type.fields.each do |field| %>
             <% field_handle = field["handle"].to_s %>
             <% field_id = "entry_data_#{field_handle.parameterize}" %>
-            <div>
-              <label for="<%= field_id %>" class="block text-sm font-medium text-gray-700"><%= field["label"] || field_handle.titleize %></label>
+            <% field_value = entry.data&.dig(field_handle) %>
+            <% field_value = field["default"] if entry.new_record? && field_value.nil? && field.key?("default") %>
+            <% condition = field["condition"].presence %>
+            <div class="<%= 'border-b border-gray-200 pb-2 pt-4' if field['type'] == 'section' %>" style="grid-column: span <%= field['type'] == 'section' ? 12 : (field['width'].presence || 12) %> / span <%= field['type'] == 'section' ? 12 : (field['width'].presence || 12) %>;"<% if condition %> data-field-condition="<%= condition.to_json %>"<% end %>>
+              <label for="<%= field_id %>" class="block <%= field['type'] == 'section' ? 'text-lg font-semibold text-gray-900' : 'text-sm font-medium text-gray-700' %>"><%= field["label"] || field_handle.titleize %></label>
+              <% if field["instructions"].present? %><p class="mt-1 text-sm text-gray-500"><%= field["instructions"] %></p><% end %>
               <% case field["type"] %>
+              <% when "section" %>
               <% when "text" %>
-                <%= text_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: field_id,
+                <%= text_field_tag "entry[data][#{field_handle}]", field_value, id: field_id, placeholder: field["placeholder"], required: field["required"],
                     class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
               <% when "textarea" %>
-                <%= text_area_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: field_id, rows: 4,
+                <%= text_area_tag "entry[data][#{field_handle}]", field_value, id: field_id, rows: 4, placeholder: field["placeholder"], required: field["required"],
                     class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
               <% when "rich_text" %>
                 <div class="mt-1">
-                  <%= hidden_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: "#{field_id}_hidden" %>
-                  <lexxy-editor value="<%= entry.data&.dig(field_handle) %>"
+                  <%= hidden_field_tag "entry[data][#{field_handle}]", field_value, id: "#{field_id}_hidden" %>
+                  <lexxy-editor value="<%= field_value %>"
                                 data-direct-upload-url="<%= main_app.rails_direct_uploads_url %>"
                                 data-blob-url-template="<%= main_app.rails_service_blob_url(":signed_id", ":filename") %>"
                                 data-hidden-field="<%= field_id %>_hidden"
                                 class="lexxy-content min-h-48 rounded-lg border border-gray-300 bg-white shadow-sm"
-                                placeholder="Write something…"></lexxy-editor>
+                                placeholder="<%= field['placeholder'].presence || 'Write something…' %>"></lexxy-editor>
                 </div>
               <% when "number" %>
-                <%= number_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: field_id,
-                    class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                <div class="mt-1 flex items-center gap-2">
+                  <%= number_field_tag "entry[data][#{field_handle}]", field_value, id: field_id, placeholder: field["placeholder"], required: field["required"],
+                      min: field["min"], max: field["max"], step: field["number_kind"] == "integer" ? 1 : (field["step"].presence || "any"),
+                      class: "block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                  <% if field["unit"].present? %><span class="text-sm font-medium text-gray-500"><%= field["unit"] %></span><% end %>
+                </div>
               <% when "boolean" %>
                 <div class="mt-1">
                   <%= hidden_field_tag "entry[data][#{field_handle}]", "false" %>
-                  <%= check_box_tag "entry[data][#{field_handle}]", "true", ActiveModel::Type::Boolean.new.cast(entry.data&.dig(field_handle)), id: field_id %>
+                  <%= check_box_tag "entry[data][#{field_handle}]", "true", ActiveModel::Type::Boolean.new.cast(field_value), id: field_id %>
                 </div>
               <% when "date" %>
-                <%= date_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: field_id,
-                    class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                <% date_options = { id: field_id, required: field["required"], min: field["min"], max: field["max"], class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" } %>
+                <% if field["date_mode"] == "time" %>
+                  <%= time_field_tag "entry[data][#{field_handle}]", field_value, date_options %>
+                <% elsif field["date_mode"] == "datetime" %>
+                  <%= datetime_local_field_tag "entry[data][#{field_handle}]", field_value, date_options %>
+                <% else %>
+                  <%= date_field_tag "entry[data][#{field_handle}]", field_value, date_options %>
+                <% end %>
               <% when "select" %>
-                <% options = Array(field["options"]) %>
+                <% options = Plum::FieldOptions.pairs(field["options"]) %>
                 <%= select_tag "entry[data][#{field_handle}]",
-                    options_for_select([["— Select —", ""]] + options.map { |o| [o, o] }, entry.data&.dig(field_handle)),
-                    id: field_id,
+                    options_for_select([["— Select —", ""]] + options, field_value),
+                    id: field_id, required: field["required"],
                     class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+              <% when "radio", "button_group" %>
+                <% options = Plum::FieldOptions.pairs(field["options"]) %>
+                <div class="mt-2 flex flex-wrap gap-2">
+                  <% options.each do |label, value| %>
+                    <label class="relative cursor-pointer">
+                      <%= radio_button_tag "entry[data][#{field_handle}]", value, field_value.to_s == value, required: field["required"], class: "peer sr-only" %>
+                      <span class="block rounded-md border border-gray-300 bg-white px-3 py-2 text-sm text-gray-700 peer-checked:border-purple-500 peer-checked:bg-purple-50 peer-checked:text-purple-700 peer-focus:ring-2 peer-focus:ring-purple-500"><%= label %></span>
+                    </label>
+                  <% end %>
+                </div>
               <% when "checkboxes" %>
-                <% options = Array(field["options"]) %>
-                <% selected = Array(entry.data&.dig(field_handle)) %>
+                <% options = Plum::FieldOptions.pairs(field["options"]) %>
+                <% selected = Array(field_value) %>
                 <div class="mt-1 space-y-2">
-                  <% options.each do |option| %>
+                  <% options.each do |label, value| %>
                     <label class="flex items-center gap-2 text-sm text-gray-700">
-                      <%= check_box_tag "entry[data][#{field_handle}][]", option, selected.include?(option),
+                      <%= check_box_tag "entry[data][#{field_handle}][]", value, selected.include?(value),
                           class: "h-4 w-4 text-purple-600 focus:ring-purple-500 border-gray-300 rounded" %>
-                      <%= option %>
+                      <%= label %>
                     </label>
                   <% end %>
                 </div>
               <% when "color" %>
                 <div class="mt-1 flex items-center gap-3">
-                  <%= color_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle) || "#000000", id: field_id,
+                  <%= color_field_tag "entry[data][#{field_handle}]", field_value || "#000000", id: field_id,
                       class: "h-10 w-14 p-0 border border-gray-300 rounded-md cursor-pointer" %>
-                  <span class="text-sm text-gray-500 font-mono"><%= entry.data&.dig(field_handle) %></span>
+                  <span class="text-sm text-gray-500 font-mono"><%= field_value %></span>
                 </div>
               <% when "taxonomy" %>
                 <% taxonomy_handle = field["taxonomy"].to_s %>
@@ -105,23 +131,62 @@
                   <% end %>
                 </div>
               <% when "url" %>
-                <%= url_field_tag "entry[data][#{field_handle}]", entry.data&.dig(field_handle), id: field_id,
-                    placeholder: "https://",
+                <%= url_field_tag "entry[data][#{field_handle}]", field_value, id: field_id,
+                    placeholder: field["placeholder"].presence || "https://", required: field["required"],
                     class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
               <% when "image" %>
                 <%= render "plum/cp/shared/image_picker",
                     input_name: "entry[data][#{field_handle}]",
-                    value: entry.data&.dig(field_handle).to_s,
+                    value: field_value.to_s,
                     field_id: field_id,
                     save_url: entry.persisted? ? "#{cp_content_type_entry_path(@content_type, entry)}/image_field" : nil,
                     field_handle: field_handle %>
+              <% when "images" %>
+                <% selected_asset_ids = Array(field_value).map(&:to_i) %>
+                <div class="mt-2 space-y-3" data-controller="plum--asset-collection" <% if field['max_items'].present? %>data-plum--asset-collection-max-value="<%= field['max_items'] %>"<% end %>>
+                  <%= hidden_field_tag "entry[data][#{field_handle}][]", "" %>
+                  <div class="flex items-center justify-between">
+                    <p class="text-xs text-gray-500">Choose images from the asset library.</p>
+                    <span class="text-xs font-medium text-gray-600" data-plum--asset-collection-target="count"></span>
+                  </div>
+                  <div class="grid grid-cols-2 gap-3 sm:grid-cols-4">
+                    <% @assets.each do |asset| %>
+                      <label class="group relative cursor-pointer overflow-hidden rounded-lg border border-gray-200 bg-gray-50 p-2 has-checked:border-purple-500 has-checked:ring-2 has-checked:ring-purple-500">
+                        <%= check_box_tag "entry[data][#{field_handle}][]", asset.id, selected_asset_ids.include?(asset.id), class: "sr-only", data: { "plum--asset-collection-target": "checkbox", action: "change->plum--asset-collection#refresh" } %>
+                        <%= image_tag asset.url, alt: asset.alt_text.to_s, class: "aspect-square w-full rounded-md object-cover" %>
+                        <span class="mt-1 block truncate text-xs text-gray-600"><%= asset.filename %></span>
+                      </label>
+                    <% end %>
+                  </div>
+                  <% if @assets.empty? %><p class="text-sm text-gray-500">No images available. <%= link_to "Upload images", cp_assets_path, class: "text-purple-600" %>.</p><% end %>
+                </div>
               <% when "relationship" %>
-                <% selected_entry_id = entry.data&.dig(field_handle).to_s %>
                 <% relationship_entries = (@relationship_entries_by_field || {}).fetch(field_handle, []) %>
-                <%= select_tag "entry[data][#{field_handle}]",
-                    options_for_select([["No entry", ""]] + relationship_entries.map { |related_entry| ["#{related_entry.title} (#{related_entry.content_type.name})", related_entry.id] }, selected_entry_id),
-                    id: field_id,
-                    class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                <% relationship_options = relationship_entries.map { |related_entry| ["#{related_entry.title} (#{related_entry.content_type.name})", related_entry.id] } %>
+                <% if field["multiple"] %>
+                  <%= select_tag "entry[data][#{field_handle}][]", options_for_select(relationship_options, Array(field_value).map(&:to_s)), multiple: true,
+                      id: field_id, required: field["required"], size: [relationship_options.length, 8].min,
+                      class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                <% else %>
+                  <%= select_tag "entry[data][#{field_handle}]", options_for_select([["No entry", ""]] + relationship_options, field_value.to_s),
+                      id: field_id, required: field["required"], class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
+                <% end %>
+              <% when "list", "group", "repeater" %>
+                <% structured_value = field_value || (field["type"] == "group" ? {} : []) %>
+                <div class="mt-2 space-y-3" data-controller="plum--structured-field"
+                     data-plum--structured-field-type-value="<%= field['type'] %>"
+                     data-plum--structured-field-fields-value="<%= Array(field['fields']).to_json %>"
+                     <% if field['min_items'].present? %>data-plum--structured-field-min-items-value="<%= field['min_items'] %>"<% end %>
+                     <% if field['max_items'].present? %>data-plum--structured-field-max-items-value="<%= field['max_items'] %>"<% end %>>
+                  <%= hidden_field_tag "entry[data][#{field_handle}]", structured_value.to_json,
+                      data: { "plum--structured-field-target": "input" } %>
+                  <p class="hidden text-sm text-gray-500" data-plum--structured-field-target="empty">No items yet.</p>
+                  <div class="space-y-3" data-plum--structured-field-target="rows"></div>
+                  <% unless field["type"] == "group" %>
+                    <button type="button" data-action="plum--structured-field#add" data-plum--structured-field-target="add"
+                            class="rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-40">+ Add <%= field["type"] == "list" ? "item" : "row" %></button>
+                  <% end %>
+                </div>
               <% when "blocks" %>
                 <% editor_config = Plum::BlockEditorConfig.new(@theme, allowed: field["blocks"]) %>
                 <% current_blocks = entry.data&.dig(field_handle) %>
@@ -150,9 +215,15 @@
                     </div>
                   </div>
                 <% end %>
+              <% else %>
+                <% definition = Plum::FieldTypeRegistry.find(field["type"]) %>
+                <% if definition&.partial.present? %>
+                  <%= render definition.partial, field: field, field_handle: field_handle, field_id: field_id, field_value: field_value, entry: entry %>
+                <% end %>
               <% end %>
             </div>
           <% end %>
+          </div>
           <% if @content_type.fields.empty? %>
             <p class="text-sm text-gray-500">No fields defined. <%= link_to "Edit content type", edit_cp_content_type_path(@content_type), class: "text-purple-600 hover:text-purple-900" %> to add fields.</p>
           <% end %>
@@ -164,6 +235,12 @@
         <div class="bg-white shadow rounded-lg p-6 space-y-4">
           <h3 class="text-lg font-medium text-gray-900">Publishing</h3>
 
+          <div>
+            <%= f.label :locale, class: "block text-sm font-medium text-gray-700" %>
+            <%= f.select :locale, current_site.locales.map { |locale| [locale, locale] }, {},
+                class: "mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-purple-500 focus:ring-purple-500" %>
+          </div>
+
           <div>
             <%= f.label :status, class: "block text-sm font-medium text-gray-700" %>
             <%= f.select :status, Plum::Entry.statuses.keys.map { |s| [s.titleize, s] }, {},

data/app/views/plum/cp/entries/edit.html.erb

@@ -1,9 +1,25 @@
 <div class="flex items-center justify-between mb-8">
   <h1 class="text-2xl font-bold text-gray-900">Edit <%= @entry.title %></h1>
+  <div class="flex items-center gap-3">
+    <%= link_to "History (#{@entry.revisions.count})", cp_content_type_entry_revisions_path(@content_type, @entry),
+        class: "inline-flex items-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50" %>
   <% if @entry.published? %>
     <%= link_to "View", "#{root_path.chomp('/')}/#{@entry.slug}", target: "_blank",
         class: "inline-flex items-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50" %>
   <% end %>
+  </div>
 </div>
 
 <%= render "form", entry: @entry %>
+
+<div class="mt-6 rounded-lg bg-white p-6 shadow">
+  <h2 class="text-lg font-semibold text-gray-900">Translations</h2>
+  <div class="mt-3 flex flex-wrap gap-2">
+    <% @entry.translation_group.each do |translation| %>
+      <%= link_to translation.locale, edit_cp_content_type_entry_path(@content_type, translation), class: "rounded-md border border-gray-300 px-3 py-2 text-sm font-medium #{translation == @entry ? 'bg-purple-50 text-purple-700' : 'bg-white text-gray-700'}" %>
+    <% end %>
+    <% (current_site.locales - @entry.translation_group.map(&:locale)).each do |locale| %>
+      <%= button_to "+ #{locale}", translate_cp_content_type_entry_path(@content_type, @entry), params: { locale: locale }, class: "rounded-md border border-dashed border-purple-300 px-3 py-2 text-sm font-medium text-purple-700" %>
+    <% end %>
+  </div>
+</div>

data/app/views/plum/cp/entry_revisions/index.html.erb

@@ -0,0 +1,25 @@
+<div class="mb-8 flex items-center justify-between gap-4">
+  <div>
+    <h1 class="text-2xl font-bold text-gray-900">Revision history</h1>
+    <p class="mt-1 text-sm text-gray-500"><%= @entry.title %></p>
+  </div>
+  <%= link_to "Back to entry", edit_cp_content_type_entry_path(@content_type, @entry), class: "rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50" %>
+</div>
+
+<div class="overflow-hidden rounded-lg bg-white shadow">
+  <ul class="divide-y divide-gray-200">
+    <% @revisions.each_with_index do |revision, index| %>
+      <li class="flex flex-wrap items-center justify-between gap-4 px-6 py-4">
+        <div>
+          <p class="text-sm font-semibold text-gray-900"><%= index.zero? ? "Current saved version" : revision.created_at.to_fs(:long) %></p>
+          <p class="mt-1 text-xs text-gray-500"><%= revision.editor_label %> · <%= revision.snapshot["status"].to_s.titleize %></p>
+        </div>
+        <% unless index.zero? %>
+          <%= button_to "Restore", restore_cp_content_type_entry_revision_path(@content_type, @entry, revision), method: :post,
+              form: { data: { turbo_confirm: "Restore this version? The current version will remain in history." } },
+              class: "rounded-md border border-purple-200 bg-purple-50 px-3 py-2 text-sm font-semibold text-purple-700 hover:bg-purple-100" %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/plum/cp/fieldsets/index.html.erb

@@ -0,0 +1,30 @@
+<div class="mb-8">
+  <h1 class="text-2xl font-bold text-gray-900">Fieldsets</h1>
+  <p class="mt-1 text-sm text-gray-500">Save a content type's fields, then reuse them in other blueprints.</p>
+</div>
+
+<div class="grid gap-6 lg:grid-cols-3">
+  <section class="rounded-lg bg-white p-6 shadow lg:col-span-2">
+    <h2 class="text-lg font-semibold text-gray-900">Saved fieldsets</h2>
+    <div class="mt-4 divide-y divide-gray-200">
+      <% @fieldsets.each do |fieldset| %>
+        <div class="flex items-center justify-between gap-4 py-4">
+          <div><p class="text-sm font-semibold text-gray-900"><%= fieldset.name %></p><p class="text-xs text-gray-500"><%= fieldset.handle %> · <%= fieldset.fields.length %> fields</p></div>
+          <%= button_to "Delete", cp_fieldset_path(fieldset), method: :delete, form: { data: { turbo_confirm: "Delete this fieldset? Existing blueprints are unaffected." } }, class: "text-sm font-medium text-red-600" %>
+        </div>
+      <% end %>
+      <% if @fieldsets.empty? %><p class="py-6 text-sm text-gray-500">No saved fieldsets yet.</p><% end %>
+    </div>
+  </section>
+
+  <section class="rounded-lg bg-white p-6 shadow">
+    <h2 class="text-lg font-semibold text-gray-900">Create from content type</h2>
+    <%= form_with url: cp_fieldsets_path, scope: :fieldset, class: "mt-4 space-y-4" do |form| %>
+      <%= form.text_field :name, value: @fieldset&.name, required: true, placeholder: "SEO fields", class: "block w-full rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+      <%= form.text_field :handle, value: @fieldset&.handle, placeholder: "Generated from name", class: "block w-full rounded-md border border-gray-300 px-3 py-2 font-mono text-sm" %>
+      <%= form.collection_select :content_type_id, @content_types, :id, :name, { prompt: "Choose source content type" }, required: true, class: "block w-full rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+      <% if @fieldset&.errors&.any? %><p class="text-sm text-red-600"><%= @fieldset.errors.full_messages.to_sentence %></p><% end %>
+      <%= form.submit "Save fieldset", class: "rounded-md bg-purple-600 px-4 py-2 text-sm font-semibold text-white hover:bg-purple-700" %>
+    <% end %>
+  </section>
+</div>

data/app/views/plum/cp/site_settings/edit.html.erb

@@ -60,6 +60,18 @@
       <%= f.email_field :support_email,
           class: "mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500" %>
     </div>
+
+    <div class="grid gap-4 sm:grid-cols-2">
+      <div>
+        <%= f.label :locales, "Locales", class: "block text-sm font-medium text-gray-700" %>
+        <%= text_field_tag "site_setting[locales]", current_site.locales.join(", "), class: "mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm", placeholder: "en, es, fr-CA" %>
+        <p class="mt-1 text-xs text-gray-500">Comma-separated language or language-region codes.</p>
+      </div>
+      <div>
+        <%= f.label :default_locale, "Default locale", class: "block text-sm font-medium text-gray-700" %>
+        <%= text_field_tag "site_setting[default_locale]", current_site.default_locale, class: "mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm" %>
+      </div>
+    </div>
   </div>
 
   <div class="bg-white shadow rounded-lg p-6 space-y-6">

data/config/plum_routes.rb

@@ -6,10 +6,16 @@ Plum::Engine.routes.draw do
   namespace :cp do
     root "dashboard#show"
     resources :content_types do
+      post :apply_fieldset, on: :member
       resources :entries do
         patch :image_field, on: :member
+        post :translate, on: :member
+        resources :revisions, controller: "entry_revisions", only: [ :index ] do
+          post :restore, on: :member
+        end
       end
     end
+    resources :fieldsets, only: [ :index, :create, :destroy ]
     resources :assets, except: [ :show ]
     resources :globals
     resources :nav_menus do
@@ -28,10 +34,19 @@ Plum::Engine.routes.draw do
   end
 
   post "forms/:handle", to: "form_submissions#create", as: :form
+  namespace :api do
+    namespace :v1 do
+      get "collections/:collection_handle/entries", to: "entries#index", as: :collection_entries
+      get "collections/:collection_handle/entries/:slug", to: "entries#show", as: :collection_entry
+    end
+  end
   get "theme_assets/:theme_handle/*path", to: "theme_assets#show", as: :theme_asset, format: false
 
   get "search", to: "pages#search", as: :search
 
+  get ":locale", to: "pages#localized_home", constraints: { locale: /[a-z]{2}(?:-[A-Z]{2})?/ }, as: :localized_root
+  get ":locale/*slug", to: "pages#show", constraints: { locale: /[a-z]{2}(?:-[A-Z]{2})?/ }, as: :localized_page
+
   root "pages#home"
   get "*slug", to: "pages#show", constraints: ->(req) { !req.path.start_with?("/rails/") }
 end

data/db/engine_migrate/20260807130000_create_plum_entry_revisions.rb

@@ -0,0 +1,16 @@
+class CreatePlumEntryRevisions < ActiveRecord::Migration[8.0]
+  def change
+    create_table :plum_entry_revisions do |t|
+      t.references :site, null: false, foreign_key: { to_table: :plum_sites }
+      t.references :entry, null: false, foreign_key: { to_table: :plum_entries }
+      t.references :editor, null: true, foreign_key: { to_table: :plum_users }
+      t.string :editor_name
+      t.string :editor_email
+      t.string :editor_gid
+      t.json :snapshot, null: false, default: {}
+      t.timestamps
+    end
+
+    add_index :plum_entry_revisions, [ :entry_id, :created_at ]
+  end
+end

data/db/engine_migrate/20260807140000_create_plum_fieldsets.rb

@@ -0,0 +1,13 @@
+class CreatePlumFieldsets < ActiveRecord::Migration[8.0]
+  def change
+    create_table :plum_fieldsets do |t|
+      t.references :site, null: false, foreign_key: { to_table: :plum_sites }
+      t.string :name, null: false
+      t.string :handle, null: false
+      t.json :fields, null: false, default: []
+      t.timestamps
+    end
+
+    add_index :plum_fieldsets, [ :site_id, :handle ], unique: true
+  end
+end

data/db/engine_migrate/20260807150000_add_focal_point_to_plum_assets.rb

@@ -0,0 +1,6 @@
+class AddFocalPointToPlumAssets < ActiveRecord::Migration[8.0]
+  def change
+    add_column :plum_assets, :focal_x, :integer, null: false, default: 50
+    add_column :plum_assets, :focal_y, :integer, null: false, default: 50
+  end
+end

data/db/engine_migrate/20260807160000_add_localization_to_plum_entries.rb

@@ -0,0 +1,9 @@
+class AddLocalizationToPlumEntries < ActiveRecord::Migration[8.0]
+  def change
+    add_column :plum_entries, :locale, :string, null: false, default: "en"
+    add_reference :plum_entries, :origin, null: true, foreign_key: { to_table: :plum_entries }
+    remove_index :plum_entries, [ :site_id, :slug ], if_exists: true
+    add_index :plum_entries, [ :site_id, :locale, :slug ], unique: true
+    add_index :plum_entries, [ :origin_id, :locale ], unique: true
+  end
+end