alchemy_cms 8.0.12 → 8.1.0

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

@@ -32,7 +32,7 @@
       <select class="select" id="select" is="alchemy-select">
         <option value="">Please choose</option>
         <option value="1">Option 1</option>
-        <option selected="selected" value="2">Option 2</option>
+        <option selected value="2">Option 2</option>
         <option value="3">Option 3</option>
       </select>
     </div>
@@ -47,7 +47,7 @@
     <div class="input">
       <label class="control-label" for="datetime_picker">Date Time Picker</label>
       <alchemy-datepicker input-type="datetime">
-        <input type="text" id="datetime_picker">
+        <input type="text" id="datetime_picker" autocomplete="off">
       </alchemy-datepicker>
     </div>
 
@@ -57,12 +57,12 @@
         <div class="input-row">
           <div class="input-column">
             <alchemy-datepicker input-type="date">
-              <input type="text" id="date_picker">
+              <input type="text" id="date_picker" autocomplete="off">
             </alchemy-datepicker>
           </div>
           <div class="input-column">
             <alchemy-datepicker input-type="time">
-              <input type="text" id="time_picker">
+              <input type="text" id="time_picker" autocomplete="off">
             </alchemy-datepicker>
           </div>
         </div>
@@ -71,23 +71,23 @@
 
     <div class="input">
       <label class="control-label" for="optional_string">String</label>
-      <input type="text" id="optional_string">
+      <input type="text" id="optional_string" autocomplete="off">
     </div>
     <div class="input required">
       <label class="required control-label" for="required_string">
         Required String<abbr title="required">*</abbr>
       </label>
-      <input type="text" id="required_string">
+      <input type="text" id="required_string" autocomplete="off">
     </div>
     <div class="input field_with_errors">
       <label class="control-label" for="string_with_error">String with error</label>
-      <input type="text" id="string_with_error">
+      <input type="text" id="string_with_error" autocomplete="off">
       <small class="error">Error message</small>
     </div>
     <alchemy-char-counter max-chars="60">
       <div class="input">
         <label class="control-label" for="string_with_counter">String with char counter</label>
-        <input type="text" id="string_with_counter">
+        <input type="text" id="string_with_counter" autocomplete="off">
       </div>
     </alchemy-char-counter>
 
@@ -95,7 +95,7 @@
       <label class="control-label">Check Boxes</label>
       <div class="control_group">
         <label class="checkbox">
-          <input type="checkbox" value="1" checked="checked">
+          <input type="checkbox" value="1" checked>
           Checked
         </label>
         <label class="checkbox">
@@ -140,7 +140,7 @@
 <h2>Selects</h2>
 
 <div style="display: flex; gap: 1em;">
-  <div style="width: 25%">
+  <div style="width: 20%">
     <h3>Select with Search</h3>
     <select is="alchemy-select" class="full_width">
       <option value="1">Option 1</option>
@@ -153,24 +153,29 @@
     </select>
   </div>
 
-  <div style="width: 25%">
+  <div style="width: 20%">
     <h3>Page Select</h3>
     <%= render Alchemy::Admin::PageSelect.new do %>
-      <input name="page" class="full_width" />
+      <input name="page" class="full_width">
     <% end %>
   </div>
 
-  <div style="width: 25%">
+  <div style="width: 20%">
+    <h3>Element Select</h3>
+    <%= render Alchemy::Admin::ElementSelect.new(Alchemy::Element.definitions) %>
+  </div>
+
+  <div style="width: 20%">
     <h3>Node Select</h3>
     <%= render Alchemy::Admin::NodeSelect.new do %>
-      <input name="node" class="full_width" />
+      <input name="node" class="full_width">
     <% end %>
   </div>
 
-  <div style="width: 25%">
+  <div style="width: 20%">
     <h3>Attachment Select</h3>
     <%= render Alchemy::Admin::AttachmentSelect.new do %>
-      <input name="attachment" class="full_width" />
+      <input name="attachment" class="full_width">
     <% end %>
   </div>
 </div>
@@ -179,7 +184,7 @@
 
 <div style="width: 25%">
   <alchemy-tags-autocomplete>
-    <input type="text" class="full_width" />
+    <input type="text" class="full_width" autocomplete="off">
   </alchemy-tags-autocomplete>
 </div>
 
@@ -198,19 +203,19 @@
 <h3>Info Message</h3>
 
 <%= render_message do %>
-  <p>Lorem ipsum <strong>dolor</strong> sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+  <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>
+  <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>
+  <p>Lorem ipsum dolor sit amet, <a href="#">consectetur</a> adipiscing elit.</p>
 <% end %>
 
 <h3>Growl Messages</h3>

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

@@ -13,7 +13,7 @@
     <div class="input tags">
       <label class="control-label"><%= Alchemy.t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">
-        <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
+        <%= render Alchemy::Admin::ListFilter.new(".tag-list li", placeholder: Alchemy.t("Filter tags")) %>
         <ul class="tags tag-list">
           <%= render partial: "radio_tag", collection: @tags, locals: {name: "tag"} %>
         </ul>

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

@@ -1,8 +1,8 @@
 <% tinymce_base_path = "#{Rails.application.config.assets.prefix}/tinymce" %>
 
-<link rel="preload" href="<%= asset_path("#{tinymce_base_path}/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_path(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_path("#{tinymce_base_path}/plugins/#{plugin}/plugin.min.js") %>" as="script">

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

@@ -1,7 +1,7 @@
 <% 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 dropzone="<%= local_assigns[:dropzone] || "#main_content" %>">
+<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,
@@ -15,17 +15,3 @@
     <% end %>
   <% end %>
 </alchemy-uploader>
-
-<script type='text/javascript'>
-  document.querySelector("alchemy-uploader").addEventListener("Alchemy.upload.successful", (evt) => {
-    setTimeout(() => {
-      var url = '<%= redirect_url.html_safe %>';
-      evt.target.uploadProgress.visible = false;
-      <% if local_assigns[:in_dialog] %>
-      $.get(url, null, null, 'script');
-      <% else %>
-      Turbo.visit(url);
-      <% end %>
-    }, 1000)
-  })
-</script>

data/app/views/alchemy/attachments/show.html.erb

@@ -1 +1 @@
-<%#= @attachment.public_filename %>
+<%#= @attachment.public_filename %>

data/app/views/alchemy/base/permission_denied.js.erb

@@ -1,3 +1,3 @@
 Alchemy.closeCurrentDialog(function() {
-  Turbo.visit('<%= Alchemy.login_path %>');
+  Turbo.visit('<%= Alchemy.config.login_path %>');
 });

data/app/views/alchemy/ingredients/shared/_anchor.html.erb

@@ -1,9 +1,11 @@
 <span class="edit-ingredient-anchor-link">
-  <%= link_to_dialog render_icon(:bookmark, { style: ingredient_editor.dom_id.present? ? "fill" : "line" }),
-    alchemy.edit_admin_ingredient_path(id: ingredient_editor.id),
-    {
-      title: Alchemy.t(:edit_anchor),
-      size: "380x125"
-    },
-    title: Alchemy.t(:edit_anchor) %>
+  <% disabled = cannot?(:edit, ingredient) %>
+  <%= content_tag "sl-tooltip", content: Alchemy.t(:edit_anchor), disabled: disabled do %>
+    <%= link_to_dialog render_icon(:bookmark, { style: ingredient.dom_id.present? ? "fill" : "line" }),
+      disabled ? nil : alchemy.edit_admin_ingredient_path(id: ingredient.id),
+      {
+        title: Alchemy.t(:edit_anchor),
+        size: "380x125"
+      } %>
+  <% end %>
 </span>

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -1,10 +1,17 @@
-<%= content_tag "alchemy-link-buttons", class: local_assigns[:wrapper_class], data: {ingredient_id: ingredient_editor.id} do %>
-  <%= content_tag "sl-tooltip", content: Alchemy.t(:place_link) do %>
+<% disabled = cannot?(:edit, ingredient) %>
+<%= content_tag "alchemy-link-buttons", class: local_assigns[:wrapper_class], data: {ingredient_id: ingredient.id} do %>
+  <%= content_tag "sl-tooltip",
+    content: Alchemy.t(:place_link),
+    disabled: disabled do %>
     <%= content_tag "button", "", is: "alchemy-link-button",
-      class: [ingredient_editor.linked? ? "linked" : nil] %>
+      disabled: disabled,
+      class: [ingredient.linked? ? "linked" : nil] %>
   <% end %>
-  <%= content_tag "sl-tooltip", content: Alchemy.t(:unlink) do %>
+  <%= content_tag "sl-tooltip",
+    content: Alchemy.t(:unlink),
+    disabled: disabled do %>
     <%= content_tag "button", "", is: "alchemy-unlink-button",
-      class: [ingredient_editor.linked? ? "linked" : "disabled"] %>
+      disabled: disabled,
+      class: [ingredient.linked? ? "linked" : "disabled"] %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -1,27 +1,26 @@
 <% linkable = picture_editor.settings[:linkable] != false %>
 <% croppable = picture_editor.allow_image_cropping? %>
+<% disabled = cannot?(:edit, picture_editor.ingredient) %>
 
-<%= content_tag "sl-tooltip", content: Alchemy.t("Edit Picturemask"), placement: "top-start", disabled: !croppable do %>
+<%= content_tag "sl-tooltip", content: Alchemy.t("Edit Picturemask"), placement: "top-start", disabled: !croppable || disabled do %>
   <%= link_to_dialog render_icon(:crop),
-    alchemy.crop_admin_ingredient_path(picture_editor.ingredient, {
+    (croppable && !disabled) ? alchemy.crop_admin_ingredient_path(picture_editor.ingredient, {
       crop_from_form_field_id: picture_editor.form_field_id(:crop_from),
       crop_size_form_field_id: picture_editor.form_field_id(:crop_size),
       picture_id: picture_editor.picture&.id
-    }), {
+    }) : nil, {
       size: "1080x615",
       title: Alchemy.t("Edit Picturemask"),
       image_loader: false,
       padding: false
     }, {
-      class: croppable ? "crop_link icon_button" : "disabled crop_link icon_button" ,
-      tabindex: croppable ? nil : "-1",
-      onclick: "return false"
+      class: "crop_link icon_button"
     } %>
 <% end %>
 
-<%= content_tag "sl-tooltip", content: picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image) do %>
+<%= content_tag "sl-tooltip", content: picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image), disabled: disabled do %>
   <%= link_to_dialog render_icon("image-add"),
-    alchemy.admin_pictures_path(
+    disabled ? nil : alchemy.admin_pictures_path(
       form_field_id: picture_editor.form_field_id(:picture_id)
     ),
     {
@@ -33,15 +32,15 @@
 <% end %>
 
 <% if linkable %>
-  <%= render "alchemy/ingredients/shared/link_tools", ingredient_editor: picture_editor %>
+  <%= render "alchemy/ingredients/shared/link_tools", ingredient: picture_editor.ingredient %>
 <% else %>
   <span class="icon_button disabled"><%= render_icon("link", style: "m") %></span>
   <span class="icon_button disabled"><%= render_icon("link-unlink", style: "m") %></span>
 <% end %>
 
-<%= content_tag "sl-tooltip", content: Alchemy.t(:edit_image_properties), placement: "top-end" do %>
+<%= content_tag "sl-tooltip", content: Alchemy.t(:edit_image_properties), placement: "top-end", disabled: disabled do %>
   <%= link_to_dialog render_icon(:edit),
-    alchemy.edit_admin_ingredient_path(id: picture_editor.id, language_id: @page.language_id),
+    disabled ? nil : alchemy.edit_admin_ingredient_path(id: picture_editor.id, language_id: @page.language_id),
     {
       title: Alchemy.t(:edit_image_properties),
       size: "380x255"

data/app/views/alchemy/language_links/_spacer.html.erb

@@ -1 +1 @@
-<%= options[:spacer].html_safe %>
+<%= options[:spacer].html_safe %>

data/app/views/alchemy/messages_mailer/new.html.erb

@@ -1 +1 @@
-<%= render_elements %>
+<%= render_elements %>

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

@@ -14,7 +14,7 @@
         <%= Alchemy.t("Before creating your first page you need an admin user") %>.
       </p>
       <p>
-        <%= link_to Alchemy.t("Create admin user"), Alchemy.signup_path, class: "button" %>
+        <%= link_to Alchemy.t("Create admin user"), Alchemy.config.signup_path, class: "button" %>
       </p>
       <h4><%= Alchemy.t("More resources") %></h4>
       <ul>

data/config/locales/alchemy.en.yml

@@ -225,6 +225,11 @@ en:
         aliases: Enter additional domains this site should be accessible by. Please separate them by space or new line.
 
     admin:
+      attachments:
+        sorting_select:
+          label: "Sorting"
+          by_latest: "Latest"
+          alphabetical: "A-Z"
       elements:
         toolbar:
           hide: Hide
@@ -233,6 +238,9 @@ en:
           label: "Sorting"
           by_latest: "Latest"
           alphabetical: "A-Z"
+      publish_page_button:
+        publish_page: "Publish page"
+        publish_changes: "Publish changes"
     add_nested_element: "Add %{name}"
     anchor: "Anchor"
     anchor_link_headline: You can link to an anchor from the current page.
@@ -354,9 +362,9 @@ en:
     "Visit page": "Visit page"
     "Warning!": "Warning!"
     ingredient_deprecated: "WARNING! This field is deprecated and will be removed soon. Please do not use it anymore."
-    element_definition_missing: "WARNING! Missing element definition. Please check your elements.yml file."
+    element_definition_missing: "WARNING: Missing element definition! Please check your element definitions."
     element_deprecated: "WARNING! This element is deprecated and will be removed soon. Please do not use it anymore."
-    page_definition_missing: "WARNING! Missing page layout definition. Please check your page_layouts.yml file."
+    page_definition_missing: "WARNING: Missing page layout definition! Please check your page definitions."
     "Welcome to Alchemy": "Welcome to Alchemy"
     "Who else is online": "Who else is online"
     "Yes": "Yes"
@@ -391,7 +399,6 @@ en:
     confirm_to_delete_menu: "Do you really want to delete this menu?"
     confirm_to_delete_node: "Do you really want to delete this menu node?"
     confirm_to_delete_page: "Do you really want to delete this page?"
-    confirm_to_flush_cache: "Do you really want to flush the page cache? This will might take a while and can make first page requests slow."
     ingredient_validations_headline: "Please check marked fields below"
     copy: "copy"
     copy_element: "Copy this element"
@@ -408,6 +415,7 @@ en:
     create_node: "Add a menu node"
     create_page: "Create a new subpage"
     currently_edited_by: "This page is locked by"
+    custom_color: "Custom color"
     cut_element: "Cut this element."
     delete_file: "Delete this file from server."
     delete_image: "Remove this image"
@@ -531,6 +539,7 @@ en:
       alchemy/node: "<h2>You do not have any menus yet.</h2><p>With menus your users can navigate your website. You can have multiple menus on your website. How many depends on your website template.</p><p>Please chose which menu you want to create first.</p>"
       alchemy/site: "<h2>You do not have any websites yet.</h2><p>In order to serve requests you need to create a website first.</p><p>This form has been filled with sensible defaults that work in most cases.</p>"
     no_search_results: "Your search did not return any results."
+    no_unpublished_changes: "No unpublished changes"
     "not a valid image": "This is not an valid image."
     "or": "or"
     or_replace_it_with_an_existing_tag: "Or replace it with an existing tag"

data/config/routes.rb

@@ -7,7 +7,7 @@ Alchemy::Engine.routes.draw do
 
   get "/sitemap.xml", to: "pages#sitemap", format: "xml"
 
-  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
+  scope Alchemy.admin_path, constraints: Alchemy.admin_constraints do
     get "/", to: redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
     get "/dashboard", to: "admin/dashboard#index", as: :admin_dashboard
     get "/dashboard/info", to: "admin/dashboard#info", as: :dashboard_info
@@ -16,7 +16,7 @@ Alchemy::Engine.routes.draw do
     get "/leave", to: "admin/base#leave", as: :leave_admin
   end
 
-  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
+  namespace :admin, path: Alchemy.admin_path, constraints: Alchemy.admin_constraints do
     resources :nodes
 
     resources :pages do

data/db/migrate/20230123112425_add_searchable_to_alchemy_pages.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddSearchableToAlchemyPages < ActiveRecord::Migration[6.0]
+class AddSearchableToAlchemyPages < ActiveRecord::Migration[7.2]
   def change
     return if column_exists?(:alchemy_pages, :searchable)
 

data/db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb

@@ -1,4 +1,4 @@
-class AddIndexesToAlchemyPictures < ActiveRecord::Migration[6.1]
+class AddIndexesToAlchemyPictures < ActiveRecord::Migration[7.2]
   def change
     add_index :alchemy_pictures, :name, if_not_exists: true
     add_index :alchemy_pictures, :image_file_name, if_not_exists: true

data/db/migrate/20231113104432_create_page_mutexes.rb

@@ -1,4 +1,4 @@
-class CreatePageMutexes < ActiveRecord::Migration[6.1]
+class CreatePageMutexes < ActiveRecord::Migration[7.2]
   def change
     create_table :alchemy_page_mutexes do |t|
       t.references :page, null: false, index: {unique: true}, foreign_key: {to_table: :alchemy_pages}

data/db/migrate/20240314105244_create_alchemy_picture_descriptions.rb

@@ -1,4 +1,4 @@
-class CreateAlchemyPictureDescriptions < ActiveRecord::Migration[7.0]
+class CreateAlchemyPictureDescriptions < ActiveRecord::Migration[7.2]
   def change
     create_table :alchemy_picture_descriptions do |t|
       t.belongs_to :picture, null: false, foreign_key: {to_table: :alchemy_pictures}

data/db/migrate/20250626160259_add_unique_index_to_picture_descriptions.rb

@@ -1,4 +1,4 @@
-class AddUniqueIndexToPictureDescriptions < ActiveRecord::Migration[7.0]
+class AddUniqueIndexToPictureDescriptions < ActiveRecord::Migration[7.2]
   disable_ddl_transaction! if connection.adapter_name.match?(/postgres/i)
 
   def change

data/db/migrate/20250905140323_add_created_at_index_to_pictures_and_attachments.rb

@@ -1,4 +1,4 @@
-class AddCreatedAtIndexToPicturesAndAttachments < ActiveRecord::Migration[7.1]
+class AddCreatedAtIndexToPicturesAndAttachments < ActiveRecord::Migration[7.2]
   disable_ddl_transaction! if connection.adapter_name.match?(/postgres/i)
 
   def change

data/db/migrate/20251106150010_convert_select_value_for_multiple.rb

@@ -0,0 +1,11 @@
+class ConvertSelectValueForMultiple < ActiveRecord::Migration[7.1]
+  def up
+    say_with_time "Converting Alchemy::Ingredients::Select values to multiple" do
+      update <<-SQL.squish
+        UPDATE alchemy_ingredients
+        SET value = '["' || value || '"]'
+        WHERE type = 'Alchemy::Ingredients::Select' AND value NOT LIKE '["%"]';
+      SQL
+    end
+  end
+end

data/db/migrate/20260102121232_add_metadata_to_page_versions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddMetadataToPageVersions < ActiveRecord::Migration[7.2]
+  def change
+    add_column :alchemy_page_versions, :title, :string
+    add_column :alchemy_page_versions, :meta_description, :text
+    add_column :alchemy_page_versions, :meta_keywords, :text
+  end
+end

data/db/migrate/20260115164704_add_publication_timestamps_to_alchemy_elements.rb

@@ -0,0 +1,30 @@
+class AddPublicationTimestampsToAlchemyElements < ActiveRecord::Migration[7.2]
+  def up
+    add_column :alchemy_elements, :public_on, :datetime
+    add_column :alchemy_elements, :public_until, :datetime
+
+    say_with_time "Populating publication dates" do
+      update <<-SQL.squish
+        UPDATE alchemy_elements
+        SET public_on = created_at
+        WHERE public = #{connection.quoted_true}
+      SQL
+    end
+  end
+
+  def down
+    say_with_time "Reverting publication dates" do
+      update <<-SQL.squish
+        UPDATE alchemy_elements
+        SET public = CASE
+          WHEN public_on IS NOT NULL AND public_on <= CURRENT_TIMESTAMP
+          THEN #{connection.quoted_true}
+          ELSE #{connection.quoted_false}
+        END
+      SQL
+    end
+
+    remove_column :alchemy_elements, :public_until
+    remove_column :alchemy_elements, :public_on
+  end
+end

data/db/migrate/20260115164705_add_index_to_element_publication_timestamps.rb

@@ -0,0 +1,13 @@
+class AddIndexToElementPublicationTimestamps < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction! if connection.adapter_name.match?(/postgres/i)
+
+  def change
+    add_index :alchemy_elements, [:public_on, :public_until], algorithm: algorithm
+  end
+
+  private
+
+  def algorithm
+    connection.adapter_name.match?(/postgres/i) ? :concurrently : nil
+  end
+end

data/lib/alchemy/ability_helper.rb

@@ -14,9 +14,7 @@ module Alchemy::AbilityHelper
   def current_ability
     @current_ability ||= begin
       alchemy_permissions = Alchemy::Permissions.new(current_alchemy_user)
-      Alchemy.registered_abilities.each do |klass|
-        # Ensure to avoid issues with Rails constant lookup.
-        klass = "::#{klass}".constantize
+      Alchemy.config.abilities.each do |klass|
         alchemy_permissions.merge(klass.new(current_alchemy_user))
       end
       alchemy_permissions