alchemy_cms 7.4.10 → 8.0.0.b

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

@@ -1,21 +1,7 @@
 <div class="resources-header">
-  <% if search_filter_params[:filter].present? %>
-    <b><%= Alchemy.t("filtered_by") %></b>
-    <% search_filter_params[:filter].each do |k, v| %>
-      <%- tmp_params = search_filter_params.dup -%>
-      <%- tmp_params[:filter] = tmp_params[:filter].except(k) -%>
-      <%- dismiss_filter_url = resource_url_proxy.url_for(
-                                { action: 'index' }.merge(tmp_params.except(:page))
-                              ) -%>
-      <div class="applied-filter">
-        <%= Alchemy.t("filters.#{resource_handler.resource_name}.#{k}.values.#{v}", default: v) %>
-        <%= link_to render_icon(:times, size: 'xs'), dismiss_filter_url, class: 'dismiss-filter' %>
-      </div>
-    <% end %>
-  <% end %>
-
   <h2>
     <%= resources_instance_variable.total_count %>
     <%= resource_model.model_name.human(count: resources_instance_variable.total_count) %>
   </h2>
+  <%= render "alchemy/admin/resources/applied_filters" %>
 </div>

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

@@ -30,7 +30,11 @@
       <%= render_message do %>
         <%== Alchemy.t('alchemy/site', scope: :no_resource_found) %>
       <% end %>
-      <%= render 'form', site: Alchemy::Site.new(Alchemy::Config.get(:default_site).merge(public: true)) %>
+      <%= render 'form', site: Alchemy::Site.new(
+          name: Alchemy.config.default_site.name,
+          host: Alchemy.config.default_site.host,
+          public: true
+        ) %>
     </div>
   <% end %>
 </div>

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

@@ -19,63 +19,6 @@
 
 <h1>AlchemyCMS Styleguide</h1>
 
-<h2>Typography</h2>
-
-<h1>Heading 1</h1>
-<h2>Heading 2</h2>
-<h3>Heading 3</h3>
-<h4>Heading 4</h4>
-<h5>Heading 5</h5>
-
-<p>This is a paragraph, with <a href="#">a link</a>, a <kbd>keyboard shortcut</kbd> and an <code>inline code snippet</code>.</p>
-
-<h2>Messages</h2>
-
-<h3>Info Message</h3>
-
-<%= render_message do %>
-  <p>Lorem ipsum <strong>dolor</strong> sit amet, consectetur adipiscing elit.</p>
-<% end %>
-
-<h3>Warning Message</h3>
-
-<%= render_message :warning do %>
-  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
-<% end %>
-
-<h3>Error Message</h3>
-
-<%= render_message :error do %>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-<% end %>
-
-<h3>Growl Messages</h3>
-
-<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
-<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
-<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
-<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
-
-<h2>Dialog Links</h2>
-
-<sl-tooltip content="Open in Dialog">
-  <a
-    href="/admin/styleguide"
-    is="alchemy-dialog-link"
-    class="icon_button"
-    data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
-  >
-    <%= render_icon "window" %>
-  </a>
-</sl-tooltip>
-<a
-  href="#"
-  is="alchemy-dialog-link"
-  class="icon_button disabled"
->
-  <%= render_icon "window" %>
-</a>
-
 <h2>Forms</h2>
 
 <div class="panel">
@@ -94,6 +37,13 @@
       </select>
     </div>
 
+    <div class="input select">
+      <label class="select control-label" for="select">Disabled Select</label>
+      <select class="select" id="disabled-select" is="alchemy-select" disabled>
+        <option value="">Cannot choose</option>
+      </select>
+    </div>
+
     <div class="input">
       <label class="control-label" for="datetime_picker">Date Time Picker</label>
       <alchemy-datepicker input-type="datetime">
@@ -163,7 +113,7 @@
     <div class="input text">
       <label class="text control-label" for="textarea">Textarea</label>
       <textarea class="text" id="textarea"></textarea>
-      <small class="hint">With hint</small>
+      <small class="hint">With hint and a <a href="/admin/styleguide">link</a> inside.</small>
     </div>
 
     <div class="input text tinymce_container">
@@ -180,6 +130,116 @@
   </form>
 </div>
 
+<h2>Buttons</h2>
+
+<p>
+  <button class="secondary" disabled>Disabled Secondary</button>
+  <button type="submit" is="alchemy-button" disabled>Disabled Primary</button>
+</p>
+
+<h2>Selects</h2>
+
+<div style="display: flex; gap: 1em;">
+  <div style="width: 25%">
+    <h3>Select with Search</h3>
+    <select is="alchemy-select" class="full_width">
+      <option value="1">Option 1</option>
+      <option value="2">Option 2</option>
+      <option value="3">Option 3</option>
+      <option value="4">Option 4</option>
+      <option value="5">Option 5</option>
+      <option value="6">Option 6</option>
+      <option value="7">Option 7</option>
+    </select>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Page Select</h3>
+    <%= render Alchemy::Admin::PageSelect.new do %>
+      <input name="page" class="full_width" />
+    <% end %>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Node Select</h3>
+    <%= render Alchemy::Admin::NodeSelect.new do %>
+      <input name="node" class="full_width" />
+    <% end %>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Attachment Select</h3>
+    <%= render Alchemy::Admin::AttachmentSelect.new do %>
+      <input name="attachment" class="full_width" />
+    <% end %>
+  </div>
+</div>
+
+<h3>Tags Autocomplete</h3>
+
+<div style="width: 25%">
+  <alchemy-tags-autocomplete>
+    <input type="text" class="full_width" />
+  </alchemy-tags-autocomplete>
+</div>
+
+<h2>Typography</h2>
+
+<h1>Heading 1</h1>
+<h2>Heading 2</h2>
+<h3>Heading 3</h3>
+<h4>Heading 4</h4>
+<h5>Heading 5</h5>
+
+<p>This is a paragraph, with <a href="#">a link</a>, a <kbd>keyboard shortcut</kbd> and an <code>inline code snippet</code>.</p>
+
+<h2>Messages</h2>
+
+<h3>Info Message</h3>
+
+<%= render_message do %>
+  <p>Lorem ipsum <strong>dolor</strong> sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Warning Message</h3>
+
+<%= render_message :warning do %>
+  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Error Message</h3>
+
+<%= render_message :error do %>
+  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Growl Messages</h3>
+
+<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
+<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
+<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
+<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
+
+<h2>Dialog Links</h2>
+
+<sl-tooltip content="Open in Dialog">
+  <a
+    href="/admin/styleguide"
+    is="alchemy-dialog-link"
+    class="icon_button"
+    data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
+  >
+    <%= render_icon "window" %>
+  </a>
+</sl-tooltip>
+<a
+  href="#"
+  is="alchemy-dialog-link"
+  class="icon_button disabled"
+>
+  <%= render_icon "window" %>
+</a>
+
 <h2>Tables</h2>
 
 <h3>Normal Table</h3>

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

@@ -37,7 +37,7 @@
       <% table.edit_button tooltip: Alchemy.t(:edit_tag), dialog_size: "360x410" %>
     <% end %>
 
-  <%= paginate @tags, theme: 'alchemy' %>
+    <%= render "alchemy/admin/resources/pagination", resources: @tags %>
 
   <% else %>
 

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

@@ -1,20 +1,20 @@
-<% asset_host = ActionController::Base.config.asset_host %>
+<% tinymce_base_path = "#{Rails.application.config.assets.prefix}/tinymce" %>
 
-<link rel="preload" href="<%= asset_host %><%= assets_prefix %>/tinymce/skins/ui/alchemy/skin.min.css" as="style" />
+<link rel="preload" href="<%= asset_path("#{tinymce_base_path}/skins/ui/alchemy/skin.min.css") %>" as="style" />
 <% if Alchemy::Tinymce.init[:content_css] %>
-  <link rel="preload" href="<%= asset_host %><%= Alchemy::Tinymce.init[:content_css] %>" as="style" />
+  <link rel="preload" href="<%= asset_path(Alchemy::Tinymce.init[:content_css]) %>" as="style" />
 <% end %>
 <% Alchemy::Tinymce.preloadable_plugins.each do |plugin| %>
-  <link rel="preload" href="<%= asset_host %><%= assets_prefix %>/tinymce/plugins/<%= plugin %>/plugin.min.js" as="script">
+  <link rel="preload" href="<%= asset_path("#{tinymce_base_path}/plugins/#{plugin}/plugin.min.js") %>" as="script">
 <% end %>
 
 <script>
   // Setting TinyMCE path.
   var tinyMCEPreInit = {
-    <% if ActionController::Base.config.asset_host_set? %>
-    base: '<%= asset_url(assets_prefix + '/tinymce') %>',
+    <% if ActionController::Base.config.asset_host %>
+    base: '<%= asset_url(tinymce_base_path, host: ActionController::Base.config.asset_host) %>',
     <% else %>
-    base: '<%= asset_path(assets_prefix + '/tinymce') %>',
+    base: '<%= tinymce_base_path %>',
     <% end %>
     suffix: '.min'
   };

data/app/{javascript/alchemy_admin/locales/en.js → views/alchemy/admin/translations/_en.js}

@@ -1,4 +1,4 @@
-export const en = {
+Alchemy.translations = {
   allowed_chars: "of %{count} chars",
   cancel: "Cancel",
   cancelled: "Cancelled",
@@ -12,6 +12,7 @@ export const en = {
     "You have unsaved changes on this page. They will be lost if you continue.",
   page_found: "Page found",
   pages_found: "Pages found",
+  "Please confirm": "Please confirm",
   url_validation_failed: "The url has no valid format.",
   warning: "Warning!",
   "File is too large": "File is too large",
@@ -30,5 +31,7 @@ export const en = {
     date: "Y-m-d",
     time: "H:i",
     time_24hr: false
-  }
+  },
+  Yes: "Yes",
+  No: "No"
 }

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

@@ -1,4 +1,4 @@
-<% file_types = configuration(:uploader)['allowed_filetypes'][object.class.model_name.collection] || ['*'] %>
+<% file_types = Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ['*'] %>
 <% accept = file_types == ["*"] ? false : file_types.map {|type| ".#{type}"}.join(", ") %>
 
 <alchemy-uploader dropzone="<%= local_assigns[:dropzone] || "#main_content" %>">

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

@@ -1,8 +1,8 @@
 <script>
   Alchemy.uploader_defaults = {
-    file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
-    upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
-    allowed_filetype_pictures: "<%= configuration(:uploader)['allowed_filetypes']['alchemy/pictures']&.join(", ") || '*' -%>", 
-    allowed_filetype_attachments: "<%= configuration(:uploader)['allowed_filetypes']['alchemy/attachments']&.join(", ") || '*' -%>", 
+    file_size_limit: <%= Alchemy.config.uploader.file_size_limit -%>,
+    upload_limit: <%= Alchemy.config.uploader.upload_limit -%>,
+    allowed_filetype_pictures: "<%= Alchemy.config.uploader.allowed_filetypes.alchemy_pictures.join(", ") -%>",
+    allowed_filetype_attachments: "<%= Alchemy.config.uploader.allowed_filetypes.alchemy_attachments.join(", ") -%>",
   }
 </script>

data/app/views/alchemy/base/error_notice.html.erb

@@ -1,3 +1,3 @@
 <%= render_message :error do %>
-  <strong><%= @notice %></strong>
+  <%= @notice %>
 <% end %>

data/app/views/alchemy/ingredients/_number_editor.html.erb

@@ -0,0 +1,24 @@
+<%= content_tag :div, class: [number_editor.css_classes], data: number_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, number_editor.ingredient) do |f| %>
+    <%= ingredient_label(number_editor) %>
+    <div class="input-field">
+      <%= f.text_field :value,
+        type: number_editor.settings[:input_type] || "number",
+        required: number_editor.presence_validation?,
+        step: number_editor.settings[:step],
+        min: number_editor.settings[:min],
+        max: number_editor.settings[:max],
+        id: number_editor.form_field_id,
+        oninput: number_editor.settings[:input_type] == "range" ? "this.nextElementSibling.value = this.value" : nil
+      %>
+      <% if number_editor.settings[:input_type] == "range" %>
+        <output><%= number_editor.value %></output>
+      <% end %>
+      <% if number_editor.settings[:unit] %>
+        <div class="input-addon right">
+          <%= number_editor.settings[:unit] %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/alchemy/no_index.html.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title><%= Alchemy.t("Welcome to Alchemy") %></title>
+    <%= stylesheet_link_tag("alchemy/welcome", media: "all") %>
+  </head>
+  <body>
+    <div class="container">
+      <%= image_tag("alchemy/alchemy-logo.svg") %>
+      <% if @page.nil? %>
+        <h3>
+          <%= Alchemy.t("There are no pages yet") %>
+        </h3>
+        <p>
+          <%= link_to Alchemy.t("Create your first page"),
+            alchemy.admin_pages_path, class: "button" %>
+        </p>
+      <% else %>
+        <h3>
+          <%= Alchemy.t("There are no published pages yet") %>
+        </h3>
+        <p>
+          <%= link_to Alchemy.t("Publish your homepage"),
+            alchemy.edit_admin_page_path(@page), class: "button" %>
+        </p>
+      <% end %>
+    </div>
+  </body>
+</html>

data/app/views/alchemy/welcome.html.erb

@@ -1,25 +1,27 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Welcome to AlchemyCMS</title>
-    <%= stylesheet_link_tag "alchemy/welcome", media: "all" %>
+    <title><%= Alchemy.t("Welcome to Alchemy") %></title>
+    <%= stylesheet_link_tag("alchemy/welcome", media: "all") %>
   </head>
   <body>
     <div class="container">
-      <%= image_tag 'alchemy/alchemy-logo.svg' %>
-      <h3>You have successfully installed AlchemyCMS!</h3>
+      <%= image_tag("alchemy/alchemy-logo.svg") %>
+      <h3><%= Alchemy.t("You have successfully installed Alchemy") %></h3>
       <p>
-        Thank you for using Alchemy. We hope you enjoy using it as much as we do.
+        <%= Alchemy.t("Before creating your first page you need an admin user") %>.
       </p>
       <p>
-        The first thing you probably want to do before creating your first page:
+        <%= link_to Alchemy.t("Create admin user"), Alchemy.signup_path, class: "button" %>
       </p>
+      <h4><%= Alchemy.t("More resources") %></h4>
       <ul>
-        <li><%= link_to 'Create your first admin user', Alchemy.signup_path %></li>
-        <li><%= link_to 'Read the guidelines', 'http://guides.alchemy-cms.com/stable', target: '_blank' %></li>
+        <li>
+          <%= link_to Alchemy.t("Read the guidelines"),
+            "https://guides.alchemy-cms.com/", target: "_blank", rel: "noopener" %>
+        </li>
       </ul>
     </div>
   </body>

data/app/views/kaminari/alchemy/_first_page.html.erb

@@ -11,7 +11,9 @@
     <%= render_icon("skip-left") %>
   </span>
 <% else %>
-  <%= link_to url, remote: remote, title: Alchemy.t(:first, scope: 'pagination'), class: 'first-page' do %>
-    <%= render_icon("skip-left") %>
-  <% end %>
+  <sl-tooltip content="<%= Alchemy.t(:first, scope: 'pagination') %>" placement="top-start">
+    <%= link_to url, remote: remote, class: 'first-page' do %>
+      <%= render_icon("skip-left") %>
+    <% end %>
+  </sl-tooltip>
 <% end %>

data/app/views/kaminari/alchemy/_last_page.html.erb

@@ -11,7 +11,9 @@
     <%= render_icon("skip-right") %>
   </span>
 <% else %>
-  <%= link_to url, remote: remote, title: Alchemy.t(:last, scope: 'pagination'), class: 'last-page' do %>
-    <%= render_icon("skip-right") %>
-  <% end %>
+  <sl-tooltip content="<%= Alchemy.t(:last, scope: 'pagination') %>" placement="top-end">
+    <%= link_to url, remote: remote, class: 'last-page' do %>
+      <%= render_icon("skip-right") %>
+    <% end %>
+  </sl-tooltip>
 <% end %>

data/app/views/kaminari/alchemy/_next_page.html.erb

@@ -11,7 +11,9 @@
     <%= render_icon("arrow-right-s") %>
   </span>
 <% else -%>
-  <%= link_to url, rel: 'next', remote: remote, title: Alchemy.t(:next_page, scope: 'pagination'), class: 'next_page' do %>
-    <%= render_icon("arrow-right-s") %>
-  <% end %>
+  <sl-tooltip content="<%= Alchemy.t(:next_page, scope: 'pagination') %>" placement="top-end">
+    <%= link_to url, rel: 'next', remote: remote, class: 'next_page' do %>
+      <%= render_icon("arrow-right-s") %>
+    <% end %>
+  </sl-tooltip>
 <% end -%>

data/app/views/kaminari/alchemy/_paginator.html.erb

@@ -8,19 +8,24 @@
 -%>
 <div class="pagination">
   <%= paginator.render do -%>
-    <%= first_page_tag %>
-    <%= prev_page_tag -%>
-    <% each_page do |page| -%>
-      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-        <%= page_tag page -%>
-      <% elsif !page.was_truncated? -%>
-        <%= gap_tag -%>
+    <div class="arrows">
+      <%= first_page_tag %>
+      <%= prev_page_tag -%>
+    </div>
+
+    <div class="pages">
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page -%>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag -%>
+        <% end -%>
       <% end -%>
-    <% end -%>
-    <%= next_page_tag -%>
-    <%= last_page_tag %>
+    </div>
+
+    <div class="arrows">
+      <%= next_page_tag -%>
+      <%= last_page_tag %>
+    </div>
   <% end -%>
-  <% unless local_assigns[:hide_per_page_select] %>
-    <%= render 'alchemy/admin/resources/per_page_select' %>
-  <% end %>
 </div>

data/app/views/kaminari/alchemy/_prev_page.html.erb

@@ -11,7 +11,9 @@
     <%= render_icon("arrow-left-s") %>
   </span>
 <% else -%>
-  <%= link_to url, rel: 'prev', remote: remote, class: 'previous_page', title: Alchemy.t(:previous_page, scope: 'pagination') do %>
-    <%= render_icon("arrow-left-s") %>
-  <% end %>
+  <sl-tooltip class="pagination-label" content="<%= Alchemy.t(:previous_page, scope: 'pagination') %>" placement="top-start">
+    <%= link_to url, rel: 'prev', remote: remote, class: 'previous_page' do %>
+      <%= render_icon("arrow-left-s") %>
+    <% end %>
+  </sl-tooltip>
 <% end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -3,14 +3,15 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="color-scheme" content="light dark">
     <title><%= render_alchemy_title %></title>
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
-    <link rel="preload" href="<%= asset_path("remixicon.symbol.svg") %>" as="image" type="<%= Mime::Type.lookup_by_extension(:svg) %>" crossorigin>
+    <link rel="preload" href="<%= asset_path("alchemy/icons-sprite.svg") %>" as="image" type="<%= Mime::Type.lookup_by_extension(:svg) %>" crossorigin>
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
     <meta name="turbo-prefetch" content="false">
     <meta name="turbo-cache-control" content="no-cache">
-    <%= stylesheet_link_tag('alchemy/custom-properties', media: 'screen', 'data-turbo-track' => true) %>
+    <%= stylesheet_link_tag('alchemy/theme', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/admin', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/admin/print', media: 'print', 'data-turbo-track' => true) %>
     <% Alchemy.admin_stylesheets.each do |stylesheet| %>
@@ -22,10 +23,11 @@
       var Alchemy = {};
       // Store regular expression for external link url matching.
       Alchemy.link_url_regexp = <%= link_url_regexp.inspect %>;
+      // JS translations
+      <%= alchemy_admin_js_translations %>
     </script>
     <%= render 'alchemy/admin/tinymce/setup' %>
     <%= render 'alchemy/admin/partials/routes' %>
-    <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
     <% Alchemy.admin_js_imports.each do |path| %>
       <script type="module">
@@ -35,7 +37,7 @@
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy',
-    class: alchemy_body_class + ["alchemy-light"],
+    class: alchemy_body_class,
     style: cookies["alchemy-elements-window-width"] && "--elements-window-width: #{cookies["alchemy-elements-window-width"]}px" do %>
     <noscript>
       <h1><%= Alchemy.t(:javascript_disabled_headline) %></h1>
@@ -49,23 +51,26 @@
         <% end %>
         <%= yield(:alchemy_main_navigation) %>
       </div>
-      <div id="logout" class="main_navi_entry">
-        <% if current_alchemy_user %>
-          <%= link_to_dialog(
-            %(
-              #{render_icon('logout-box-r', class: 'module')}
-              <label>#{Alchemy.t(:leave)}</label>
-            ).html_safe,
-            alchemy.leave_admin_path, {
-              size: "300x155",
-              title: Alchemy.t("Leave Alchemy")
-          }, {'data-alchemy-hotkey' => 'alt+q'}) %>
-        <% else %>
-          <%= link_to(alchemy.root_path) do %>
-            <%= render_icon "logout-box-r", size: "lg" %>
-            <label><%= Alchemy.t(:leave) %></label>
+
+      <div id="logout">
+        <div class="main_navi_entry">
+          <% if current_alchemy_user %>
+            <%= link_to_dialog(
+              %(
+                #{render_icon('logout-box-r', class: 'module')}
+                <label>#{Alchemy.t(:leave)}</label>
+              ).html_safe,
+              alchemy.leave_admin_path, {
+                size: "300x155",
+                title: Alchemy.t("Leave Alchemy")
+            }, {'data-alchemy-hotkey' => 'alt+q'}) %>
+          <% else %>
+            <%= link_to(alchemy.root_path) do %>
+              <%= render_icon "logout-box-r", size: "lg" %>
+              <label><%= Alchemy.t(:leave) %></label>
+            <% end %>
           <% end %>
-        <% end %>
+        </div>
       </div>
     </div>
     <% if current_alchemy_user %>
@@ -93,10 +98,6 @@
     <div id="main_content">
       <%= yield %>
     </div>
-    <script type="module">
-      // Setting the correct locale for select2 dropdown replacement.
-      $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
-    </script>
     <%= render 'alchemy/admin/uploader/setup' %>
     <%= yield(:javascripts) %>
   <% end %>

data/config/alchemy/config.yml

@@ -13,7 +13,7 @@ auto_logout_time: 30
 #
 # Enable/Disable page caching globally.
 #
-# NOTE: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
+# NOTE: You can enable/disable page caching for single Alchemy::Definitions in the page_layout.yml file.
 #
 cache_pages: true
 
@@ -87,6 +87,7 @@ items_per_page: 15
 output_image_quality: 85
 preprocess_image_resize:
 image_output_format: original
+sharpen_images: false
 
 # This is used by the seeder to create the default site.
 default_site:
@@ -110,7 +111,7 @@ default_language:
 #
 # ==== Options:
 #
-#   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
+#   page_layout_name:           [String] # A +Alchemy::PageDefinition+ name. Used to render the contactform on a page with this layout.
 #   fields:                     [Array]  # An Array of fieldnames.
 #   validate_fields:            [Array]  # An Array of fieldnames to be validated on presence.
 #

data/config/initializers/dragonfly.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dragonfly_svg"
 require "alchemy/dragonfly/processors/crop_resize"
 require "alchemy/dragonfly/processors/auto_orient"
 require "alchemy/dragonfly/processors/thumbnail"