alchemy_cms 7.1.7 → 7.2.0.rc1

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

@@ -12,20 +12,25 @@
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>
     <% end %>
 
-    <% if has_level_select %>
-      <div class="input-addon right<%= " second" if has_size_select %>">
+    <div class="input-addon right<%= " second" if has_size_select %>">
+      <sl-tooltip content="<%= f.object.class.human_attribute_name(:level) %>">
         <%= f.select :level,
           options_for_select(headline_editor.level_options, headline_editor.level),
           {},
-          { class: "custom-select", title: f.object.class.human_attribute_name(:level) } %>
-      </div>
-    <% end %>
+          {
+            class: "custom-select",
+            disabled: !has_level_select
+          } %>
+      </sl-tooltip>
+    </div>
 
     <% if has_size_select %>
       <div class="input-addon right">
-        <%= f.select :size, options_for_select(headline_editor.size_options, headline_editor.size),
-          {},
-          { class: "custom-select", title: f.object.class.human_attribute_name(:size) } %>
+        <sl-tooltip content="<%= f.object.class.human_attribute_name(:size) %>">
+          <%= f.select :size, options_for_select(headline_editor.size_options, headline_editor.size),
+            {},
+            { class: "custom-select" } %>
+        </sl-tooltip>
       </div>
     <% end %>
   <% end %>

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

@@ -27,7 +27,7 @@
               title: Alchemy.t(:image_name, name: picture_editor.picture.name),
             ) %>
           <% else %>
-            <%= render_icon(:image) %>
+            <%= render_icon(:image, size: "xl") %>
           <% end %>
         </div>
       </div>

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

@@ -41,7 +41,7 @@
 
 <%= content_tag "sl-tooltip", content: Alchemy.t(:edit_image_properties), placement: "top-end" do %>
   <%= link_to_dialog render_icon(:edit),
-    alchemy.edit_admin_ingredient_path(id: picture_editor.id),
+    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/_language.html.erb

@@ -6,7 +6,7 @@
   ),
   class: [
     language.code,
-    Alchemy::Language.current.id == language.id ? 'active' : nil,
+    Alchemy::Current.language.id == language.id ? 'active' : nil,
     languages.first == language ? 'first' : nil,
     languages.last == language ? 'last' : nil
   ].compact,

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

@@ -8,10 +8,10 @@
 -%>
 <% if current_page.first? %>
   <span class="first-page disabled">
-    <i class="icon ri-skip-left-line ri-fw"></i>
+    <%= render_icon("skip-left") %>
   </span>
 <% else %>
   <%= link_to url, remote: remote, title: Alchemy.t(:first, scope: 'pagination'), class: 'first-page' do %>
-    <i class="icon ri-skip-left-line ri-fw"></i>
+    <%= render_icon("skip-left") %>
   <% end %>
 <% end %>

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

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><i class="icon ri-more-line"></i></span>
+<span class="page gap"><%= render_icon(:more) %></span>

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

@@ -8,10 +8,10 @@
 -%>
 <% if current_page.last? %>
   <span class="last-page disabled">
-    <i class="icon ri-skip-right-line ri-fw"></i>
+    <%= render_icon("skip-right") %>
   </span>
 <% else %>
   <%= link_to url, remote: remote, title: Alchemy.t(:last, scope: 'pagination'), class: 'last-page' do %>
-    <i class="icon ri-skip-right-line ri-fw"></i>
+    <%= render_icon("skip-right") %>
   <% end %>
 <% end %>

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

@@ -8,10 +8,10 @@
 -%>
 <% if current_page.last? -%>
   <span class="next_page disabled">
-    <i class="icon ri-arrow-right-s-line ri-fw"></i>
+    <%= 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 %>
-    <i class="icon ri-arrow-right-s-line ri-fw"></i>
+    <%= render_icon("arrow-right-s") %>
   <% end %>
 <% end -%>

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

@@ -8,10 +8,10 @@
 -%>
 <% if current_page.first? -%>
   <span class="previous_page disabled">
-    <i class="icon ri-arrow-left-s-line ri-fw"></i>
+    <%= 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 %>
-    <i class="icon ri-arrow-left-s-line ri-fw"></i>
+    <%= render_icon("arrow-left-s") %>
   <% end %>
 <% end -%>

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

@@ -7,6 +7,7 @@
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
+    <meta name="alchemy-icon-sprite" content="<%= asset_path("remixicon.symbol.svg") %>">
     <%= stylesheet_link_tag('alchemy/admin/all', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/print', media: 'print', 'data-turbo-track' => true) %>
     <%= yield :stylesheets %>
@@ -20,11 +21,9 @@
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
-    <% if Alchemy.admin_js_imports.any? %>
+    <% Alchemy.admin_js_imports.each do |path| %>
       <script type="module">
-        <% Alchemy.admin_js_imports.each do |path| %>
-          import "<%= path %>"
-        <% end %>
+        import "<%= path %>"
       </script>
     <% end %>
     <%= yield :javascript_includes %>
@@ -55,7 +54,7 @@
           }, {'data-alchemy-hotkey' => 'alt+q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
-            <i class="icon ri-logout-box-r-line ri-fw ri-lg"></i>
+            <%= render_icon "logout-box-r", size: "lg" %>
             <label><%= Alchemy.t(:leave) %></label>
           <% end %>
         <% end %>

data/bundles/shoelace.js

@@ -6,5 +6,7 @@ import "@shoelace-style/shoelace/dist/components/tab-group/tab-group.js"
 import "@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js"
 import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"
 import "@shoelace-style/shoelace/dist/components/progress-bar/progress-bar.js"
+import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"
+import { registerIconLibrary } from "@shoelace-style/shoelace/dist/utilities/icon-library.js"
 import { setDefaultAnimation } from "@shoelace-style/shoelace/dist/utilities/animation-registry.js"
-export { setDefaultAnimation }
+export { registerIconLibrary, setDefaultAnimation }

data/config/locales/alchemy.en.yml

@@ -250,6 +250,7 @@ en:
     "Confirm new password": "Confirm new password"
     "Copy": "Copy"
     "Could not load Adobe Flash® Plugin!": "Could not load Adobe Flash® Plugin!"
+    "Create node on parent:": "Create node on parent:"
     "Currently locked pages": "Currently locked pages"
     "Default language has to be public": "Default language has to be public"
     "Delete image": "Delete image"
@@ -286,6 +287,7 @@ en:
     "New": "New"
     "New Element": "New element"
     "New page": "New page"
+    "No menu node for this page found": "No menu node for this page found"
     "No page links for this page found": "No page links for this page found"
     "New password": "New password"
     "New Tag": "New tag"
@@ -300,7 +302,6 @@ en:
     "Page deleted": "%{name} deleted"
     "Page saved": "%{name} saved"
     "Page cache flushed": "Page cache flushed"
-    "Pages order saved": "Pages order saved"
     "Password": "Password"
     "Password reset": "Password reset"
     "Paste from clipboard": "Paste from clipboard"
@@ -411,6 +412,9 @@ en:
     delete_node: "Delete this menu node"
     delete_page: "Delete this page"
     delete_tag: "Delete tag"
+    search_page: "Search page"
+    search_node: "Search menu node"
+    search_tag: "Search tag"
     document: "File"
     download_csv: "Download CSV"
     download_file: "Download file '%{filename}'"
@@ -587,7 +591,12 @@ en:
     replace: replace
     replace_file: Replace file
     "Replaced Tag": "Tag '%{old_tag}' was replaced with '%{new_tag}'"
+    "%{resource_name} successfully %{action}": "%{resource_name} successfully %{action}."
     resources:
+      actions:
+        created: "created"
+        updated: "updated"
+        removed: "removed"
       relation_select:
         blank: "- none -"
     right: "right"
@@ -656,7 +665,6 @@ en:
     "Successfully updated": "Successfully updated"
     "Successfully removed": "Successfully removed"
     "Nothing found": "Nothing found."
-    complete: "Abgeschlossen"
     "Update available": "Update available"
     "Update status unavailable": "Update status unavailable"
     "Uploading": "Uploading"
@@ -790,7 +798,7 @@ en:
         other: "Elements"
       alchemy/ingredients/headline:
         one: Headline
-        other: Headline
+        other: Headlines
       alchemy/legacy_page_url:
         one: "Link"
         other: "Links"
@@ -809,6 +817,9 @@ en:
       alchemy/picture:
         one: Picture
         other: Pictures
+      alchemy/picture_description:
+        one: Picture Description
+        other: Picture Descriptions
       alchemy/user:
         one: User
         other: User
@@ -899,6 +910,8 @@ en:
         image_file_size: "Filesize"
         name: "Name"
         tag_list: Tags
+      alchemy/picture_description:
+        text: "Description"
       alchemy/site:
         name: "Name"
         host: "Primary Host"

data/config/routes.rb

@@ -22,7 +22,6 @@ Alchemy::Engine.routes.draw do
     resources :pages do
       resources :elements
       collection do
-        post :order
         post :flush
         post :copy_language_tree
         get :create_language
@@ -65,6 +64,8 @@ Alchemy::Engine.routes.draw do
       end
     end
 
+    resources :picture_descriptions, only: [:index, :edit]
+
     resources :attachments, except: [:new] do
       member do
         get :download
@@ -116,6 +117,7 @@ Alchemy::Engine.routes.draw do
   resources :elements, only: :show
 
   namespace :api, defaults: {format: "json"} do
+    resources :attachments, only: [:index]
     resources :ingredients, only: [:index]
 
     resources :elements, only: [:index, :show]

data/db/migrate/20240314105244_create_alchemy_picture_descriptions.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyPictureDescriptions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :alchemy_picture_descriptions do |t|
+      t.belongs_to :picture, null: false, foreign_key: {to_table: :alchemy_pictures}
+      t.belongs_to :language, null: false, foreign_key: {to_table: :alchemy_languages}
+      t.text :text
+
+      t.timestamps
+    end
+  end
+end

data/lib/alchemy/configuration_methods.rb

@@ -28,7 +28,7 @@ module Alchemy
     # matches the current I18n.locale then the prefix os omitted.
     # Also, if only one published language exists.
     #
-    def prefix_locale?(locale = Language.current&.code)
+    def prefix_locale?(locale = Current.language&.code)
       return false unless locale
 
       multi_language? && locale != ::I18n.default_locale.to_s

data/lib/alchemy/controller_actions.rb

@@ -56,7 +56,7 @@ module Alchemy
     # can be scoped against it.
     #
     def set_current_alchemy_site
-      Site.current = current_alchemy_site
+      Current.site = current_alchemy_site
     end
 
     # Sets the current language for Alchemy.
@@ -83,11 +83,11 @@ module Alchemy
         Language.find_by_code(id_or_code)
     end
 
-    # Stores language in +Language.current+
+    # Stores language in +Current.language+
     #
     def store_current_alchemy_language(language)
       if language&.id
-        Language.current = language
+        Current.language = language
       end
     end
   end

data/lib/alchemy/element_definition.rb

@@ -42,6 +42,16 @@ module Alchemy
         all.detect { |a| a["name"] == name }
       end
 
+      def reset!
+        @definitions = nil
+      end
+
+      # The absolute +elements.yml+ file path
+      # @return [Pathname]
+      def definitions_file_path
+        Rails.root.join("config", "alchemy", "elements.yml")
+      end
+
       private
 
       # Reads the element definitions from +config/alchemy/elements.yml+.
@@ -58,12 +68,6 @@ module Alchemy
             "Could not find elements.yml file! Please run `rails generate alchemy:install`"
         end
       end
-
-      # Returns the elements.yml file path
-      #
-      def definitions_file_path
-        Rails.root.join "config/alchemy/elements.yml"
-      end
     end
   end
 end

data/lib/alchemy/engine.rb

@@ -21,20 +21,42 @@ module Alchemy
     end
 
     initializer "alchemy.importmap" do |app|
-      Alchemy.importmap.draw(Engine.root.join("config", "importmap.rb"))
+      watch_paths = []
 
-      package_path = Engine.root.join("app/javascript")
-      vendor_packages_path = Engine.root.join("vendor/javascript")
-      app.config.assets.paths += [package_path, vendor_packages_path]
+      Alchemy.admin_importmaps.each do |admin_import|
+        Alchemy.importmap.draw admin_import[:importmap_path]
+        watch_paths += admin_import[:source_paths]
+        app.config.assets.paths += admin_import[:source_paths]
+        if admin_import[:name] != "alchemy_admin"
+          Alchemy.admin_js_imports.add(admin_import[:name])
+        end
+      end
 
       if app.config.importmap.sweep_cache
-        Alchemy.importmap.cache_sweeper(watches: package_path)
+        Alchemy.importmap.cache_sweeper(watches: watch_paths)
         ActiveSupport.on_load(:action_controller_base) do
           before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
         end
       end
     end
 
+    initializer "alchemy.watch_definition_changes" do |app|
+      elements_reloader = app.config.file_watcher.new([ElementDefinition.definitions_file_path]) do
+        Rails.logger.info "[#{engine_name}] Reloading Element Definitions."
+        ElementDefinition.reset!
+      end
+      page_layouts_reloader = app.config.file_watcher.new([PageLayout.layouts_file_path]) do
+        Rails.logger.info "[#{engine_name}] Reloading Page Layouts."
+        PageLayout.reset!
+      end
+      [elements_reloader, page_layouts_reloader].each do |reloader|
+        app.reloaders << reloader
+        app.reloader.to_run do
+          reloader.execute_if_updated
+        end
+      end
+    end
+
     # Gutentag downcases all tags before save
     # and Gutentag validations are not case sensitive.
     # But we support having tags with uppercase characters.
@@ -47,8 +69,8 @@ module Alchemy
     initializer "alchemy.ransack" do
       Ransack.configure do |config|
         config.custom_arrows = {
-          up_arrow: '<i class="ri-1x ri-arrow-up-line"></i>',
-          down_arrow: '<i class="ri-1x ri-arrow-down-line"></i>'
+          up_arrow: '<alchemy-icon name="arrow-up" size="1x"></alchemy-icon>',
+          down_arrow: '<alchemy-icon name="arrow-down" size="1x"></alchemy-icon>'
         }
       end
     end

data/lib/alchemy/page_layout.rb

@@ -41,6 +41,16 @@ module Alchemy
         all.detect { |a| a["name"].casecmp(name).zero? }
       end
 
+      def reset!
+        @definitions = nil
+      end
+
+      # The absolute +page_layouts.yml+ file path
+      # @return [Pathname]
+      def layouts_file_path
+        Rails.root.join("config", "alchemy", "page_layouts.yml")
+      end
+
       private
 
       # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
@@ -58,12 +68,6 @@ module Alchemy
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:install`"
         end
       end
-
-      # Returns the page_layouts.yml file path
-      #
-      def layouts_file_path
-        Rails.root.join "config/alchemy/page_layouts.yml"
-      end
     end
   end
 end

data/lib/alchemy/permissions.rb

@@ -42,7 +42,7 @@ module Alchemy
         end
 
         can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
-          p.public? && !p.restricted? && p.site == Alchemy::Site.current
+          p.public? && !p.restricted? && p.site == Alchemy::Current.site
         end
       end
     end
@@ -65,7 +65,7 @@ module Alchemy
         end
 
         can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
-          p.public? && p.site == Alchemy::Site.current
+          p.public? && p.site == Alchemy::Current.site
         end
       end
     end
@@ -157,6 +157,7 @@ module Alchemy
         end
 
         can :manage, Alchemy::Picture
+        can :manage, Alchemy::PictureDescription
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag
         can :index, Alchemy::Language

data/lib/alchemy/seeder.rb

@@ -31,7 +31,7 @@ module Alchemy
           log "There are already pages present in your database. " \
               "Please use `rake db:reset' if you want to rebuild your database.", :skip
         else
-          create_default_site! unless Alchemy::Site.default
+          create_default_site! unless Alchemy::Site.first
           create_default_language! unless Alchemy::Language.default
           seed_pages if contentpages.present?
           seed_layoutpages if layoutpages.present?
@@ -126,7 +126,7 @@ module Alchemy
             page_layout: default_language["page_layout"],
             public: true,
             default: true,
-            site: Alchemy::Site.default
+            site: Alchemy::Site.first
           )
         else
           raise DefaultLanguageNotFoundError

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -54,6 +54,10 @@ module Alchemy
         find(%([content="#{content}"] > a)).click
       end
 
+      def click_icon(name)
+        find(%(alchemy-icon[name="#{name}"])).click
+      end
+
       private
 
       def within_entire_page(&block)

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -10,7 +10,7 @@ FactoryBot.define do
 
     public { true }
 
-    site { Alchemy::Site.default || create(:alchemy_site, :default) }
+    site { Alchemy::Site.first || create(:alchemy_site, :default) }
 
     trait :klingon do
       name { "Klingon" }

data/lib/alchemy/test_support/shared_contexts.rb

@@ -14,3 +14,11 @@ RSpec.shared_context "with invalid file" do
     end
   end
 end
+
+RSpec.shared_context "in preview mode" do
+  around do |example|
+    Alchemy::Current.preview_page = page
+    example.run
+    Alchemy::Current.preview_page = nil
+  end
+end

data/lib/alchemy/test_support/shared_link_tab_examples.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.shared_examples_for "a link dialog tab" do |name, title|
+  context "default configuration" do
+    it "should render a tab with a panel" do
+      expect(page).to have_selector("sl-tab[panel='overlay_tab_#{name}_link']")
+      expect(page).to have_selector("sl-tab-panel[name='overlay_tab_#{name}_link']")
+    end
+
+    it "should have a title" do
+      expect(page).to have_text(title)
+    end
+
+    it "should allow to add title input" do
+      expect(page).to have_selector("input[name=#{name}_link_title]", text: "")
+    end
+
+    it "is not active" do
+      expect(page).to_not have_selector("sl-tab[active]")
+    end
+  end
+
+  context "active tab" do
+    let(:is_selected) { true }
+
+    it "is active" do
+      expect(page).to have_selector("sl-tab[active]")
+    end
+  end
+
+  context "title input" do
+    let(:link_title) { "test" }
+
+    it "should have a pre-filled value" do
+      expect(page.find(:css, "input[name=#{name}_link_title]").value).to eq(link_title)
+    end
+  end
+end
+
+shared_examples_for "a link dialog - target select" do |name|
+  context "target select" do
+    context "without content" do
+      it "should allow to add target select" do
+        expect(page).to have_selector("select[name=#{name}_link_target]")
+      end
+    end
+
+    context "with content"
+    let(:link_target) { "_blank" }
+
+    it "should have a pre-filled value" do
+      expect(page.find(:css, "select[name=#{name}_link_target]").value).to eq(link_target)
+    end
+  end
+end

data/lib/alchemy/tinymce.rb

@@ -33,7 +33,8 @@ module Alchemy
       entity_encoding: "raw",
       paste_as_text: true,
       element_format: "html",
-      branding: false
+      branding: false,
+      license_key: "gpl"
     }
 
     class << self

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.1.7"
+  VERSION = "7.2.0.rc1"
 
   def self.version
     VERSION