alchemy_cms 8.0.11 → 8.1.0

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") %>

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

@@ -1,30 +1,32 @@
-<% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil, disabled: @page.attribute_fixed?(:public_on) %>
+<alchemy-page-publication-fields>
+  <% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil, disabled: @page.attribute_fixed?(:public_on) %>
 
-<label class="checkbox">
-<% if @page.attribute_fixed?(:public_on) || @page.attribute_fixed?(:public_until) %>
-  <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t(:attribute_fixed) %>" placement="bottom-start">
+  <label class="checkbox">
+  <% if @page.attribute_fixed?(:public_on) || @page.attribute_fixed?(:public_until) %>
+    <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t(:attribute_fixed) %>" placement="bottom-start">
+      <%= checkbox %>
+      <%= Alchemy::Page.human_attribute_name :public %>
+    </sl-tooltip>
+  <% else %>
     <%= checkbox %>
     <%= Alchemy::Page.human_attribute_name :public %>
-  </sl-tooltip>
-<% else %>
-  <%= checkbox %>
-  <%= Alchemy::Page.human_attribute_name :public %>
-<% end %>
-</label>
+  <% end %>
+  </label>
 
-<%= content_tag :div, class: [
-  @page.public_on.present? || @page.public_until.present? ? nil : 'hidden',
-  'page-publication-date-fields',
-  'input-row'
-] do %>
-  <div class="input-column">
-    <label><%= Alchemy.t(:from) %></label>
-    <%= alchemy_datepicker @page, :public_on, type: :datetime,
-      disabled: @page.attribute_fixed?(:public_on) %>
-  </div>
-  <div class="input-column">
-    <label><%= Alchemy.t(:until) %></label>
-    <%= alchemy_datepicker @page, :public_until, type: :datetime,
-      disabled: @page.attribute_fixed?(:public_until) %>
-  </div>
-<% end %>
+  <%= content_tag :div, class: [
+    @page.public_on.present? || @page.public_until.present? ? nil : 'hidden',
+    'page-publication-date-fields',
+    'input-row'
+  ] do %>
+    <div class="input-column">
+      <label><%= Alchemy.t(:from) %></label>
+      <%= alchemy_datepicker @page, :public_on, type: :datetime,
+        disabled: @page.attribute_fixed?(:public_on) %>
+    </div>
+    <div class="input-column">
+      <label><%= Alchemy.t(:until) %></label>
+      <%= alchemy_datepicker @page, :public_until, type: :datetime,
+        disabled: @page.attribute_fixed?(:public_until) %>
+    </div>
+  <% end %>
+</alchemy-page-publication-fields>

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

@@ -89,10 +89,3 @@
   <% end %>
   <% table.delete_button tooltip: Alchemy.t(:delete_page), confirm_message: Alchemy.t(:confirm_to_delete_page) %>
 <% end %>
-
-
-<script type="module">
-  $(function() {
-    Alchemy.PagePublicationFields();
-  });
-</script>

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

@@ -18,14 +18,11 @@
   <% if can?(:flush, Alchemy::Page) %>
     <div class="toolbar_button">
       <sl-tooltip content="<%= Alchemy.t("Flush page cache") %>">
-        <%= link_to(
+        <%= button_to(
           render_icon(:eraser),
           alchemy.flush_admin_pages_path,
-          remote: true,
-          method: :post,
-          class: "icon_button",
-          title: Alchemy.t("Flush page cache"),
-          "data-turbo-confirm": Alchemy.t(:confirm_to_flush_cache)
+          "turbo-method": :post,
+          class: "icon_button please_wait"
         ) %>
       </sl-tooltip>
     </div>

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

@@ -57,15 +57,6 @@
       <% end %>
     </sl-tooltip>
   </div>
-  <div class="toolbar_button">
-    <%= content_tag "sl-tooltip", content: @page.language.public? ? Alchemy.t(:explain_publishing) : @page.editable_by?(current_alchemy_user) ? Alchemy.t(:publish_page_language_not_public) : Alchemy.t(:publish_page_not_allowed) do %>
-      <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
-        <%= button_tag class: 'icon_button please_wait', disabled: cannot?(:publish, @page) do %>
-          <%= render_icon('upload-cloud-2') %>
-        <% end %>
-      <% end %>
-    <% end %>
-  </div>
   <% unless @page.layoutpage? %>
     <div class="toolbar_button">
       <% if @page.public? %>
@@ -117,7 +108,10 @@
     </sl-tooltip>
   </div>
 </div>
+
 <div class="toolbar_buttons right">
+  <%= render Alchemy::Admin::PublishPageButton.new(page: @page) %>
+  <div class="toolbar_spacer"></div>
   <div class="toolbar_button">
     <sl-tooltip content="<%= Alchemy.t(:hide_elements) %>">
       <%= link_to render_icon("menu-unfold"), nil, {
@@ -134,7 +128,8 @@
   id="alchemy_preview_window"
   name="alchemy_preview_window"
   is="alchemy-preview-window"
-  frameborder="0">
+  frameborder="0"
+  title="<%= Alchemy.t("Page preview") %>">
 </iframe>
 
 <%= turbo_frame_tag "alchemy_elements_window", src: alchemy.admin_elements_path(page_version_id: @page_version.id) do %>
@@ -149,7 +144,6 @@
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
       return not_dirty;
     });
-    Alchemy.PagePublicationFields();
     Alchemy.PageLeaveObserver();
   });
 

data/app/views/alchemy/admin/pages/flush.turbo_stream.erb

@@ -0,0 +1,2 @@
+<alchemy-growl><%= Alchemy.t("Page cache flushed") -%></alchemy-growl>
+<alchemy-action name="hidePleaseWaitOverlay"></alchemy-action>

data/app/views/alchemy/admin/pages/fold.turbo_stream.erb

@@ -0,0 +1,5 @@
+<%= turbo_stream.replace "page_#{@page.id}_children" do %>
+  <ul id="page_<%= @page.id %>_children" class="children" data-parent-id="<%= @page.id %>">
+    <%= render Alchemy::Admin::PageNode.with_collection(@page.children) %>
+  </ul>
+<% end %>

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

@@ -24,9 +24,11 @@
       <%= render "tag_list" if resource_has_tags %>
     </div>
   <% else %>
-    <% if @page_root %>
-      <h2 id="page_filter_result"></h2>
-      <%= render "sitemap", page_partial: "page" %>
+    <% if @root_page %>
+      <h2 id="page_filter_result">Page filter display</h2>
+      <%= turbo_frame_tag "alchemy_pages_tree", src: alchemy.tree_admin_pages_path do %>
+        <alchemy-spinner></alchemy-spinner>
+      <% end %>
     <% elsif can?(:create, Alchemy::Page) %>
       <%= render partial: "create_language_form" %>
     <% else %>

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

@@ -1,4 +1,4 @@
-<%- if @clipboard_items.blank? -%>
+<%- if clipboard_items.blank? -%>
   <%= render 'new_page_form' %>
 <%- else -%>
 <sl-tab-group id="overlay_tabs">
@@ -8,17 +8,7 @@
     <%= render 'new_page_form' %>
   </sl-tab-panel>
   <sl-tab-panel name="paste_page_tab">
-    <%= alchemy_form_for [:admin, @page] do |f| %>
-      <%= f.hidden_field(:parent_id) %>
-      <div class="input select">
-        <label for="paste_from_clipboard" class="control-label"><%= Alchemy::Page.model_name.human %></label>
-        <%= select_tag 'paste_from_clipboard',
-          clipboard_select_tag_options(@clipboard_items),
-          is: 'alchemy-select' %>
-      </div>
-      <%= f.input :name %>
-      <%= f.submit Alchemy.t(:paste) %>
-    <% end %>
+    <%= render 'alchemy/admin/partials/paste_from_clipboard_form', item: @page %>
   </sl-tab-panel>
 </sl-tab-group>
 <%- end -%>

data/app/views/alchemy/admin/pages/publish.turbo_stream.erb

@@ -0,0 +1,12 @@
+<alchemy-growl>
+  <%= Alchemy.t(:page_published, name: @page.name) %>
+</alchemy-growl>
+<%= turbo_stream.replace "locked_page_#{@page.id}",
+  partial: "alchemy/admin/pages/current_page",
+  locals: {current_page: @page, published: true } %>
+<%= turbo_stream.replace "publish_page_button" do %>
+  <%= render Alchemy::Admin::PublishPageButton.new(
+    page: @page,
+    published: true
+  ) %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<%= turbo_frame_tag "alchemy_pages_tree" do %>
+  <h4 id="sitemap_heading">
+    <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+    <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
+    <span class="page_status"><%= Alchemy.t(:page_status) %></span>
+  </h4>
+
+  <alchemy-sitemap>
+    <ul id="sitemap" class="list">
+      <%= render Alchemy::Admin::PageNode.new(page: @root_page) %>
+    </ul>
+  </alchemy-sitemap>
+<% end %>

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

@@ -1,10 +1,13 @@
-<alchemy-growl><%= @notice %></alchemy-action>
+<alchemy-growl><%= @notice %></alchemy-growl>
 <alchemy-action name="closeCurrentDialog"></alchemy-action>
 
 <% if @while_page_edit -%>
   <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
     <%= render("alchemy/admin/pages/current_page", current_page: @page) %>
   <% end %>
+  <%= turbo_stream.replace "publish_page_button" do %>
+    <%= render Alchemy::Admin::PublishPageButton.new(page: @page) %>
+  <% end %>
   <alchemy-action name="reloadPreview"></alchemy-action>
 <% else %>
   <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
@@ -13,27 +16,13 @@
 
   <% if @view == "list" %>
     <turbo-stream action="refresh"></turbo-stream>
-  <% elsif @page.parent_id != @old_parent_id -%>
-    <%= turbo_stream.append "sitemap" do %>
-      <script type="module">
-        Alchemy.currentSitemap.load(<%= @page.get_language_root.id %>);
-      </script>
-    <% end %>
   <% else -%>
     <% if @page.layoutpage %>
       <%= turbo_stream.replace "page_#{@page.id}" do %>
         <%= render("alchemy/admin/layoutpages/layoutpage", layoutpage: @page) %>
       <% end %>
     <% else %>
-      <%= turbo_stream.append "sitemap" do %>
-        <script type="module">
-          const page = document.getElementById('page_<%= @page.id %>');
-          const page_html = "<%= j render('page', page: @page) %>".replace(/__ID__/g, "<%= @page.id %>");
-          const compiler = Handlebars.compile(page_html);
-          const tree = <%== @tree.to_json %>;
-          page.outerHTML = compiler(tree.pages[0]);
-        </script>
-      <% end %>
+      <turbo-stream action="refresh"></turbo-stream>
     <% end %>
   <% end -%>
 <% end %>

data/app/views/alchemy/admin/partials/_flash_notices.html.erb

@@ -1,4 +1,4 @@
-<div id="flash_notices">
+<div id="flash_notices" data-auto-dismiss-delay="5000">
 <% flash.keys.each do |flash_type| %>
   <% if flash[flash_type.to_sym].present? %>
     <%= render Alchemy::Admin::Message.new(flash[flash_type.to_sym], type: flash_type, dismissable: true) %>

data/app/views/alchemy/admin/partials/{_remote_search_form.html.erb → _overlay_search_form.html.erb}

@@ -6,7 +6,7 @@
   size: @size
 )) -%>
 
-<%= search_form_for @query, url: url_for(action: 'index', size: @size), remote: true, html: {class: 'search_form', id: "resource_search"} do |f| %>
+<%= search_form_for @query, url: url_for(action: 'index', size: @size), html: {class: 'search_form', id: "resource_search"} do |f| %>
   <%= hidden_field_tag :form_field_id, @form_field_id %>
   <% Array(params[:only]).each do |only| %>
     <%= hidden_field_tag("only[]", only, form: "resource_search", id: nil) %>
@@ -23,7 +23,6 @@
       class: 'search_input_field',
       id: nil %>
     <%= link_to render_icon(:times, size: '1x'), clear_url,
-      remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
       style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'visibility: visible' : 'visibility: hidden' %>

data/app/views/alchemy/admin/partials/_paste_from_clipboard_form.html.erb

@@ -0,0 +1,12 @@
+<%= alchemy_form_for [:admin, item] do |f| %>
+  <%= f.hidden_field(:parent_id) %>
+  <%= f.hidden_field(:language_id) %>
+  <div class="input select">
+    <label for="paste_from_clipboard" class="control-label"><%= item.class.model_name.human %></label>
+    <%= select_tag 'paste_from_clipboard',
+      clipboard_select_tag_options(clipboard_items),
+      is: 'alchemy-select' %>
+  </div>
+  <%= f.input :name %>
+  <%= f.submit Alchemy.t(:paste) %>
+<% end %>

data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb

@@ -1,23 +1,26 @@
-<div id="overlay_toolbar">
-  <%= render 'filter_and_size_bar' %>
-</div>
-<div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
-  <%= render "library_sidebar" %>
-  <% if @pictures.empty? %>
-    <%= render_message do %>
-      <% if search_filter_params.empty? %>
-        <%= Alchemy.t(:no_images_in_archive) %>
-      <% else %>
-        <%= Alchemy.t(:no_search_results) %>
+<%= turbo_frame_tag "archive_overlay" do %>
+  <div id="overlay_toolbar">
+    <%= render 'filter_and_size_bar' %>
+    <%= render 'alchemy/admin/partials/overlay_search_form' %>
+  </div>
+  <div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
+    <%= render "library_sidebar" %>
+    <% if @pictures.empty? %>
+      <%= render_message do %>
+        <% if search_filter_params.empty? %>
+          <%= Alchemy.t(:no_images_in_archive) %>
+        <% else %>
+          <%= Alchemy.t(:no_search_results) %>
+        <% end %>
       <% end %>
-    <% end %>
-  <% else %>
-    <div id="overlay_picture_list" class="picture-size--<%= @size %>">
-      <%= render partial: 'picture_to_assign',
-        collection: @pictures,
-        locals: {size: @size} %>
+    <% else %>
+      <div id="overlay_picture_list" class="picture-size--<%= @size %>">
+        <%= render partial: 'picture_to_assign',
+          collection: @pictures,
+          locals: {size: @size} %>
 
-      <%= render "alchemy/admin/resources/pagination", resources: @pictures, remote: true, hide_per_page_select: true %>
-    </div>
-  <% end %>
-</div>
+        <%= render "alchemy/admin/resources/pagination", resources: @pictures, hide_per_page_select: true %>
+      </div>
+    <% end %>
+  </div>
+<% end %>