alchemy_cms 7.4.10 → 8.0.0.b

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') %>
@@ -9,19 +11,12 @@
       value: params.dig(:q, 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

@@ -1,48 +1,35 @@
-<div id="library_sidebar">
-  <%= render 'filter_bar' if resource_has_filters %>
+<%= render "library_sidebar" %>
 
-  <% if Alchemy::Picture.tag_counts.any? %>
-    <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">
-      <%= render 'tag_list' %>
-    </div>
-  <% end %>
-</div>
+<% forwarded_params = search_filter_params.merge(
+  page: params[:page],
+  size: @size.presence
+).to_h %>
 
-<%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
+<%= form_tag delete_multiple_admin_pictures_path(forwarded_params), method: :delete do %>
   <div class="selected_item_tools hidden">
     <h3><%= Alchemy.t(:edit_selected_pictures) %></h3>
     <%= link_to(
       render_icon(:edit, size: '1x') + Alchemy.t("Edit"),
-      edit_multiple_admin_pictures_path,
+      edit_multiple_admin_pictures_path(forwarded_params),
       class: 'button with_icon',
       title: Alchemy.t('Edit multiple pictures'),
-      id: 'edit_multiple_pictures',
-      style: 'float: none'
+      id: 'edit_multiple_pictures'
     ) %>
-    <%= 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"),
-      admin_pictures_path(
-        q: search_filter_params[:q],
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
-      ),
-      class: 'secondary button with_icon',
-      style: 'float: none'
+      admin_pictures_path(forwarded_params),
+      class: 'secondary button with_icon'
     ) %>
   </div>
-  <% if @pictures.blank? and @recent_pictures.blank? and search_filter_params[:q].blank? %>
+  <% if @pictures.blank? && @recent_pictures.blank? && search_filter_params[:q].blank? %>
     <%= render_message do %>
       <%= Alchemy.t(:no_images_in_archive) %>
     <% end %>
-  <% elsif @pictures.blank? and @recent_pictures.blank? %>
+  <% elsif @pictures.blank? && @recent_pictures.blank? %>
     <%= render_message do %>
       <%= Alchemy.t(:no_search_results) %>
     <% end %>
@@ -53,4 +40,4 @@
   <% end %>
 <% end %>
 
-<%= paginate @pictures, theme: 'alchemy' %>
+<%= render "alchemy/admin/resources/pagination", resources: @pictures %>

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

@@ -2,12 +2,7 @@
   <%= render 'filter_and_size_bar' %>
 </div>
 <div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
-  <div id="library_sidebar">
-    <%= render 'filter_bar' if resource_has_filters %>
-    <div class="tag-list">
-      <%= render 'tag_list' %>
-    </div>
-  </div>
+  <%= render "library_sidebar" %>
   <% if @pictures.empty? %>
     <%= render_message do %>
       <% if search_filter_params.empty? %>
@@ -21,7 +16,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/_form.html.erb

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag(@picture) do %>
-  <%= alchemy_form_for [alchemy, :admin, @picture] do |f| %>
+  <%= alchemy_form_for [alchemy, :admin, @picture], class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
     <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>

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

@@ -1,55 +1,24 @@
-<div class="resource_info">
-  <div class="picture-file-infos">
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
-      <p><%= @picture.image_file_name %></p>
-    </div>
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_dimensions) %></label>
-      <p><%= @picture.image_file_dimensions %>px</p>
-    </div>
-    <div class="value">
-      <label><%= Alchemy::Picture.human_attribute_name(:image_file_size) %></label>
-      <p><%= number_to_human_size @picture.image_file_size %></p>
-    </div>
+<div class="resource_info file-infos">
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
+    <p><%= @picture.image_file_name %></p>
   </div>
-</div>
-
-<div class="picture-usage-info resource_info">
-  <h3>
-    <%= Alchemy.t(:this_picture_is_used_on_these_pages) %>
-  </h3>
-  <div id="pictures_page_list">
-    <% if @assignments.any? %>
-      <ul>
-        <% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
-          <% if page %>
-            <li>
-              <h3>
-                <%= render_icon 'file' %>
-                <p><%= link_to page.name, edit_admin_page_path(page) %></p>
-              </h3>
-              <ul class="list">
-                <% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
-                  <li class="<%= cycle('even', 'odd') %>">
-                    <% page_link = link_to element.display_name_with_preview_text,
-                                   edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
-                    <%= render_icon('draggable', style: false) %>
-                    <p>
-                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
-                    </p>
-                  </li>
-                <% end %>
-              </ul>
-            </li>
-          <% end %>
-        <% end %>
-      </ul>
-    <% else %>
-      <%= render_message do %>
-        <%= Alchemy.t(:picture_not_in_use_yet) %>
-      <% end %>
-    <% end %>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_dimensions) %></label>
+    <p><%= @picture.image_file_dimensions %>px</p>
+  </div>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:image_file_size) %></label>
+    <p><%= number_to_human_size @picture.image_file_size %></p>
+  </div>
+  <div class="value">
+    <label><%= Alchemy::Picture.human_attribute_name(:created_at) %></label>
+    <p><%= l(@picture.created_at, format: :"alchemy.default") %></p>
   </div>
 </div>
+
+<hr>
+
+<%= render "alchemy/admin/resources/resource_usage_info",
+  assignments: @assignments,
+  resource_name: :picture %>

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

@@ -0,0 +1,7 @@
+<div id="library_sidebar">
+  <%= render "sorting_select" %>
+  <%= render "filter_bar" if resource_has_filters %>
+  <div class="tag-list">
+    <%= render "tag_list" %>
+  </div>
+</div>

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

@@ -1,38 +1,32 @@
+<% picture_path = alchemy.admin_picture_path(
+  picture,
+  search_filter_params.merge(
+    page: params[:page],
+    size: @size.presence
+  ).to_h
+) %>
+
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
   <span class="picture_tool select">
     <%= check_box_tag "picture_ids[]", picture.id %>
   </span>
   <% if picture.deletable? && can?(:destroy, picture) %>
-  <span class="picture_tool delete">
+  <div class="picture_tool delete">
     <sl-tooltip content="<%= Alchemy.t('Delete image') %>">
       <%= link_to_confirm_dialog(
         render_icon("delete-bin-2"),
         Alchemy.t(:confirm_to_delete_image_from_server),
-        alchemy.admin_picture_path(
-          id: picture,
-          q: search_filter_params[:q],
-          page: params[:page],
-          tagged_with: search_filter_params[:tagged_with],
-          size: @size,
-          filter: search_filter_params[:filter]
-        )
+        picture_path
       ) -%>
     </sl-tooltip>
-  </span>
+  </div>
   <% end %>
   <% picture_url = picture.thumbnail_url(size: preview_size(@size)) %>
-  <% image = image_tag(picture_url || "alchemy/missing-image.svg", alt: picture.name) %>
-  <% if can?(:edit, picture) && picture_url %>
+  <% image = picture_url ? image_tag(picture_url, alt: picture.name) : '<alchemy-icon name="file-damage"></alchemy-icon>'.html_safe %>
+  <% if can?(:edit, picture) %>
     <%= link_to(
       image,
-      alchemy.admin_picture_path(
-        id: picture,
-        q: search_filter_params[:q],
-        page: params[:page],
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
-      ),
+      picture_path,
       class: 'thumbnail_background'
     ) %>
   <% else %>

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

@@ -1,20 +1,24 @@
 <div class="picture_thumbnail" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
-  <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
-    <%= link_to(
-      image_tag(
-        picture_to_assign.thumbnail_url(size: preview_size(size)) || "alchemy/missing-image.svg",
-        alt: picture_to_assign.name
-      ),
-      alchemy.assign_admin_picture_path(
-        id: picture_to_assign.id,
-        form_field_id: @form_field_id
-      ),
-      remote: true,
-      onclick: '$(self).attr("href", "#").off("click"); return false',
-      method: 'put',
-      class: 'thumbnail_background'
-    ) %>
-  </sl-tooltip>
+  <% if picture_to_assign.image_file %>
+    <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
+      <%= link_to(
+        image_tag(
+          picture_to_assign.thumbnail_url(size: preview_size(size)),
+          alt: picture_to_assign.name
+        ),
+        alchemy.assign_admin_picture_path(
+          id: picture_to_assign.id,
+          form_field_id: @form_field_id
+        ),
+        remote: true,
+        onclick: '$(self).attr("href", "#").off("click"); return false',
+        method: 'put',
+        class: 'thumbnail_background'
+      ) %>
+    </sl-tooltip>
+  <% else %>
+    <alchemy-icon name="file-damage"></alchemy-icon>
+  <% end %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">
     <%= picture_to_assign.name %>
   </div>

data/app/views/alchemy/admin/pictures/_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/pictures/_tag_list.html.erb

@@ -1,5 +1,5 @@
 <% if Alchemy::Picture.tag_counts.any? %>
-  <h3><%= Alchemy.t("Filter by tag") %></h3>
+  <label><%= Alchemy.t("Filter by tag") %></label>
   <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
   <ul>
     <%= render_tag_list('Alchemy::Picture') %>

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

@@ -1,9 +1,4 @@
-<%= form_tag update_multiple_admin_pictures_path do %>
-  <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, @size %>
-  <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
-  <%= hidden_field_tag :filter, search_filter_params[:filter] %>
-
+<%= form_tag update_multiple_admin_pictures_path(search_filter_params.merge(size: @size.presence)) do %>
   <% @pictures.pluck(:id).each do |id| %>
   <%= hidden_field_tag "picture_ids[]", id %>
   <% end %>

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>
@@ -17,10 +17,7 @@
         <%= link_to(
           render_icon('zoom-out'),
           alchemy.admin_pictures_path(
-            size: "small",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "small").to_h
           ),
           class: "icon_button"
         ) %>
@@ -29,10 +26,7 @@
         <%= link_to(
           render_icon('search'),
           alchemy.admin_pictures_path(
-            size: "medium",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "medium").to_h
           ),
           class: "icon_button"
         ) %>
@@ -41,10 +35,7 @@
         <%= link_to(
           render_icon('zoom-in'),
           alchemy.admin_pictures_path(
-            size: "large",
-            q: search_filter_params[:q],
-            filter: search_filter_params[:filter],
-            tagged_with: search_filter_params[:tagged_with]
+            search_filter_params.merge(size: "large").to_h
           ),
           class: "icon_button"
         ) %>
@@ -74,13 +65,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/pictures/show.html.erb

@@ -1,13 +1,17 @@
 <div class="zoomed-picture-background">
-  <%= image_tag @picture.url || "alchemy/missing-image.svg" %>
+  <% if @picture.image_file %>
+    <%= image_tag @picture.url %>
+  <% else %>
+    <alchemy-icon name="file-damage"></alchemy-icon>
+  <% end %>
 </div>
 
 <div class="picture-overlay-navigation">
   <% if @previous %>
     <%= link_to alchemy.admin_picture_path(
-        id: @previous,
+        id: :previous,
         q: search_filter_params[:q],
-        page: params[:page],
+        page: @previous,
         tagged_with: search_filter_params[:tagged_with],
         size: @size,
         filter: search_filter_params[:filter]
@@ -19,9 +23,9 @@
   <% end %>
   <% if @next %>
     <%= link_to alchemy.admin_picture_path(
-        id: @next,
+        id: :next,
         q: search_filter_params[:q],
-        page: params[:page],
+        page: @next,
         tagged_with: search_filter_params[:tagged_with],
         size: @size,
         filter: search_filter_params[:filter]
@@ -35,6 +39,7 @@
 
 <div class="picture-details-overlay">
   <%= render 'form' %>
+  <hr>
   <%= render 'infos' %>
 </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 %>

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

@@ -1,27 +1,7 @@
 <div id="filter_bar">
-  <%= render partial: "filter", collection: resource_filters_for_select %>
+  <alchemy-auto-submit>
+    <% alchemy_filters.each do |filter| %>
+      <%= render filter.input_component(search_filter_params, @query) %>
+    <% end %>
+  </alchemy-auto-submit>
 </div>
-
-<script type="module">
-  $(function() {
-    $('select', '#filter_bar').on('change', function(e) {
-      var $this = $(this);
-      var filter_param = 'filter['+$this.attr('name')+']';
-      var path = '<%= resources_path(resource_handler.namespaced_resources_name) %>';
-      var params = new URLSearchParams('<%= raw search_filter_params.to_query %>');
-
-      if ($this.val() === "") {
-        params.delete(filter_param);
-      } else {
-        params.set(filter_param, $this.val());
-      }
-
-      if ($this.data('remote') === true) {
-        $.get(path, params.toString(), null, 'script');
-      } else {
-        Turbo.visit(path + '?' + params.toString());
-      }
-      return false;
-    });
-  });
-</script>

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

@@ -0,0 +1,6 @@
+<div class="pagination-wrapper">
+  <%= paginate resources, theme: "alchemy", remote: local_assigns[:remote] %>
+  <% unless local_assigns[:hide_per_page_select] %>
+    <%= render "alchemy/admin/resources/per_page_select" %>
+  <% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
+<%= form_tag url_for, method: :get, remote: true, class: 'per-page-select-form' do |f| %>
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
     <% if value.respond_to?(:keys) %>
       <% value.each do |k, v| %>
@@ -9,7 +9,9 @@
     <% end %>
   <% end %>
   <label>
-    <%= Alchemy.t(:items_per_page, model_name: resource_model.model_name.human(count: 2)) %>
+    <span>
+      <%= Alchemy.t(:items_per_page, model_name: resource_model.model_name.human(count: 2)) %>
+    </span>
     <%= select_tag :per_page,
       options_for_select(
         items_per_page_options,

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

@@ -1,3 +1,3 @@
 <%= render Alchemy::Admin::Resource::Table.new(resources_instance_variable, query: @query, search_filter_params: search_filter_params, icon: local_assigns[:icon]) %>
 
-<%= paginate resources_instance_variable, scope: resource_url_proxy, theme: 'alchemy' %>
+<%= render "alchemy/admin/resources/pagination", resources: resources_instance_variable %>

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

@@ -0,0 +1,36 @@
+<div class="resource-usage-info">
+  <% if assignments.any? %>
+    <alchemy-message type="info">
+      <%= Alchemy.t(resource_name, scope: :used_on_these_pages) %>
+    </alchemy-message>
+    <ul class="resource_page_list">
+      <% assignments.group_by(&:page).each do |page, related_ingredients| %>
+        <% if page %>
+          <li>
+            <h3>
+              <%= render_icon 'file' %>
+              <p><%= link_to page.name, edit_admin_page_path(page) %></p>
+            </h3>
+            <ul class="list">
+              <% related_ingredients.group_by(&:element).each do |element, related_ingredients| %>
+                <li class="<%= cycle('even', 'odd') %>">
+                  <% page_link = link_to element.display_name_with_preview_text,
+                                  edit_admin_page_path(page, anchor: "element_#{element.id}") %>
+                  <% ingredients = related_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
+                  <%= render_icon(:draggable, style: false) %>
+                  <p>
+                    <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
+                  </p>
+                </li>
+              <% end %>
+            </ul>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= render_message do %>
+      <%= Alchemy.t(resource_name, scope: :not_in_use_yet) %>
+    <% end %>
+  <% end %>
+</div>