alchemy_cms 8.0.12 → 8.1.0

data/app/views/alchemy/admin/attachments/_sorting_select.html.erb

@@ -0,0 +1,13 @@
+<div id="sorting_select">
+  <div class="filter-input">
+    <alchemy-auto-submit>
+      <%= label_tag "q[s]", t(".label") %>
+      <%= select_tag "q[s]", options_for_select([
+        [t(".by_latest"), "created_at desc"],
+        [t(".alphabetical"), "name asc"]
+      ], search_filter_params.dig(:q, :s)),
+      form: "resource_search",
+      class: "full_width" %>
+    </alchemy-auto-submit>
+  </div>
+</div>

data/app/views/alchemy/admin/attachments/_tag_list.html.erb

@@ -1,14 +1,13 @@
 <% if Alchemy::Attachment.tag_counts.any? %>
   <h3><%= Alchemy.t("Filter by tag") %></h3>
-  <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
+  <%= render Alchemy::Admin::ListFilter.new(".tag-list li", placeholder: Alchemy.t("Filter tags")) %>
   <ul>
-    <%= render_tag_list('Alchemy::Attachment') %>
+    <%= render Alchemy::Admin::TagsList.new('Alchemy::Attachment') %>
   </ul>
   <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
       render_icon(:times, size: '1x') + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
-      remote: request.xhr?,
       class: 'secondary button small with_icon'
     ) %>
   <% end %>

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -3,26 +3,20 @@
     <% if can? :create, Alchemy::Attachment %>
       <div class="toolbar_button">
         <%= render 'alchemy/admin/uploader/button',
-          redirect_url: alchemy.admin_attachments_path,
+          redirect_url: alchemy.admin_attachments_path(q: {
+            last_upload: true
+          }),
           object: Alchemy::Attachment.new,
           file_attribute: 'file' %>
       </div>
     <% end %>
   </div>
+
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="with_tag_filter resources-table-wrapper">
   <%= render 'alchemy/admin/resources/table_header' %>
   <%= render 'files_list' %>
-
-  <div id="library_sidebar">
-    <%= render 'filter_bar' if resource_has_filters %>
-
-    <% if Alchemy::Attachment.tag_counts.any? %>
-      <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">
-        <%= render 'tag_list' %>
-      </div>
-    <% end %>
-  </div>
+  <%= render 'library_sidebar' %>
 </div>

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -51,7 +51,7 @@
       <%= video_tag(@attachment.url, preload: "metadata", controls: true) %>
     </div>
     <% when "application/pdf" %>
-    <iframe src="<%= @attachment.url %>" frameborder="0"></iframe>
+    <iframe src="<%= @attachment.url %>" frameborder="0" title="Alchemy.t('File preview')"></iframe>
     <% end %>
   <% end %>
 </div>

data/app/views/alchemy/admin/clipboard/_button.html.erb

@@ -8,5 +8,6 @@
     size: "400x305"
   },
   id: "clipboard_button",
+  tooltip_placement: local_assigns.fetch(:tooltip_placement, "top-start"),
   if_permitted_to: [:index, :alchemy_admin_clipboard]
 ) %>

data/app/views/alchemy/admin/clipboard/index.html.erb

@@ -1,18 +1,17 @@
 <%= turbo_frame_tag :clipboard_items do %>
-  <% if @clipboard_items.blank? %>
+  <% if clipboard_items.blank? %>
     <%= render_message do %>
       <%= Alchemy.t('No items in your clipboard') %>
     <% end %>
   <% else %>
     <%= render_message do %>
-      <%= Alchemy.t('Add items from clipboard via "Add Element" button') %>
+      <%= Alchemy.t("Add items from clipboard via \"Add #{remarkable_type.singularize.capitalize}\" button") %>
     <% end %>
-
     <ul>
-      <% @clipboard_items.each do |item| %>
+      <% clipboard_items.each do |item| %>
         <% item_class = item.class.name.demodulize.underscore.pluralize %>
         <li id="clipboard_item_<%= item.id %>" class="<%= item_class %>">
-          <% if item_class == 'pages' %>
+          <% if %[pages nodes].include? item_class %>
             <%= render_icon(:file) %>
             <%= truncate(item.name, length: 50) %>
           <% else %>

data/app/views/alchemy/admin/clipboard/insert.turbo_stream.erb

@@ -1,6 +1,6 @@
 <% if @item.class.name == 'Alchemy::Element' && params[:remove] -%>
   <% if @item.fixed? -%>
-    <alchemy-action name="removeFixedElement" params="[<%= @item.id %>]" />
+    <alchemy-action name="removeFixedElement" params="[<%= @item.id %>]"></alchemy-action>
   <% else -%>
     <%= turbo_stream.remove "element_#{@item.id}" %>
   <% end -%>

data/app/views/alchemy/admin/crop.html.erb

@@ -1,15 +1,15 @@
-<div id="jscropper">
 <% if @no_image_notice %>
   <%= render_message :warn do %>
     <%= @no_image_notice %>
   <% end %>
 <% else %>
+<div id="jscropper">
   <%= render_message do %>
     <%= simple_format Alchemy.t(:explain_cropping) %>
   <% end %>
-  <div class="thumbnail_background">
-    <%= image_tag @picture.url(flatten: true), id: 'imageToCrop' %>
-  </div>
+  <%= content_tag "alchemy-picture-thumbnail", nil,
+    src: @picture.url(flatten: true),
+    id: "imageToCrop" %>
   <form>
     <%= button_tag Alchemy.t(:apply), type: 'submit' %>
     <%= button_tag Alchemy.t('Reset Imagemask'), class: 'reset_mask secondary', type: 'reset' %>
@@ -19,11 +19,9 @@
 <% if @settings %>
 <script type="module">
   import ImageCropper from "alchemy_admin/image_cropper";
-  import ImageLoader from "alchemy_admin/image_loader";
 
-  const image = document.getElementById("imageToCrop");
+  const image = document.getElementById("imageToCrop")?.querySelector("img");
 
-  new ImageLoader(image);
   new ImageCropper(
     image,
     <%= @settings[:default_box].to_json %>,

data/app/views/alchemy/admin/dashboard/widgets/_locked_pages.html.erb

@@ -37,7 +37,7 @@
       </td>
       <td>
         <% if (current_alchemy_user.id == page.locked_by) || can?(:manage, Alchemy::Current.site) %>
-        <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_path)) do %>
+        <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
           <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
             <%= render_icon(:close, size: '1x') %>
           </button>

data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb

@@ -1,25 +1,25 @@
 <%= content_tag :div, class: 'add-nested-element', data: { element_id: element.id } do %>
   <% if element.nestable_elements.length == 1 &&
     (nestable_element = element.nestable_elements.first) &&
-    Alchemy::Element.all_from_clipboard_for_parent_element(get_clipboard("elements"), element).none?
+    Alchemy::Element.all_from_clipboard_for_parent_element(clipboard, element).none?
   %>
     <%= turbo_frame_tag("new_nested_element_#{element.id}") do %>
       <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)], html: { class: 'add-nested-element-form', id: nil } do |f| %>
         <%= f.hidden_field :name %>
         <%= f.hidden_field :page_version_id, value: element.page_version_id %>
         <%= f.hidden_field :parent_element_id, value: element.id %>
-        <button class="add-nestable-element-button" is="alchemy-button">
+        <%= button_tag class: "add-nestable-element-button", is: "alchemy-button", disabled: cannot?(:create, Alchemy::Element) do %>
           <%= Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element.to_sym, scope: 'element_names')) %>
-        </button>
+        <% end %>
       <% end %>
     <% end %>
   <% else %>
     <%= link_to_dialog (nestable_element ? Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element.to_sym, scope: 'element_names')) : Alchemy.t("New Element")),
-      alchemy.new_admin_element_path(
+      can?(:create, Alchemy::Element) ? alchemy.new_admin_element_path(
         parent_element_id: element.id,
         page_version_id: element.page_version_id
-      ), {
-        size: "320x125",
+      ) : nil, {
+        size: "380x125",
         title: Alchemy.t("New Element")
       }, class: "button add-nestable-element-button" %>
   <% end %>

data/app/views/alchemy/admin/elements/_fixed_element.html.erb

@@ -2,5 +2,5 @@
   <%= element.display_name %>
 </sl-tab>
 <sl-tab-panel id="fixed_element_<%= element.id %>" name="fixed-element-<%= element.id %>" style="--padding: 0" class="scrollable-elements">
-  <%= render Alchemy::ElementEditor.new(element) %>
+  <%= render Alchemy::Admin::ElementEditor.new(element: element) %>
 </sl-tab-panel>

data/app/views/alchemy/admin/elements/_footer.html.erb

@@ -5,7 +5,13 @@
     </p>
   <% end %>
 
-  <button type="submit" form="element_<%= element.id %>_form" is="alchemy-button" data-turbo="false">
+  <button
+    form="element_<%= element.id %>_form"
+    is="alchemy-button"
+    data-turbo="false"
+    type="submit"
+    <%= "disabled" if cannot?(:update, element) %>
+  >
     <%= Alchemy.t(:save) %>
   </button>
 </div>

data/app/views/alchemy/admin/elements/_header.html.erb

@@ -1,15 +1,15 @@
 <div class="element-header<%= ' has-hint' if element.has_hint? %>">
-  <span class="element-handle">
+  <span class="element-handle<%= ' draggable' if can?(:order, element) %>">
     <% if element.definition.blank? %>
-      <%= hint_with_tooltip Alchemy.t(:element_definition_missing) %>
+      <%= hint_with_tooltip Alchemy.t(:element_definition_missing), icon_class: "element-icon" %>
     <% elsif element.deprecated? %>
-      <%= hint_with_tooltip element.deprecation_notice %>
+      <%= hint_with_tooltip element.deprecation_notice, icon_class: "element-icon" %>
     <% else %>
-      <span class="icon element">
+      <span class="element-icon">
         <%= element.definition.icon_file %>
       </span>
-      <%= render_icon(:draggable, style: false, fixed_width: false) %>
     <% end %>
+    <%= render_icon(:draggable, style: false, fixed_width: false, class: "handle-icon") %>
   </span>
   <span class="element-title">
     <span class="preview_text_element_name"><%= element.display_name %></span>

data/app/views/alchemy/admin/elements/_toolbar.html.erb

@@ -1,34 +1,59 @@
 <% remarkable_type = "elements" %>
 <div class="element-toolbar">
-  <sl-tooltip placement="top-start" content="<%= Alchemy.t(:copy_element) %>">
+  <sl-tooltip
+    placement="top-start"
+    content="<%= Alchemy.t(:copy_element) %>"
+    <%= "disabled" if cannot?(:create, element) %>
+  >
     <%= button_to(
       render_icon("file-copy"),
       alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id),
       "data-turbo-method": :post,
-      class: "icon_button"
+      class: "icon_button",
+      disabled: cannot?(:create, element)
     ) %>
   </sl-tooltip>
-  <sl-tooltip content="<%= Alchemy.t(:cut_element) %>">
+  <sl-tooltip
+    content="<%= Alchemy.t(:cut_element) %>"
+    <%= "disabled" if cannot?(:create, element) %>
+  >
     <%= button_to(
       render_icon("scissors-cut"),
       alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id, remove: true),
       "data-turbo-method": :post,
-      class: "icon_button"
+      class: "icon_button",
+      disabled: cannot?(:create, element)
     ) %>
   </sl-tooltip>
-  <sl-tooltip content="<%= Alchemy.t("Delete element") %>">
+  <sl-tooltip
+    content="<%= Alchemy.t("Delete element") %>"
+    <%= "disabled" if cannot?(:destroy, element) %>
+  >
     <alchemy-delete-element-button
       href="<%= alchemy.admin_element_path(element) %>"
       message="<%= Alchemy.t(:confirm_to_delete_element) %>"
     >
-      <button type="button" class="icon_button" data-turbo="false">
+      <button
+        class="icon_button"
+        data-turbo="false"
+        type="button"
+        <%= "disabled" if cannot?(:destroy, element) %>
+      >
         <%= render_icon('delete-bin-2') %>
       </button>
     </alchemy-delete-element-button>
   </sl-tooltip>
-  <sl-tooltip content="<%= element.public? ? Alchemy.t(:hide_element) : Alchemy.t(:show_element) %>" placement="top-end">
+  <sl-tooltip
+    content="<%= element.public? ? Alchemy.t(:hide_element) : Alchemy.t(:show_element) %>"
+    placement="top-end"
+    <%= "disabled" if cannot?(:update, element) %>
+  >
     <alchemy-publish-element-button>
-      <sl-switch <%= element.public? ? nil : "checked" %> size="small">
+      <sl-switch
+        size="small"
+        <%= "checked" if !element.public? %>
+        <%= "disabled" if cannot?(:update, element) %>
+      >
         <%= t(".hide") %>
       </sl-switch>
     </alchemy-publish-element-button>

data/app/views/alchemy/admin/elements/create.turbo_stream.erb

@@ -1,11 +1,3 @@
-<% opts = {
-  partial: "alchemy/admin/elements/element",
-  locals: {
-    element: Alchemy::ElementEditor.new(@element),
-    created: true
-  }
-} %>
-
 <% if @element.fixed? %>
   <% target = "fixed_element_#{@element.id}" %>
   <%= turbo_stream.append "fixed-elements",
@@ -22,15 +14,23 @@
 <% end %>
 
 <% if @insert_at_top %>
-  <%= turbo_stream.prepend target, **opts %>
+  <%= turbo_stream.prepend target do %>
+    <%= render Alchemy::Admin::ElementEditor.new(element: @element, created: true) %>
+  <% end %>
 <% else %>
-  <%= turbo_stream.append target, **opts %>
+  <%= turbo_stream.append target do %>
+    <%= render Alchemy::Admin::ElementEditor.new(element: @element, created: true) %>
+  <% end %>
 <% end %>
 
 <%= turbo_stream.replace "clipboard_button",
   partial: "alchemy/admin/clipboard/button",
   locals: {remarkable_type: "elements"} %>
 
+<%= turbo_stream.replace "publish_page_button" do %>
+  <%= render Alchemy::Admin::PublishPageButton.new(page: @element.page) %>
+<% end %>
+
 <alchemy-growl>
   <%= Alchemy.t(:successfully_added_element) %>
 </alchemy-growl>

data/app/views/alchemy/admin/elements/index.html.erb

@@ -9,16 +9,26 @@
         label: Alchemy.t("New Element"),
         dialog_options: {
           title: Alchemy.t("New Element"),
-          size: "320x125"
+          size: "380x125"
         },
+        tooltip_placement: "bottom-start",
         if_permitted_to: [:create, Alchemy::Element]
       ) %>
-      <%= render "alchemy/admin/clipboard/button", remarkable_type: "elements" %>
-      <sl-tooltip content="<%= Alchemy.t("Collapse all elements") %>" placement="top-end" class="right">
-        <button id="collapse-all-elements-button" class="icon_button">
-          <alchemy-icon name="contract-up-down"></alchemy-icon>
-        </button>
-      </sl-tooltip>
+      <%= render "alchemy/admin/clipboard/button", remarkable_type: "elements", tooltip_placement: "bottom-start" %>
+      <div class="right">
+        <%= render Alchemy::Admin::ListFilter.new(
+          "alchemy-element-editor",
+          name_attribute: "filter-text",
+          placeholder: Alchemy.t("Filter elements"),
+          hotkey: "alt+f"
+        ) %>
+        <div class="toolbar_spacer"></div>
+        <sl-tooltip content="<%= Alchemy.t("Collapse all elements") %>" placement="bottom-end">
+          <button id="collapse-all-elements-button" class="icon_button">
+            <alchemy-icon name="contract-up-down"></alchemy-icon>
+          </button>
+        </sl-tooltip>
+      </div>
     </div>
     <% if @page.element_definitions.any?(&:fixed) %>
       <sl-tab-group id="fixed-elements">
@@ -28,24 +38,27 @@
         <%= render partial: "fixed_element", collection: @fixed_elements, as: :element %>
         <sl-tab-panel
           name="main-content-elements"
-          class="sortable-elements scrollable-elements"
-          data-droppable-elements="<%= @page.element_definition_names.join(' ') %>"
-          data-element-name="main-content-elements"
-          id="main-content-elements"
           style="--padding: 0"
         >
-          <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
+          <alchemy-sortable-elements
+            id="main-content-elements"
+            class="scrollable-elements"
+            data-droppable-elements="<%= @page.element_definition_names.join(' ') %>"
+            data-element-name="main-content-elements"
+          >
+            <%= render Alchemy::Admin::ElementEditor.with_collection(@elements) %>
+          </alchemy-sortable-elements>
         </sl-tab-panel>
       </sl-tab-group>
     <% else %>
-      <div
+      <alchemy-sortable-elements
         id="main-content-elements"
-        class="sortable-elements scrollable-elements"
+        class="scrollable-elements"
         data-droppable-elements="<%= @page.element_definition_names.join(' ') %>"
         data-element-name="main-content-elements"
       >
-        <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
-      </div>
+        <%= render Alchemy::Admin::ElementEditor.with_collection(@elements) %>
+      </alchemy-sortable-elements>
     <% end %>
   </alchemy-elements-window>
 <% end %>

data/app/views/alchemy/admin/elements/new.html.erb

@@ -1,4 +1,4 @@
-<%- if @clipboard_items.blank? -%>
+<%- if clipboard_items.blank? -%>
   <%= render 'form' %>
 <%- else -%>
 <sl-tab-group id="overlay_tabs">
@@ -14,7 +14,7 @@
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',
-          clipboard_select_tag_options(@clipboard_items),
+          clipboard_select_tag_options(clipboard_items),
           is: 'alchemy-select' %>
       </div>
       <%= f.submit Alchemy.t(:paste) %>

data/app/views/alchemy/admin/ingredients/update.turbo_stream.erb

@@ -4,9 +4,7 @@
 <alchemy-action name="updateAnchorIcon" params="<%= [@ingredient.id, @ingredient.dom_id.present?].to_json %>"></alchemy-action>
 <% end %>
 <% if @ingredient.type == "Alchemy::Ingredients::Picture" && @ingredient.css_class.present? %>
-  <%= turbo_stream.replace_all "[data-ingredient-id='#{@ingredient.id}'] .picture_ingredient_css_class",
-    partial: "alchemy/ingredients/shared/picture_css_class",
-    locals: {
-      css_class: Alchemy::IngredientEditor.new(@ingredient).css_class
-    } %>
+  <%= turbo_stream.replace @ingredient do %>
+    <%= render Alchemy::Ingredients::PictureEditor.new(@ingredient) %>
+  <% end %>
 <% end %>

data/app/views/alchemy/admin/leave.html.erb

@@ -1,7 +1,7 @@
 <%= render_message do %>
   <%= Alchemy.t("You are about to leave Alchemy") %>
 <% end %>
-<%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
+<%= form_tag Alchemy.config.logout_path, method: Alchemy.config.logout_method do %>
   <div class="buttons">
     <%= link_to Alchemy.t("stay logged in"),
       alchemy.root_path,

data/app/views/alchemy/admin/nodes/_node.html.erb

@@ -40,6 +40,25 @@
           ) %>
         </sl-tooltip>
       <% end %>
+      <% if can?(:copy, node) %>
+      <sl-tooltip content="<%= Alchemy.t(:copy_node) %>">
+        <%= link_to(
+          render_icon("file-copy"),
+          alchemy.insert_admin_clipboard_path(
+            remarkable_type: :nodes,
+            remarkable_id: node.id,
+          ),
+          "data-turbo-method": :post,
+          class: "icon_button"
+        ) %>
+      </sl-tooltip>
+      <% else %>
+      <div class="sitemap_tool disabled">
+        <sl-tooltip content="<%= Alchemy.t("Your user role does not allow you to copy this node") %>" class="like-hint-tooltip" placement="bottom-start">
+          <%= render_icon("file-copy") %>
+        </sl-tooltip>
+      </div>
+      <% end %>
       <% if can?(:destroy, node) %>
         <sl-tooltip content="<%= node.root? ? Alchemy.t(:delete_menu) : Alchemy.t(:delete_node) %>">
           <%= link_to_confirm_dialog(

data/app/views/alchemy/admin/nodes/edit.html.erb

@@ -1 +1 @@
-<%= render 'form', node: @node, button_label: Alchemy.t(:save) %>
+<%= render 'form', node: @node, button_label: Alchemy.t(:save) %>

data/app/views/alchemy/admin/nodes/index.html.erb

@@ -18,11 +18,13 @@
       },
       if_permitted_to: [:create, Alchemy::Node]
     ) if @root_nodes.any? %>
+    <div class="toolbar_spacer"></div>
+    <%= render "alchemy/admin/clipboard/button", remarkable_type: "nodes" %>
   </div>
 <% end %>
 
 <div id="archive_all">
-  <h1 id="node_filter_result"></h1>
+  <h1 id="node_filter_result">Node filter display</h1>
   <% if @root_nodes.any? %>
     <% @root_nodes.each do |root_node| %>
       <ul class="nodes_tree list">

data/app/views/alchemy/admin/nodes/new.html.erb

@@ -1 +1,14 @@
-<%= render 'form', node: @node, button_label: Alchemy.t(:create) %>
+<%- if clipboard_items.blank? -%>
+  <%= render 'form', node: @node, button_label: Alchemy.t(:create) %>
+<%- else -%>
+<sl-tab-group id="overlay_tabs">
+  <sl-tab slot="nav" panel="create_node_tab"><%= Alchemy.t('New node') %></sl-tab>
+  <sl-tab slot="nav" panel="paste_node_tab"><%= Alchemy.t('Paste from clipboard') %></sl-tab>
+  <sl-tab-panel name="create_node_tab">
+    <%= render 'form', node: @node, button_label: Alchemy.t(:create) %>
+  </sl-tab-panel>
+  <sl-tab-panel name="paste_node_tab">
+    <%= render 'alchemy/admin/partials/paste_from_clipboard_form', item: @node %>
+  </sl-tab-panel>
+</sl-tab-group>
+<%- end -%>

data/app/views/alchemy/admin/pages/_current_page.html.erb

@@ -1,4 +1,6 @@
 <div class="page_status_and_name" id="locked_page_<%= current_page.id %>">
   <%= render 'alchemy/admin/pages/page_infos', page: current_page %>
-  <%= render 'alchemy/admin/pages/page_status', page: current_page %>
+  <%= render 'alchemy/admin/pages/page_status',
+    published: local_assigns.fetch(:published, false),
+    page: current_page %>
 </div>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -19,9 +19,14 @@
 
     <%= f.input :name, autofocus: true %>
     <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %>
-    <alchemy-char-counter max-chars="60">
-      <%= f.input :title %>
-    </alchemy-char-counter>
+
+    <%= f.fields_for :draft_version, @page.draft_version do |v| %>
+      <alchemy-char-counter max-chars="60">
+        <%= v.input :title, input_html: {
+          disabled: @page.attribute_fixed?(:title)
+        } %>
+      </alchemy-char-counter>
+    <% end %>
 
     <% if Alchemy.config.show_page_searchable_checkbox %>
       <div class="input check_boxes">
@@ -40,13 +45,20 @@
       </div>
     </div>
 
-    <alchemy-char-counter max-chars="160">
-      <%= f.input :meta_description, as: 'text' %>
-    </alchemy-char-counter>
+    <%= f.fields_for :draft_version, @page.draft_version do |v| %>
+      <alchemy-char-counter max-chars="160">
+        <%= v.input :meta_description, as: 'text', input_html: {
+          disabled: @page.attribute_fixed?(:meta_description)
+        } %>
+      </alchemy-char-counter>
 
-    <%= f.input :meta_keywords,
-      as: 'text',
-      hint: Alchemy.t('pages.update.comma_seperated') %>
+      <%= v.input :meta_keywords,
+        as: 'text',
+        hint: Alchemy.t('pages.update.comma_seperated'),
+        input_html: {
+          disabled: @page.attribute_fixed?(:meta_keywords)
+        } %>
+    <% end %>
 
     <%= render Alchemy::Admin::TagsAutocomplete.new do %>
       <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>

data/app/views/alchemy/admin/pages/_page_status.html.erb

@@ -1,5 +1,5 @@
 <span class="page_status">
-  <% if page.public? %>
+  <% if local_assigns[:published] || page.public? %>
     <%= render_icon(:cloud, size: "1x") %>
   <% else %>
     <%= render_icon("cloud-off", size: "1x", class: "disabled") %>