alchemy_cms 8.3.11 → 8.4.0

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

@@ -11,9 +11,13 @@
     <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(:image_file_format) %></label>
+    <p><%= Alchemy.t(@picture.image_file_format, scope: [:filters, :picture, :by_file_format, :values]) %></p>
+  </div>
   <div class="value">
     <label><%= Alchemy::Picture.human_attribute_name(:created_at) %></label>
-    <p><%= l(@picture.created_at, format: :"alchemy.default") %></p>
+    <p><%= Alchemy.l(@picture.created_at) %></p>
   </div>
 </div>
 

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

@@ -27,7 +27,7 @@
         picture_index: picture_index.to_i + 1,
         size: @size.presence
       ).to_h
-    ) do %>
+    ), is: "alchemy-image-overlay-link" do %>
       <%= render Alchemy::Admin::PictureThumbnail.new(picture, size: @size) %>
     <% end %>
   <% else %>

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

@@ -1,14 +1,13 @@
 <div class="picture_thumbnail" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
   <% if picture_to_assign.image_file %>
     <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
-      <%= link_to(
+      <%= button_to(
         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',
+        method: :put,
+        form_class: "assign_picture"
       ) do %>
         <%= render Alchemy::Admin::PictureThumbnail.new(picture_to_assign, size: size) %>
       <% end %>

data/app/views/alchemy/admin/pictures/assign.turbo_stream.erb

@@ -0,0 +1,7 @@
+<turbo-stream
+  action="assign_picture"
+  target="<%= @form_field_id %>"
+  picture-id="<%= @assignable_id %>"
+  image-file-width="<%= @picture.image_file_width %>"
+  image-file-height="<%= @picture.image_file_height %>"
+></turbo-stream>

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

@@ -2,13 +2,16 @@
   <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,
           file_attribute: 'image_file',
+          layout: 'card',
           redirect_url: alchemy.admin_pictures_path(
             size: @size,
             q: { last_upload: true }
-          ) %>
+          ),
+          inline_label: true
+        ) %>
       </div>
       <div class="toolbar_spacer"></div>
     <% end %>
@@ -59,33 +62,38 @@
     additional_params: [:size] %>
 <% end %>
 
-<div id="picture_archive" class="resources-table-wrapper with_tag_filter">
-  <div class="resources-header">
-    <h2>
-      <%= @pictures.total_count %>
-      <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-    </h2>
-    <%= render "alchemy/admin/resources/applied_filters" %>
-  </div>
-  <%= render 'archive' %>
-</div>
+<alchemy-picture-archive>
+  <% if Alchemy::Picture.none? %>
+    <%= render 'alchemy/admin/resources/empty_state' do %>
+      <%= render Alchemy::Admin::UploaderButton.new(
+          object: Alchemy::Picture.new,
+          file_attribute: 'image_file',
+          redirect_url: alchemy.admin_pictures_path(
+            size: @size,
+            q: { last_upload: true }
+          ),
+          inline_label: true
+        ) %>
+    <% end %>
+  <% else %>
+    <div class="resources-header">
+      <h2>
+        <%= @pictures.total_count %>
+        <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
+      </h2>
+      <%= render "alchemy/admin/resources/applied_filters" %>
+    </div>
 
-<% content_for :javascripts do %>
-  <script type="module">
-    import { ImageOverlay } from "alchemy_admin/image_overlay";
-    import { pictureSelector } from "alchemy_admin/picture_selector";
-    import { on } from "alchemy_admin/utils/events";
+    <% if @pictures.none? && @recent_pictures.blank? && search_filter_params.present? %>
+      <%= render_message do %>
+        <%= Alchemy.t(:no_search_results) %>
+      <% end %>
+    <% else %>
+      <%= render "archive" %>
+    <% end %>
 
-    pictureSelector();
-    // A keyboard activated click targets the link, not the thumbnail inside it.
-    on("click", "#picture_archive", ".picture_thumbnail > a", (event) => {
-      const url = event.target.closest("a")?.href;
-      const overlay = new ImageOverlay(url, {
-        size: `${window.clientWidth}x${window.clientHeight}`,
-        padding: false
-      });
-      overlay.open();
-      event.preventDefault();
-    });
-  </script>
-<% end %>
+    <%= render "alchemy/admin/resources/pagination", resources: @pictures %>
+  <% end %>
+</alchemy-picture-archive>
+
+<%= render "library_sidebar" %>

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

@@ -1,46 +1,46 @@
-<div class="zoomed-picture-background">
-  <% if @picture.image_file %>
-    <%= image_tag @picture.url %>
-  <% else %>
-    <alchemy-icon name="file-damage"></alchemy-icon>
-  <% end %>
-</div>
+<%= turbo_frame_tag "picture_overlay" do %>
+  <div class="zoomed-picture-background">
+    <% 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(
-        :previous,
-        search_filter_params.merge(
-          picture_index: @previous,
-          size: @size
-        ).to_h
-      ),
-      class: "previous-picture",
-      remote: true do %>
-      <%= render_icon "arrow-left-wide", size: "xl" %>
+  <div class="picture-overlay-navigation">
+    <% if @previous %>
+      <%= link_to alchemy.admin_picture_path(
+          :previous,
+          search_filter_params.merge(
+            picture_index: @previous,
+            size: @size
+          ).to_h
+        ),
+        class: "previous-picture" do %>
+        <%= render_icon "arrow-left-wide", size: "xl" %>
+      <% end %>
     <% end %>
-  <% end %>
-  <% if @next %>
-    <%= link_to alchemy.admin_picture_path(
-        :next,
-        search_filter_params.merge(
-          picture_index: @next,
-          size: @size
-        ).to_h
-      ),
-      class: "next-picture",
-      remote: true do %>
-      <%= render_icon "arrow-right-wide", size: "xl" %>
+    <% if @next %>
+      <%= link_to alchemy.admin_picture_path(
+          :next,
+          search_filter_params.merge(
+            picture_index: @next,
+            size: @size
+          ).to_h
+        ),
+        class: "next-picture" do %>
+        <%= render_icon "arrow-right-wide", size: "xl" %>
+      <% end %>
     <% end %>
-  <% end %>
-</div>
+  </div>
 
-<div class="picture-details-overlay">
-  <%= render 'form', picture_index: @previous || @next || 0 %>
-  <hr>
-  <%= render 'infos' %>
-</div>
+  <div class="picture-details-overlay">
+    <%= render 'form', picture_index: @previous || @next || 0 %>
+    <hr>
+    <%= render 'infos' %>
+  </div>
 
-<div class="picture-overlay-handle">
-  <%= render_icon "contract-right" %>
-</div>
+  <div class="picture-overlay-handle">
+    <%= render_icon "contract-right" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,27 @@
+<% content_for(:alchemy_body_class) { "centered" } %>
+
+<div class="empty-state panel">
+  <div class="empty-state-header">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+      <path d="M11 1.99964C11.2639 1.99964 11.525 2.01348 11.7832 2.03578C11.4424 2.63427 11.202 3.29716 11.084 4.0016C11.056 4.00127 11.028 3.99965 11 3.99965C7.13263 3.99965 4.00021 7.13233 4 10.9997C4 14.8672 7.1325 17.9997 11 17.9997C12.8956 17.9997 14.6148 17.2468 15.875 16.0241L16.0244 15.8747C17.247 14.6145 18 12.8951 18 10.9997C18 10.9714 17.9974 10.9429 17.9971 10.9147C18.7018 10.7968 19.3642 10.5563 19.9629 10.2155C19.9852 10.4739 20 10.7355 20 10.9997C20 13.1235 19.2632 15.077 18.0312 16.6169L22.3135 20.8991L20.8994 22.3132L16.6172 18.0309C15.0773 19.263 13.124 19.9997 11 19.9997C6.032 19.9997 2 15.9677 2 10.9997C2.00021 6.03182 6.03213 1.99964 11 1.99964ZM16.5293 1.31898C16.7059 0.893192 17.2942 0.89318 17.4707 1.31898L17.7236 1.93031C18.1556 2.9731 18.9616 3.80582 19.9746 4.25648L20.6924 4.57582C21.1026 4.75864 21.1026 5.35584 20.6924 5.53871L19.9326 5.8766C18.9449 6.31588 18.1534 7.11911 17.7139 8.12758L17.4668 8.69302C17.2864 9.10715 16.7137 9.10715 16.5332 8.69302L16.2871 8.12758C15.8476 7.11895 15.0552 6.31593 14.0674 5.8766L13.3076 5.53871C12.8974 5.35585 12.8974 4.75863 13.3076 4.57582L14.0254 4.25648C15.0385 3.80582 15.8445 2.97312 16.2764 1.93031L16.5293 1.31898Z"></path>
+    </svg>
+
+    <div class="empty-state-notice">
+      <%== local_assigns.fetch(:notice) do
+        Alchemy.t(
+          resource_model.model_name.i18n_key,
+          scope: :no_resource_found,
+          default: Alchemy.t(
+            :default,
+            scope: :no_resource_found,
+            resource: resource_model.model_name.human(count: :many)
+          )
+        )
+      end %>
+    </div>
+  </div>
+
+  <div class="empty-state-body">
+    <%= yield %>
+  </div>
+</div>

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

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

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

@@ -1,4 +1,4 @@
-<%= form_tag url_for, method: :get, remote: true, class: 'per-page-select-form' do |f| %>
+<%= form_tag url_for, method: :get, 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| %>

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

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

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

@@ -10,13 +10,14 @@
           <li>
             <h3>
               <%= render_icon 'file' %>
-              <p><%= link_to page.name, edit_admin_page_path(page) %></p>
+              <p><%= link_to page.name, edit_admin_page_path(page), data: {turbo_frame: "_top"} %></p>
             </h3>
             <ul>
               <% 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}") %>
+                                  edit_admin_page_path(page, anchor: "element_#{element.id}"),
+                                  data: {turbo_frame: "_top"} %>
                   <% ingredients = related_ingredients.map(&:translated_role).to_sentence %>
                   <%= element.definition.icon_file %>
                   <p>

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

@@ -1,16 +1,14 @@
-<% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
-
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
     <%= render Alchemy::Admin::ToolbarButton.new(
       icon: "add",
-      label: label_title,
+      label: create_resource_label,
+      primary: true,
       url: new_resource_path,
-      title: label_title,
       hotkey: 'alt+n',
       tooltip_placement: "top-start",
       dialog_options: {
-        title: label_title,
+        title: create_resource_label,
         size: resource_window_size
       },
       if_permitted_to: [:create, resource_model]
@@ -27,14 +25,35 @@
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
-<div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
-  <%= render 'alchemy/admin/resources/table_header' %>
-  <%= render 'resource_table' %>
+<% if resource_model.any? %>
+  <%= render "alchemy/admin/resources/table_header", query: @query %>
 
-  <% if resource_has_tags || resource_has_filters %>
-    <div id="library_sidebar">
-      <%= render 'filter_bar' if resource_has_filters %>
-      <%= render 'tag_list' if resource_has_tags %>
+  <% if resources_instance_variable.any? %>
+    <div class="resources-table-wrapper">
+      <%= render "resource_table", query: @query %>
     </div>
+  <% elsif search_filter_params.present? %>
+    <%= render_message { Alchemy.t("Nothing found") } %>
+  <% end %>
+
+  <%= render "alchemy/admin/resources/pagination", resources: resources_instance_variable %>
+<% else %>
+  <%= render "alchemy/admin/resources/empty_state" do %>
+    <%= link_to_dialog(
+      render_icon(:add) + create_resource_label,
+      new_resource_path,
+      {
+        title: create_resource_label,
+        size: resource_window_size
+      },
+      class: "button with_icon"
+    ) %>
   <% end %>
-</div>
+<% end %>
+
+<% if resource_has_tags || resource_has_filters %>
+  <div id="library_sidebar">
+    <%= render "filter_bar" if resource_has_filters %>
+    <%= render "tag_list" if resource_has_tags %>
+  </div>
+<% end %>

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

@@ -1,40 +1,42 @@
-<% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
-
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
     <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :plus,
-      label: label_title,
+      label: create_resource_label,
+      primary: true,
       url: new_resource_path,
-      title: label_title,
       hotkey: 'alt+n',
       tooltip_placement: "top-start",
       dialog_options: {
-        title: label_title,
+        title: create_resource_label,
         size: "430x415"
       },
       if_permitted_to: [:create, Alchemy::Site]
-    ) if @sites.any? %>
+    ) %>
   </div>
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
-<div id="archive_all" class="resources-table-wrapper">
+<% if Alchemy::Site.any? %>
+  <%= render 'alchemy/admin/resources/table_header', query: @query %>
+
   <% if @sites.any? %>
-    <%= render 'alchemy/admin/resources/table_header' %>
-    <%= render 'alchemy/admin/resources/resource_table', icon: "global" %>
-  <% elsif search_filter_params[:q].present? %>
-    <%= render_message { Alchemy.t('Nothing found') } %>
-  <% else %>
-    <div class="panel no-resource-found">
-      <%= render_message do %>
-        <%== Alchemy.t('alchemy/site', scope: :no_resource_found) %>
-      <% end %>
-      <%= render 'form', site: Alchemy::Site.new(
-          name: Alchemy.config.default_site.name,
-          host: Alchemy.config.default_site.host,
-          public: true
-        ) %>
+    <div class="resources-table-wrapper">
+      <%= render 'alchemy/admin/resources/resource_table', icon: "global", query: @query %>
     </div>
+  <% elsif search_filter_params.present? %>
+    <%= render_message do %>
+      <%= Alchemy.t(:no_search_results) %>
+    <% end %>
   <% end %>
-</div>
+
+  <%= render "alchemy/admin/resources/pagination", resources: resources_instance_variable %>
+<% else %>
+  <%= render "alchemy/admin/resources/empty_state" do %>
+    <%= render "form", site: Alchemy::Site.new(
+      name: Alchemy.config.default_site.name,
+      host: Alchemy.config.default_site.host,
+      public: true
+    ) %>
+  <% end %>
+<% end %>

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

@@ -3,18 +3,29 @@
 <% end %>
 
 <% content_for(:toolbar) do %>
-  <%= render Alchemy::Admin::ToolbarButton.new(
-    icon: :info,
-    label: 'Info',
-    url: alchemy.admin_styleguide_path,
-    title: 'Info',
-    hotkey: 'alt+i',
-    dialog_options: {
-      title: 'Info',
-      size: "650x400"
-    },
-    if_permitted_to: [:index, :alchemy_admin_styleguide]
-  ) %>
+  <div class="toolbar_buttons">
+    <%= render Alchemy::Admin::ToolbarButton.new(
+      icon: :add,
+      label: 'Inline toolbar button',
+      primary: true,
+      url: alchemy.admin_styleguide_path,
+      title: 'Create',
+      hotkey: 'alt+n',
+      dialog_options: {
+        title: 'Info',
+        size: "650x400"
+      },
+      if_permitted_to: [:index, :alchemy_admin_styleguide]
+    ) %>
+    <%= render Alchemy::Admin::ToolbarButton.new(
+      icon: :copy,
+      label: 'Icon only toolbar button',
+      url: alchemy.admin_styleguide_path,
+      title: 'Duplicate',
+      hotkey: 'alt+c',
+      if_permitted_to: [:index, :alchemy_admin_styleguide]
+    ) %>
+  </div>
 <% end %>
 
 <h1>AlchemyCMS Styleguide</h1>
@@ -197,6 +208,18 @@
     <% end %>
   </div>
 
+  <div style="width: 20%">
+    <h3>Page Select (multiple)</h3>
+    <%# A GET form so submitting serializes the page_ids[] params into the URL and
+        the submitted pages come back as the preselection. %>
+    <form method="get" style="display: flex; flex-direction: column; gap: 0.5em">
+      <%= render Alchemy::Admin::PageSelect.new(Alchemy::Page.where(id: params[:page_ids]), multiple: true) do %>
+        <select name="page_ids[]" multiple class="full_width"></select>
+      <% end %>
+      <button type="submit">Submit</button>
+    </form>
+  </div>
+
   <div style="width: 20%">
     <h3>Node Select</h3>
     <%= render Alchemy::Admin::NodeSelect.new do %>

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

@@ -3,8 +3,8 @@
     <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :plus,
       label: Alchemy.t('New Tag'),
+      primary: true,
       url: alchemy.new_admin_tag_path,
-      title: Alchemy.t('New Tag'),
       hotkey: 'alt+n',
       tooltip_placement: "top-start",
       dialog_options: {
@@ -17,36 +17,38 @@
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
-<div id="archive_all" class="resources-table-wrapper">
+<% if Alchemy::Tag.any? %>
   <%= render 'alchemy/admin/resources/table_header' %>
-  <% if @tags.any? %>
 
-    <%= render Alchemy::Admin::Resource::Table.new(@tags, query: @query, search_filter_params: search_filter_params) do |table| %>
-      <% table.icon_column "tag" %>
-      <% table.column :name, sortable: true %>
-      <% table.column :taggings_types do |tag| %>
-        <% tag.taggings.collect(&:taggable).compact.uniq(&:class).each do |taggable| %>
-          <span class="label">
-            <%= taggable.class.model_name.human %>
-          </span>
+  <% if @tags.any? %>
+    <div class="resources-table-wrapper">
+      <%= render Alchemy::Admin::Resource::Table.new(@tags, query: @query, search_filter_params: search_filter_params) do |table| %>
+        <% table.icon_column "tag" %>
+        <% table.column :name, sortable: true %>
+        <% table.column :taggings_types do |tag| %>
+          <% tag.taggings.collect(&:taggable).compact.uniq(&:class).each do |taggable| %>
+            <span class="label">
+              <%= taggable.class.model_name.human %>
+            </span>
+          <% end %>
         <% end %>
-      <% end %>
-      <% table.column :taggings_count, sortable: true, class_name: "count" %>
+        <% table.column :taggings_count, sortable: true, class_name: "count" %>
 
-      <% table.delete_button tooltip: Alchemy.t(:delete_tag), confirm_message: Alchemy.t(:do_you_really_want_to_delete_this_tag?) %>
-      <% table.edit_button tooltip: Alchemy.t(:edit_tag), dialog_size: "360x410" %>
-    <% end %>
+        <% table.delete_button tooltip: Alchemy.t(:delete_tag), confirm_message: Alchemy.t(:do_you_really_want_to_delete_this_tag?) %>
+        <% table.edit_button tooltip: Alchemy.t(:edit_tag), dialog_size: "360x410" %>
+      <% end %>
+    </div>
 
     <%= render "alchemy/admin/resources/pagination", resources: @tags %>
-
-  <% else %>
-
-  <%= render_message do %>
-    <h2><%= Alchemy.t('No Tags found') %></h2>
-    <% if search_filter_params[:q].blank? %>
-      <p><%= Alchemy.t(:tags_get_created_if_used_the_first_time) %></p>
+  <% elsif search_filter_params.present? %>
+    <%= render_message do %>
+      <%= Alchemy.t('No Tags found') %>
     <% end %>
   <% end %>
-
+<% else %>
+  <%= render "alchemy/admin/resources/empty_state" do %>
+    <%= render_message do %>
+      <%= Alchemy.t(:tags_get_created_if_used_the_first_time) %>
+    <% end %>
   <% end %>
-</div>
+<% end %>

data/app/views/alchemy/admin/tinymce/_setup.html.erb

@@ -8,14 +8,12 @@
   <link rel="preload" href="<%= asset_path("#{tinymce_base_path}/plugins/#{plugin}/plugin.min.js") %>" as="script">
 <% end %>
 
-<script>
-  var tinyMCEPreInit = <%== {
-    base: ActionController::Base.config.asset_host ?
+<%= tag.script(type: "application/json", id: "alchemy_tinymce_defaults") do %>
+  <%== Alchemy::Tinymce.init.merge(
+    base_url: ActionController::Base.config.asset_host ?
       asset_url(tinymce_base_path, host: ActionController::Base.config.asset_host) :
       tinymce_base_path,
-    suffix: ".min"
-  }.to_json %>;
-  Alchemy.TinymceDefaults = <%== Alchemy::Tinymce.init.merge(
+    suffix: ".min",
     plugins: Alchemy::Tinymce.plugins.join(",")
-  ).to_json %>;
-</script>
+  ).to_json %>
+<% end %>

data/app/views/alchemy/admin/translations/_en.js

@@ -27,6 +27,9 @@ Alchemy.translations = {
   "Clear selection": "Clear selection",
   Remove: "Remove",
   "No results found": "No results found",
+  "Please wait, loading": "Please wait, loading",
+  "Loading more results": "Loading more results",
+  "No more results": "No more results",
   None: "None",
   "No anchors found": "No anchors found",
   "Select a page first": "Select a page first",

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

@@ -1,17 +1,11 @@
-<% file_types = Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ['*'] %>
-<% accept ||= file_types.to_a == ["*"] ? nil : file_types.map {|type| ".#{type}"}.join(", ") %>
-
-<alchemy-uploader redirect-url="<%= redirect_url %>" dropzone="<%= local_assigns[:dropzone] || "#main_content" %>">
-  <%= form_for [:admin, object], html: { multipart: true, class: 'upload-button' } do |f| %>
-    <%= f.file_field file_attribute,
-      class: 'fileupload fileupload--field', multiple: true, accept: accept,
-      name: "#{f.object_name}[#{file_attribute}]", tabindex: '-1' %>
-    <%= hidden_field_tag("#{f.object_name}[upload_hash]", Time.current.hash) if object.respond_to?(:upload_hash) %>
-    <%= f.label file_attribute, data: { alchemy_hotkey: 'alt+n' } do %>
-      <%= content_tag "sl-tooltip", content: local_assigns[:label] ||
-                Alchemy.t(:button_label, scope: [:uploader, object.class.model_name.i18n_key]), placement: "top-start" do %>
-        <span class="icon_button" tabindex="0"><%= render_icon "upload-2" %></span>
-      <% end %>
-    <% end %>
-  <% end %>
-</alchemy-uploader>
+<% Alchemy::Deprecation.warn(
+  "Rendering the `alchemy/admin/uploader/button` partial is deprecated! `render Alchemy::Admin::UploaderButton.new` instead."
+) %>
+<%= render Alchemy::Admin::UploaderButton.new(
+  object:,
+  file_attribute:,
+  redirect_url:,
+  accept: local_assigns[:accept],
+  dropzone: local_assigns[:dropzone],
+  layout: local_assigns[:layout],
+  label: local_assigns[:label]) %>

data/app/views/alchemy/admin/uploader/_setup.html.erb

@@ -1,3 +1,3 @@
-<script>
-  Alchemy.uploader_defaults = <%== Alchemy.config.uploader.to_json %>
-</script>
+<%= tag.script(type: "application/json", id: "alchemy_uploader_defaults") do %>
+  <%== Alchemy.config.uploader.to_json %>
+<% end %>

data/app/views/alchemy/pages/sitemap.xml.erb

@@ -1,6 +1,8 @@
+<%- cache_if @sitemap_cache_key, @sitemap_cache_key, expires_in: @sitemap_max_age do -%>
 <%- @pages.each do |page| -%>
 <url>
   <loc><%= show_alchemy_page_url(page) %></loc>
   <lastmod><%= page.updated_at.utc.iso8601 %></lastmod>
 </url>
 <%- end -%>
+<%- end -%>