alchemy_cms 7.4.6 → 8.0.0.a

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

@@ -49,7 +49,7 @@
     <% table.with_action(:download) do |attachment| %>
       <sl-tooltip content="<%= Alchemy.t("download_file", filename: attachment.file_name) %>">
         <%= link_to render_icon(:download),
-          alchemy.download_admin_attachment_path(attachment),
+          alchemy.download_attachment_path(attachment),
           target: "_blank",
           class: "icon_button" %>
       </sl-tooltip>
@@ -82,5 +82,5 @@
     <% end %>
   <% end %>
 
-  <%= paginate @attachments, theme: 'alchemy' %>
+  <%= render "alchemy/admin/resources/pagination", resources: @attachments %>
 <% end %>

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

@@ -18,5 +18,5 @@
     </li>
     <%= render partial: 'file_to_assign', collection: @attachments %>
   </ul>
-  <%= paginate @attachments, theme: 'alchemy', remote: true, hide_per_page_select: true %>
+  <%= render "alchemy/admin/resources/pagination", resources: @attachments, remote: true, hide_per_page_select: true %>
 <% end %>

data/app/views/alchemy/admin/{elements/_clipboard_button.html.erb → clipboard/_button.html.erb}

@@ -1,14 +1,12 @@
 <%= render Alchemy::Admin::ToolbarButton.new(
-  url: alchemy.admin_clipboard_path(remarkable_type: "elements"),
+  url: alchemy.admin_clipboard_path(remarkable_type: remarkable_type),
   label: Alchemy.t("Show clipboard"),
   icon: :clipboard,
-  icon_style: clipboard_empty?("elements") ? "line" : "fill",
+  icon_style: clipboard_empty?(remarkable_type) ? "line" : "fill",
   dialog_options: {
     title: Alchemy.t("Clipboard"),
     size: "400x305"
   },
-  link_options: {
-    id: "clipboard_button"
-  },
+  id: "clipboard_button",
   if_permitted_to: [:index, :alchemy_admin_clipboard]
 ) %>

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

@@ -0,0 +1,11 @@
+<%# Update add nested element forms for any elements that accept ONLY this as a nested element %>
+<% if @item.class == Alchemy::Element %>
+  <%
+    @item.page.draft_version.elements.expanded.select do |element|
+      element.nestable_elements == [@item.name]
+    end.each do |element|
+  %>
+    <%= turbo_stream.replace_all ".add-nested-element[data-element-id='#{element.id}']",
+      partial: "alchemy/admin/elements/add_nested_element_form", locals: {element: element} %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,4 @@
+<%= turbo_stream.replace "clipboard_button", partial: "button" %>
+<%= turbo_stream.update "clipboard_items",
+  Alchemy::Admin::Message.new(Alchemy.t('No items in your clipboard')).render_in(self) %>
+<%= render "update_nested_element_button" %>

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

@@ -1,13 +1,13 @@
-<% 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') %>
-  <% end %>
+<%= turbo_frame_tag :clipboard_items do %>
+  <% 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') %>
+    <% end %>
 
-  <div id="clipboard_items">
     <ul>
       <% @clipboard_items.each do |item| %>
         <% item_class = item.class.name.demodulize.underscore.pluralize %>
@@ -22,18 +22,20 @@
           <sl-tooltip content="<%= Alchemy.t('Remove item from clipboard') %>">
             <%= link_to render_icon(:close, size: '1x'),
               alchemy.remove_admin_clipboard_path(remarkable_type: item_class, remarkable_id: item.id),
-              remote: true, method: 'delete',
+              "data-turbo-method": :delete,
               class: "icon_button small"
             %>
           </sl-tooltip>
         </li>
       <% end %>
     </ul>
+
     <p>
-      <%= link_to_confirm_dialog Alchemy.t('clear clipboard'),
-        Alchemy.t('Do you really want to clear the clipboard?'),
+      <%= link_to Alchemy.t('clear clipboard'),
         alchemy.clear_admin_clipboard_path(remarkable_type: params[:remarkable_type]),
+        "data-turbo-confirm": Alchemy.t('Do you really want to clear the clipboard?'),
+        "data-turbo-method": :delete,
         class: 'button' %>
     </p>
-  </div>
+  <% end %>
 <% end %>

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

@@ -0,0 +1,18 @@
+<% if @item.class.name == 'Alchemy::Element' && params[:remove] -%>
+  <% if @item.fixed? -%>
+    <alchemy-action name="removeFixedElement" params="[<%= @item.id %>]" />
+  <% else -%>
+    <%= turbo_stream.remove "element_#{@item.id}" %>
+  <% end -%>
+  <alchemy-growl>
+    <%= Alchemy.t("item moved to clipboard", name: @item.display_name_with_preview_text) %>
+  </alchemy-growl>
+<% else -%>
+  <alchemy-growl>
+    <%= Alchemy.t("item copied to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>
+  </alchemy-growl>
+<% end -%>
+
+<%= turbo_stream.replace "clipboard_button", partial: "button" %>
+
+<%= render "update_nested_element_button" %>

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

@@ -0,0 +1,9 @@
+<% if @clipboard.blank? %>
+  <%= render template: "alchemy/admin/clipboard/clear" %>
+<% else %>
+  <%= turbo_stream.remove "clipboard_item_#{@item.id}" %>
+  <%= render "update_nested_element_button" %>
+  <alchemy-growl>
+    <%= Alchemy.t("item removed from clipboard", name: @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) %>
+  </alchemy-growl>
+<% end %>

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

@@ -7,38 +7,24 @@
     Ruby v<%= RUBY_VERSION %>, Rails v<%= Rails.version %>
   </small>
 </h2>
-<% if can? :update_check, :alchemy_admin_dashboard %>
-<p class="center" id="update_check">
-  <span id="update_available" class="hidden">
-    <%= render_icon(:exclamation) %>
-    <%= Alchemy.t 'Update available' %>
-  </span>
-  <span id="up_to_date" class="hidden">
-    <%= render_icon(:check) %>
-    <%= Alchemy.t 'Alchemy is up to date' %>
-  </span>
-  <span id="error" class="hidden">
-    <%= render_icon(:exclamation) %>
-    <%= Alchemy.t 'Update status unavailable' %>
-  </span>
-</p>
-<script type="module">
-  var el = $('#update_check');
-  var spinner = new Alchemy.Spinner('small')
-  spinner.spin(el[0])
-  $.get('<%= alchemy.update_check_path %>', function(data, textStatus, jqXHR) {
-    if (data == 'true') {
-      $('#update_available').removeClass("hidden")
-    } else {
-      $('#up_to_date').removeClass("hidden")
-    }
-  }).fail(function(jqXHR, textStatus, errorThrown) {
-    $('#error').removeClass("hidden")
-  }).always(function() {
-    spinner.stop()
-  })
-</script>
+
+<% if can?(:update_check, :alchemy_admin_dashboard) %>
+  <alchemy-update-check url="<%= alchemy.update_check_path %>">
+    <span class="update_available hidden">
+      <%= render_icon(:exclamation) %>
+      <%= Alchemy.t('Update available') %>
+    </span>
+    <span class="up_to_date hidden">
+      <%= render_icon(:check) %>
+      <%= Alchemy.t('Alchemy is up to date') %>
+    </span>
+    <span class="error hidden">
+      <%= render_icon(:exclamation) %>
+      <%= Alchemy.t('Update status unavailable') %>
+    </span>
+  </alchemy-update-check>
 <% end %>
+
 <%= render_message do %>
   <p><%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %></p>
   <ul>

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

@@ -13,15 +13,11 @@
 
   <%= render 'alchemy/admin/elements/toolbar', element: element %>
 
-  <% if element.has_hint? %>
-    <%= render_message(:hint, sanitize(element.hint)) %>
-  <% end %>
-
-  <% element.definition[:message].tap do |message| %>
+  <% element.definition.message.tap do |message| %>
     <%= render_message(:info, sanitize(message)) if message %>
   <% end %>
 
-  <% element.definition[:warning].tap do |warning| %>
+  <% element.definition.warning.tap do |warning| %>
     <%= render_message(:warning, sanitize(warning)) if warning %>
   <% end %>
 
@@ -37,10 +33,10 @@
       <!-- Ingredients -->
       <% if element.has_ingredients_defined? %>
         <div class="element-ingredient-editors">
-          <%= render element.ingredients.select { |i| !i.definition[:group] }, element_form: f %>
+          <%= render element.ingredients.select { !_1.definition.group }, element_form: f %>
 
           <!-- Each ingredient group -->
-          <% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
+          <% element.ingredients.select { _1.definition.group }.group_by { _1.definition.group }.each do |group, ingredients| %>
             <%= content_tag :details, class: "ingredient-group", id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", is: "alchemy-ingredient-group" do %>
               <summary>
                 <%= element.translated_group group %>

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

@@ -13,7 +13,7 @@
         selected: (@elements.first if @elements.count == 1),
         input_html: {is: 'alchemy-select', autofocus: true} %>
       <% if @elements.count == 1 %>
-        <%= form.hidden_field :name, value: @elements.first[:name] %>
+        <%= form.hidden_field :name, value: @elements.first.name %>
       <% end %>
       <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
       <%= form.submit Alchemy.t(:add) %>

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

@@ -10,6 +10,7 @@
   </span>
   <span class="element-title">
     <span class="preview_text_element_name"><%= element.display_name %></span>
+    <%= render_hint_for(element, size: "1x", fixed_width: false) %>
     <span class="preview_text_quote">
       <%= sanitize(element.preview_text.presence || '&nbsp;') %>
     </span>

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

@@ -1,20 +1,18 @@
 <% remarkable_type = "elements" %>
 <div class="element-toolbar">
   <sl-tooltip placement="top-start" content="<%= Alchemy.t(:copy_element) %>">
-    <%= link_to(
+    <%= button_to(
       render_icon("file-copy"),
       alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id),
-      remote: true,
-      method: :post,
+      "data-turbo-method": :post,
       class: "icon_button"
     ) %>
   </sl-tooltip>
   <sl-tooltip content="<%= Alchemy.t(:cut_element) %>">
-    <%= link_to(
+    <%= button_to(
       render_icon("scissors-cut"),
       alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id, remove: true),
-      remote: true,
-      method: :post,
+      "data-turbo-method": :post,
       class: "icon_button"
     ) %>
   </sl-tooltip>

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

@@ -25,7 +25,8 @@
 <% end %>
 
 <%= turbo_stream.replace "clipboard_button",
-  partial: "alchemy/admin/elements/clipboard_button" %>
+  partial: "alchemy/admin/clipboard/button",
+  locals: {remarkable_type: "elements"} %>
 
 <alchemy-growl>
   <%= Alchemy.t(:successfully_added_element) %>

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

@@ -13,14 +13,14 @@
         },
         if_permitted_to: [:create, Alchemy::Element]
       ) %>
-      <%= render "alchemy/admin/elements/clipboard_button" %>
+      <%= 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>
     </div>
-    <% if @page.element_definitions.any? { |el| el["fixed"] } %>
+    <% if @page.element_definitions.any?(&:fixed) %>
       <sl-tab-group id="fixed-elements">
         <sl-tab slot="nav" panel="main-content-elements">
           <%= Alchemy.t(:main_content) %>

data/app/views/alchemy/admin/ingredients/_file_fields.html.erb

@@ -1,18 +1,5 @@
-<% css_classes = ingredient.settings[:css_classes] %>
-
 <%= f.input :link_text %>
 <%= f.input :title %>
-<%- if css_classes.present? -%>
-  <%= f.input :css_class,
-    collection: css_classes,
-    include_blank: Alchemy.t('None') %>
-<%- else -%>
-  <% Alchemy::Deprecation.warn %(Float positioning in File ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %>
-  <%= f.input :css_class,
-    label: Alchemy.t(:position_in_text),
-    collection: [
-      [Alchemy.t(:above), "no_float"],
-      [Alchemy.t(:left), "left"],
-      [Alchemy.t(:right), "right"]
-    ], include_blank: Alchemy.t('Layout default') %>
-<%- end -%>
+<%= f.input :css_class,
+  collection: ingredient.settings[:css_classes],
+  include_blank: Alchemy.t('None') %>

data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb

@@ -19,13 +19,4 @@
       end
     end %>
   <%= f.input :css_class, collection: css_classes_collection, include_blank: false %>
-<%- else -%>
-  <% Alchemy::Deprecation.warn %(Float positioning in Picture ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %>
-  <%= f.input :css_class,
-    label: Alchemy.t(:position_in_text),
-    collection: [
-      [Alchemy.t(:above), "no_float"],
-      [Alchemy.t(:left), "left"],
-      [Alchemy.t(:right), "right"]
-    ], include_blank: Alchemy.t("Layout default") %>
 <%- end -%>

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

@@ -12,7 +12,7 @@
   <% end %>
   <%= f.input :frontpage_name %>
   <%= f.input :page_layout,
-    collection: Alchemy::PageLayout.all,
+    collection: Alchemy::PageDefinition.all,
     label_method: ->(p) { Alchemy::Page.human_layout_name(p['name']) },
     value_method: ->(p) { p['name'] },
     input_html: {is: 'alchemy-select'} %>

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

@@ -15,4 +15,4 @@
   <% table.edit_button tooltip: Alchemy.t(:edit_language), dialog_size: "430x415" %>
 <% end %>
 
-<%= paginate @languages, theme: 'alchemy' %>
+<%= render "alchemy/admin/resources/pagination", resources: @languages %>

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

@@ -31,12 +31,15 @@
         <%== Alchemy.t('alchemy/language', scope: :no_resource_found) %>
       <% end %>
       <%= render 'form', language: Alchemy::Language.new(
-        Alchemy::Config.get(:default_language).merge(
+          name: Alchemy.config.default_language.name,
+          code: Alchemy.config.default_language.code,
+          page_layout: Alchemy.config.default_language.page_layout,
+          frontpage_name: Alchemy.config.default_language.frontpage_name,
           site: Alchemy::Current.site,
           default: true,
           public: true
         )
-      ) %>
+       %>
     </div>
   <% end %>
 </div>

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

@@ -15,18 +15,7 @@
     tooltip_placement: "top-start",
     if_permitted_to: [:create, Alchemy::Page]
   ) %>
-  <%= render Alchemy::Admin::ToolbarButton.new(
-    icon: clipboard_empty?('pages') ? 'clipboard' : 'paste',
-    url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
-    dialog_options: {
-      title: Alchemy.t('Clipboard'),
-      size: '380x270'
-    },
-    title: Alchemy.t('Show clipboard'),
-    link_options: {id: "clipboard_button"},
-    label: Alchemy.t('Show clipboard'),
-    if_permitted_to: [:create, Alchemy::Page]
-  ) %>
+  <%= render "alchemy/admin/clipboard/button", remarkable_type: "pages" %>
 </div>
 <% end %>
 

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

@@ -11,7 +11,7 @@
       <div class="control_group">
         <%= render 'alchemy/admin/pages/publication_fields' %>
         <%= page_status_checkbox(@page, :restricted) %>
-        <% if configuration(:sitemap)['show_flag'] %>
+        <% if Alchemy.config.sitemap.show_flag %>
           <%= page_status_checkbox(@page, :sitemap) %>
         <% end %>
       </div>
@@ -23,7 +23,7 @@
       <%= f.input :title %>
     </alchemy-char-counter>
 
-    <% if Alchemy.enable_searchable %>
+    <% if Alchemy.config.show_page_searchable_checkbox %>
       <div class="input check_boxes">
         <label class="control-label"><%= Alchemy.t(:fulltext_search) %></label>
         <div class="control_group">

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

@@ -98,14 +98,13 @@
       {{/if}}
       {{#if permissions.copy}}
       <sl-tooltip content="<%= Alchemy.t(:copy_page) %>">
-        <%= link_to(
+        <%= button_to(
           render_icon("file-copy"),
           alchemy.insert_admin_clipboard_path(
             remarkable_type: :pages,
             remarkable_id: "__ID__",
           ),
-          remote: true,
-          method: :post,
+          "data-turbo-method": :post,
           class: "icon_button"
         ) %>
       </sl-tooltip>

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

@@ -29,21 +29,7 @@
       </sl-tooltip>
     </div>
   <% end %>
-  <div class="toolbar_button">
-    <sl-tooltip content="<%= Alchemy.t("Show clipboard") %>">
-      <%= link_to_dialog(
-        render_icon(:clipboard, style: clipboard_empty?("pages") ? "line" : "fill"),
-        alchemy.admin_clipboard_path(remarkable_type: "pages"),
-        {
-          title: Alchemy.t("Clipboard"),
-          size: "380x305"
-        },
-        class: "icon_button",
-        title: Alchemy.t("Show clipboard"),
-        id: "clipboard_button"
-      ) %>
-    </sl-tooltip>
-  </div>
+  <%= render "alchemy/admin/clipboard/button", remarkable_type: "pages" %>
   <div class="toolbar_spacer"></div>
   <div class="toolbar_button">
     <sl-tooltip content="<%= Alchemy.t("Hierarchical") %>">

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

@@ -17,7 +17,7 @@
       <%= render partial: "create_language_form" %>
     <% end %>
 
-    <%= paginate @pages, scope: alchemy, theme: "alchemy" %>
+    <%= render "alchemy/admin/resources/pagination", resources: @pages %>
 
     <div id="library_sidebar">
       <%= render "filter_bar" if resource_has_filters %>

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

@@ -1,8 +1,10 @@
-<%= search_form_for @query, url: url_for({
-      action: 'index',
-      size: @size,
-    }.merge(search_filter_params.except(:q))
-  ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
+<%- url ||= url_for({ action: 'index' }.merge(
+  q: search_filter_params[:q]&.except(resource_handler.search_field_name),
+  form_field_id: @form_field_id,
+  size: @size
+)) -%>
+
+<%= search_form_for @query, url: url_for(action: 'index', size: @size), remote: true, html: {class: 'search_form', id: "resource_search"} do |f| %>
   <%= hidden_field_tag :form_field_id, @form_field_id %>
   <div class="search_field">
     <button type="submit">
@@ -12,15 +14,10 @@
       placeholder: Alchemy.t(:search),
       class: 'search_input_field',
       id: nil %>
-    <%= link_to render_icon(:times, size: '1x'), url_for({
-        action: 'index',
-        form_field_id: @form_field_id,
-        size: @size,
-        overlay: true
-      }.merge(search_filter_params.except(:q))),
+    <%= link_to render_icon(:times, size: '1x'), url,
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
-      style: search_filter_params[:q].blank? ? 'visibility: hidden' : 'visibility: visible' %>
+      style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'visibility: visible' : 'visibility: hidden' %>
   </div>
 <% end %>

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

@@ -1,6 +1,8 @@
-<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(search_filter_params.except(:q, :page))) -%>
+<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(
+  q: search_filter_params[:q]&.except(resource_handler.search_field_name))
+) -%>
 
-<%= search_form_for @query, url: url, class: 'search_form' do |f| %>
+<%= search_form_for @query, url: resource_url_proxy.url_for(action: "index"), id: "resource_search", class: 'search_form' do |f| %>
   <div class="search_field">
     <button type="submit">
       <%= render_icon('search') %>
@@ -8,19 +10,12 @@
     <%= f.search_field resource_handler.search_field_name,
       class: 'search_input_field',
       placeholder: Alchemy.t(:search) %>
-    <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
-      <%= f.hidden_field field, id: nil %>
-    <% end %>
     <%= link_to render_icon(:times, size: '1x'), url,
         class: 'search_field_clear',
         id: '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' %>
 
-    <% search_filter_params.fetch(:filter, []).each do |filter_param| %>
-      <%= hidden_field_tag "filter[#{filter_param[0]}]", filter_param[1], id: nil %>
-    <% end %>
-
     <% if search_filter_params.fetch(:tagged_with, nil) %>
       <%= hidden_field_tag :tagged_with, search_filter_params.fetch(:tagged_with), id: nil %>
     <% end %>

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

@@ -19,12 +19,9 @@
       id: 'edit_multiple_pictures',
       style: 'float: none'
     ) %>
-    <%= button_tag render_icon("delete-bin-2", size: '1x') + Alchemy.t("Delete"), 'data-alchemy-confirm' => {
-      title: Alchemy.t(:please_confirm),
-      message: Alchemy.t(:confirm_to_delete_images_from_server),
-      ok_label: Alchemy.t("Yes"),
-      cancel_label: Alchemy.t("No")
-    }.to_json, class: 'button with_icon' %>
+    <%= button_tag render_icon("delete-bin-2", size: '1x') + Alchemy.t("Delete"),
+      'data-turbo-confirm': Alchemy.t(:confirm_to_delete_images_from_server),
+      class: 'button with_icon' %>
     &nbsp;<%= Alchemy.t(:or) %>&nbsp;
     <%= link_to(
       render_icon(:close) + Alchemy.t("Clear selection"),
@@ -53,4 +50,4 @@
   <% end %>
 <% end %>
 
-<%= paginate @pictures, theme: 'alchemy' %>
+<%= render "alchemy/admin/resources/pagination", resources: @pictures %>

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

@@ -21,7 +21,8 @@
       <%= render partial: 'picture_to_assign',
         collection: @pictures,
         locals: {size: @size} %>
-      <%= paginate @pictures, theme: 'alchemy', remote: true, hide_per_page_select: true %>
+
+      <%= render "alchemy/admin/resources/pagination", resources: @pictures, remote: true, hide_per_page_select: true %>
     </div>
   <% end %>
 </div>

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

@@ -8,7 +8,7 @@
         in_dialog: true,
         redirect_url: alchemy.admin_pictures_path(
           size: search_filter_params[:size],
-          filter: { misc: 'last_upload' },
+          q: { last_upload: true },
           form_field_id: @form_field_id
         ) %>
     </div>

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

@@ -7,7 +7,7 @@
           file_attribute: 'image_file',
           redirect_url: alchemy.admin_pictures_path(
             size: @size,
-            filter: { misc: 'last_upload' }
+            q: { last_upload: true }
           ) %>
       </div>
       <div class="toolbar_spacer"></div>
@@ -74,13 +74,8 @@
     <h2>
       <%= @pictures.total_count %>
       <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-      <% if search_filter_params[:filter].present? %>
-        <%= Alchemy.t("filtered_by") %>
-        <% search_filter_params[:filter].each do |k, v| %>
-          <span class="applied-filter"><%= Alchemy.t("filters.picture.#{k}.values.#{v}") %></span>
-        <% end %>
-      <% end %>
     </h2>
+    <%= render "alchemy/admin/resources/applied_filters" %>
   </div>
   <%= render 'archive' %>
 </div>

data/app/views/alchemy/admin/resources/_applied_filters.html.erb

@@ -0,0 +1,8 @@
+<% if applied_filters.present? %>
+  <div class="applied-filters">
+    <b><%= Alchemy.t("filtered_by") %></b>
+    <% applied_filters.each do |filter| %>
+      <%= render filter.applied_filter_component(search_filter_params:, resource_url_proxy:, query: @query) %>
+    <% end %>
+  </div>
+<% end %>