alchemy_cms 8.3.11 → 8.4.1

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

@@ -1,97 +1,102 @@
-<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded?, type: "node" } do %>
-  <%= content_tag :div, class: [
-    'sitemap_node',
-    node.external? ? 'external' : 'internal',
-    "sitemap_node-level_#{node.depth}"
-  ] do %>
-    <span class="nodes_tree-left_images">
-      &nbsp;
-    </span>
-    <div class="node_name">
-      <%= node.name || '&nbsp;'.html_safe %>
-      <span class="node_page">
-      <% if node.page %>
-        <%= render_icon "file-3" %>
-        <%= link_to [:edit, :admin, node.page], title: Alchemy.t(:edit_page) do %>
-          <%= node.page.name %>
-        <% end %>
-      <% end %>
+<alchemy-menu-node node-id="<%= node.id %>" <%= "folded" if node.folded? %>>
+  <%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id } do %>
+    <%= content_tag :div, class: [
+      'sitemap_node',
+      node.external? ? 'external' : 'internal',
+      "sitemap_node-level_#{node.depth}"
+    ] do %>
+      <span class="nodes_tree-left_images">
+        <alchemy-node-folder
+          <%= "folded" if node.folded? %>
+          <%= "hidden" unless node.children.any? || node.folded? %>
+        ></alchemy-node-folder>
       </span>
-      <% if node.url %>
-        <span class="node_url">
-          <%= link_to node.url, node.url, target: '_blank', title: node.url %>
-          <% if node.external? %>
-            <%= render_icon "external-link", size: "sm" %>
+      <div class="node_name">
+        <%= node.name || '&nbsp;'.html_safe %>
+        <span class="node_page">
+        <% if node.page %>
+          <%= render_icon "file-3" %>
+          <%= link_to [:edit, :admin, node.page], title: Alchemy.t(:edit_page) do %>
+            <%= node.page.name %>
           <% end %>
+        <% end %>
         </span>
-      <% end %>
-    </div>
-    <span class="nodes_tree-right_tools">
-      <% if can?(:edit, node) %>
-        <sl-tooltip content="<%= node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node) %>">
-          <%= link_to_dialog(
-            render_icon(:edit),
-            alchemy.edit_admin_node_path(node),
-            {
-              title: node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node),
-              size: node.root? ? '450x120' : '450x360'
-            },
-            class: "icon_button"
-          ) %>
-        </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>
+        <% if node.url %>
+          <span class="node_url">
+            <%= link_to node.url, node.url, target: '_blank', title: node.url %>
+            <% if node.external? %>
+              <%= render_icon "external-link", size: "sm" %>
+            <% end %>
+          </span>
+        <% end %>
       </div>
-      <% end %>
-      <% if can?(:destroy, node) %>
-        <sl-tooltip content="<%= node.root? ? Alchemy.t(:delete_menu) : Alchemy.t(:delete_node) %>">
-          <%= link_to_confirm_dialog(
-            render_icon("delete-bin-2"),
-            node.root? ? Alchemy.t(:confirm_to_delete_menu) : Alchemy.t(:confirm_to_delete_node),
-            url_for(
-              controller: 'nodes',
-              action: 'destroy',
-              id: node.id
-            ),
-            {
+      <span class="nodes_tree-right_tools">
+        <% if can?(:edit, node) %>
+          <sl-tooltip content="<%= node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node) %>">
+            <%= link_to_dialog(
+              render_icon(:edit),
+              alchemy.edit_admin_node_path(node),
+              {
+                title: node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node),
+                size: node.root? ? '450x120' : '450x360'
+              },
               class: "icon_button"
-            },
-          ) %>
-        </sl-tooltip>
-      <% end %>
-      <% if can?(:create, Alchemy::Node) %>
-        <sl-tooltip content="<%= Alchemy.t(:create_node) %>" placement="top-end">
-          <%= link_to_dialog(
-            render_icon(:add),
-            alchemy.new_admin_node_path(parent_id: node.id),
-            {
-              title: Alchemy.t(:create_node),
-              size: '450x360',
-              overflow: true
-            },
+            ) %>
+          </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>
-      <% end %>
-    </span>
-  <% end %>
-  <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { record_id: node.id } do %>
-    <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
+        <% 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(
+              render_icon("delete-bin-2"),
+              node.root? ? Alchemy.t(:confirm_to_delete_menu) : Alchemy.t(:confirm_to_delete_node),
+              url_for(
+                controller: 'nodes',
+                action: 'destroy',
+                id: node.id
+              ),
+              {
+                class: "icon_button"
+              },
+            ) %>
+          </sl-tooltip>
+        <% end %>
+        <% if can?(:create, Alchemy::Node) %>
+          <sl-tooltip content="<%= Alchemy.t(:create_node) %>" placement="top-end">
+            <%= link_to_dialog(
+              render_icon(:add),
+              alchemy.new_admin_node_path(parent_id: node.id),
+              {
+                title: Alchemy.t(:create_node),
+                size: '450x360',
+                overflow: true
+              },
+              class: "icon_button"
+            ) %>
+          </sl-tooltip>
+        <% end %>
+      </span>
+    <% end %>
+    <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { record_id: node.id } do %>
+      <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
+    <% end %>
   <% end %>
-<% end %>
+</alchemy-menu-node>

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

@@ -7,8 +7,9 @@
     <%= render 'alchemy/admin/partials/site_select' %>
     <%= render 'alchemy/admin/partials/language_tree_select' %>
     <%= render Alchemy::Admin::ToolbarButton.new(
-      icon: 'menu-add',
+      icon: 'add',
       label: Alchemy.t(:create_menu),
+      primary: true,
       url: alchemy.new_admin_node_path,
       hotkey: 'alt+n',
       tooltip_placement: "top-start",
@@ -17,36 +18,27 @@
         size: '450x120'
       },
       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">Node filter display</h1>
-  <% if @root_nodes.any? %>
+<h1 id="node_filter_result">Node filter display</h1>
+<% if @root_nodes.any? %>
+  <alchemy-node-tree>
     <% @root_nodes.each do |root_node| %>
       <ul class="nodes_tree list">
         <%= render 'node', node: root_node %>
       </ul>
     <% end %>
-  <% else %>
-    <div class="panel no-resource-found">
-      <%= render_message do %>
-        <%== Alchemy.t('alchemy/node', scope: :no_resource_found) %>
-      <% end %>
-      <%= render 'form', node: Alchemy::Node.new(
-          site: Alchemy::Current.site,
-          language: Alchemy::Current.language
-        ),
-        button_label: Alchemy.t(:create) %>
-    </div>
+  </alchemy-node-tree>
+<% else %>
+  <%= render "alchemy/admin/resources/empty_state" do %>
+    <%= render 'form', node: Alchemy::Node.new(
+        site: Alchemy::Current.site,
+        language: Alchemy::Current.language
+      ),
+      button_label: Alchemy.t(:create) %>
   <% end %>
-</div>
-
-<script type="module">
-  import { NodeTree } from "alchemy_admin/node_tree"
-
-  NodeTree()
-</script>
+<% end %>

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

@@ -1,8 +1,4 @@
-<div class="panel">
-  <%= render_message do %>
-    <p><%= Alchemy.t(:homepage_does_not_exist) %></p>
-  <% end %>
-
+<%= render "alchemy/admin/resources/empty_state" do %>
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
       <h3><%= Alchemy.t(:copy_language_tree_heading) %></h3>
@@ -37,4 +33,4 @@
     <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
     <%= form.submit Alchemy.t(:create), autofocus: true %>
   <% end %>
-</div>
+<% end %>

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

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag page do %>
-  <%= alchemy_form_for [:admin, page], class: 'edit_page', remote: false do |f| %>
+  <%= alchemy_form_for [:admin, page], class: 'edit_page' do |f| %>
     <% unless page.language_root? || page.layoutpage %>
       <%= render Alchemy::Admin::PageSelect.new(page.parent) do %>
         <%= f.input :parent_id, required: true %>
@@ -11,6 +11,7 @@
       <div class="control_group">
         <%= render 'alchemy/admin/pages/publication_fields', page: %>
         <%= page_status_checkbox(page, :restricted) %>
+        <%= render Alchemy::Admin::PagePermittedRolesSelect.new(page: page, form: f) %>
         <% if Alchemy.config.sitemap.show_flag %>
           <%= page_status_checkbox(page, :sitemap) %>
         <% end %>

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

@@ -1,2 +1,2 @@
 <%# Overwrite this partial if you want to add more fields to the page schedule form %>
-<%= render Alchemy::Admin::PagePublicationFields.new(page:) %>
+<%= render Alchemy.config.admin_components.page_publication_fields.new(page:) %>

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

@@ -33,7 +33,7 @@
   <% end %>
   <% table.column :updated_at, sortable: true %>
   <% table.column :status, class_name: :right do |page| %>
-    <%= render Alchemy::Admin::PageStatusIndicators.new(page:) %>
+    <%= render Alchemy.config.admin_components.page_status_indicators.new(page:) %>
   <% end %>
 
   <% table.with_action :info, Alchemy.t(:page_infos) do |page| %>
@@ -59,14 +59,12 @@
         ) -%>
   <% end %>
   <% table.with_action :copy, Alchemy.t(:copy_page) do |page| %>
-    <%= link_to(
+    <%= button_to(
           render_icon(:copy),
           alchemy.insert_admin_clipboard_path(
             remarkable_type: :pages,
             remarkable_id: page.id,
           ),
-          data: {turbo: true},
-          method: :post,
           class: "icon_button"
         ) %>
   <% end %>

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

@@ -2,9 +2,10 @@
   <%= render "alchemy/admin/partials/site_select" %>
   <%= render "alchemy/admin/partials/language_tree_select" %>
   <%= render Alchemy::Admin::ToolbarButton.new(
-    icon: "file-add",
+    icon: "add",
     url: alchemy.new_admin_page_path(language: @current_language),
     hotkey: 'alt+n',
+    primary: true,
     tooltip_placement: "top-start",
     dialog_options: {
       title: Alchemy.t('Add a page'),

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

@@ -5,13 +5,15 @@
 <% content_for(:toolbar) do %>
 <div class="toolbar_buttons">
   <div class="toolbar_button">
-    <sl-tooltip content="<%= Alchemy.t(:explain_unlocking) %>" placement="top-start">
-      <%= form_tag alchemy.unlock_admin_page_path(@page, redirect_to: @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), id: 'unlock_page_form' do %>
-        <button class="icon_button" data-alchemy-hotkey="alt+x">
-          <%= render_icon('expand-left') %>
-        </button>
-      <% end %>
-    </sl-tooltip>
+    <alchemy-dirty-guard>
+      <sl-tooltip content="<%= Alchemy.t(:explain_unlocking) %>" placement="top-start">
+        <%= form_tag alchemy.unlock_admin_page_path(@page, redirect_to: @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), id: 'unlock_page_form' do %>
+          <button class="icon_button" data-alchemy-hotkey="alt+x">
+            <%= render_icon('expand-left') %>
+          </button>
+        <% end %>
+      </sl-tooltip>
+    </alchemy-dirty-guard>
   </div>
   <div class="toolbar_spacer"></div>
   <div class="toolbar_button">
@@ -129,6 +131,7 @@
 
 <iframe
   url="<%= @preview_url %>"
+  load-timeout="<%= Alchemy.config.preview_load_timeout %>"
   id="alchemy_preview_window"
   name="alchemy_preview_window"
   is="alchemy-preview-window"
@@ -139,17 +142,3 @@
 <%= turbo_frame_tag "alchemy_elements_window", src: alchemy.admin_elements_path(page_version_id: @page_version.id, alchemy_preview_time: params[:alchemy_preview_time]) do %>
   <alchemy-spinner></alchemy-spinner>
 <% end %>
-
-<% content_for :javascripts do %>
-<script type="module">
-  $(document).one('turbo:load', function() {
-    $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
-      var not_dirty = Alchemy.checkPageDirtyness(this);
-      if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
-      return not_dirty;
-    });
-    Alchemy.PageLeaveObserver();
-  });
-
-</script>
-<% end %>

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

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

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

@@ -2,40 +2,35 @@
   <%= render "alchemy/admin/pages/toolbar" %>
 <% end %>
 
-<%= content_tag :div,
-  id: "archive_all",
-  class: [@view == "list" && "resources-table-wrapper with_tag_filter"] do %>
-  <% if @view == "list" %>
-    <%= render "alchemy/admin/resources/table_header", resources_instance_variable: @pages %>
-    <% if @pages.any? %>
-      <%= render "table" %>
-    <% elsif search_filter_params.present? %>
-      <%= render_message do %>
-        <%= Alchemy.t("No pages found") %>
-      <% end %>
-    <% elsif can?(:create, Alchemy::Page) %>
-      <%= render partial: "create_language_form" %>
-    <% end %>
+<% if @view == "list" && @current_language.root_page %>
+  <%= render "alchemy/admin/resources/table_header", resources_instance_variable: @pages %>
 
-    <%= render "alchemy/admin/resources/pagination", resources: @pages %>
-
-    <div id="library_sidebar">
-      <%= render "filter_bar" if resource_has_filters %>
-      <%= render "tag_list" if resource_has_tags %>
+  <% if @pages.any? %>
+    <div class="resources-table-wrapper">
+      <%= render "table" %>
     </div>
   <% else %>
-    <% 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 %>
-      <%= render_message :warn do %>
-        <h2>No language root page found.</h2>
-        <p>Please ask the admin to create one.</p>
-      <% end %>
+    <%= render_message do %>
+      <%= Alchemy.t("No pages found") %>
     <% end %>
   <% end %>
+
+  <%= render "alchemy/admin/resources/pagination", resources: @pages %>
+
+  <div id="library_sidebar">
+    <%= render "filter_bar" if resource_has_filters %>
+    <%= render "tag_list" if resource_has_tags %>
+  </div>
+<% elsif @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 %>
+  <%= render_message :warn do %>
+    <h2>No language root page found.</h2>
+    <p>Please ask the admin to create one.</p>
+  <% end %>
 <% end %>

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

@@ -53,10 +53,10 @@
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_was_created) %></label>
-    <p><%= Alchemy.t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :'alchemy.page_status')} %></p>
+    <p><%= Alchemy.t(:from_at) % {by: @page.creator_name, at: Alchemy.l(@page.created_at, format: :'alchemy.page_status')} %></p>
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_was_updated) %></label>
-    <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :'alchemy.page_status')} %></p>
+    <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: Alchemy.l(@page.updated_at, format: :'alchemy.page_status')} %></p>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <alchemy-growl><%= @notice %></alchemy-growl>
-<alchemy-action name="closeCurrentDialog"></alchemy-action>
+<turbo-stream action="close_current_dialog"></turbo-stream>
 
 <% if @while_page_edit -%>
   <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
@@ -8,7 +8,7 @@
   <%= turbo_stream.replace "publish_page_button" do %>
     <%= render Alchemy::Admin::PublishPageButton.new(page: @page) %>
   <% end %>
-  <alchemy-action name="reloadPreview"></alchemy-action>
+  <turbo-stream action="reload_preview"></turbo-stream>
 <% else %>
   <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
     <%= render("alchemy/admin/pages/locked_page", locked_page: @page) %>

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

@@ -2,7 +2,7 @@
 <% if can?(:switch_language, Alchemy::Page) && languages.many? %>
 <div class="toolbar_button">
   <sl-tooltip content="<%= Alchemy.t("Language tree") %>">
-    <%= form_tag switch_admin_languages_path, method: 'get' do %>
+    <%= form_tag switch_admin_languages_path do %>
       <alchemy-auto-submit>
         <%= select_tag(
           :language_id,

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

@@ -1,48 +1,24 @@
-<script>
-  Alchemy.routes = {
-
-    admin_picture_path: function(id) {
-      return '<%= alchemy.admin_picture_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    url_admin_picture_path: function(id) {
-      return '<%= alchemy.url_admin_picture_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    collapse_admin_element_path: function(id) {
-      return '<%= alchemy.collapse_admin_element_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    expand_admin_element_path: function(id) {
-      return '<%= alchemy.expand_admin_element_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    publish_admin_element_path: function(id) {
-      return '<%= alchemy.publish_admin_element_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    node: {
-      toggle_folded_api_path: function(id) {
-        return '<%= alchemy.toggle_folded_api_node_path(id: 1) %>'.replace(/1/, id);
-      },
-
-      move_api_path: function(id) {
-        return '<%= alchemy.move_api_node_path(id: 1) %>'.replace(/1/, id);
-      },
-    },
-
-    move_admin_page_path: function(id) {
-      return '<%= alchemy.move_api_page_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    fold_admin_page_path: function(id) {
-      return '<%= alchemy.fold_admin_page_path(id: 1) %>'.replace(/1/, id);
-    },
-
-    order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
-    link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',
-    api_pages_path: '<%= alchemy.api_pages_path %>',
-    api_elements_path: '<%= alchemy.api_elements_path %>',
-    api_ingredients_path: '<%= alchemy.api_ingredients_path %>'
-  };
-</script>
+<%= tag.script(type: "application/json", id: "alchemy_routes") do %>
+  <%== {
+    collection: {
+      order_admin_elements_path: alchemy.order_admin_elements_path,
+      link_admin_pages_path: alchemy.link_admin_pages_path,
+      api_pages_path: alchemy.api_pages_path,
+      api_elements_path: alchemy.api_elements_path,
+      api_ingredients_path: alchemy.api_ingredients_path
+    },
+    member: {
+      admin_picture_path: alchemy.admin_picture_path(id: 1),
+      url_admin_picture_path: alchemy.url_admin_picture_path(id: 1),
+      collapse_admin_element_path: alchemy.collapse_admin_element_path(id: 1),
+      expand_admin_element_path: alchemy.expand_admin_element_path(id: 1),
+      publish_admin_element_path: alchemy.publish_admin_element_path(id: 1),
+      move_admin_page_path: alchemy.move_api_page_path(id: 1),
+      fold_admin_page_path: alchemy.fold_admin_page_path(id: 1),
+      node: {
+        toggle_folded_api_path: alchemy.toggle_folded_api_node_path(id: 1),
+        move_api_path: alchemy.move_api_node_path(id: 1)
+      }
+    }
+  }.to_json %>
+<% end %>

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

@@ -1,5 +1,3 @@
-<%= render "library_sidebar" %>
-
 <% forwarded_params = search_filter_params.merge(
   page: params[:page],
   size: @size.presence
@@ -25,19 +23,7 @@
       class: 'secondary button with_icon'
     ) %>
   </div>
-  <% if @pictures.blank? && @recent_pictures.blank? && search_filter_params[:q].blank? %>
-    <%= render_message do %>
-      <%= Alchemy.t(:no_images_in_archive) %>
-    <% end %>
-  <% elsif @pictures.blank? && @recent_pictures.blank? %>
-    <%= render_message do %>
-      <%= Alchemy.t(:no_search_results) %>
-    <% end %>
-  <% else %>
-    <div id="pictures" class="picture-size--<%= @size %>">
-      <%= render partial: "picture", collection: @pictures, locals: {picture_offset: picture_offset} %>
-    </div>
-  <% end %>
+  <div id="pictures" class="picture-size--<%= @size %>">
+    <%= render partial: "picture", collection: @pictures, locals: {picture_offset: picture_offset} %>
+  </div>
 <% end %>
-
-<%= render "alchemy/admin/resources/pagination", resources: @pictures %>

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

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag "archive_overlay" do %>
-  <div id="overlay_toolbar">
+  <div class="toolbar">
     <%= render 'filter_and_size_bar' %>
     <%= render 'alchemy/admin/partials/overlay_search_form' %>
   </div>

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

@@ -1,16 +1,18 @@
 <div class="toolbar_buttons">
   <% if can? :create, Alchemy::Picture %>
     <div class="toolbar_button">
-      <%= render 'alchemy/admin/uploader/button',
+      <%= render Alchemy::Admin::UploaderButton.new(
         object: Alchemy::Picture.new,
         dropzone: '#assign_image_list',
+        inline_label: true,
         file_attribute: 'image_file',
-        in_dialog: true,
+        layout: 'card',
         redirect_url: alchemy.admin_pictures_path(
           size: search_filter_params[:size],
           q: { last_upload: true },
           form_field_id: @form_field_id
-        ) %>
+        )
+      ) %>
     </div>
     <div class="toolbar_spacer"></div>
   <% end %>

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

@@ -7,7 +7,6 @@
         picture_index: picture_index
       ).to_h
     ),
-    remote: false,
     class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>