alchemy_cms 8.0.0.b → 8.0.0.c

data/app/assets/images/alchemy/element_icons/layout-bottom-2-line.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M21 3C21.5523 3 22 3.44772 22 4V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21ZM20 5H4V19H20V5ZM18 15V17H6V15H18Z"></path></svg>

data/app/components/alchemy/admin/link_dialog/tabs.rb

@@ -25,7 +25,7 @@ module Alchemy
         end
 
         def tabs
-          Alchemy.link_dialog_tabs
+          Alchemy.config.link_dialog_tabs
         end
       end
     end

data/app/components/alchemy/admin/locale_select.rb

@@ -0,0 +1,38 @@
+module Alchemy
+  module Admin
+    # Renders a locale select tag for switching the backend locale.
+    class LocaleSelect < ViewComponent::Base
+      attr_reader :name
+
+      def initialize(name = :change_locale)
+        @name = name
+      end
+
+      def call
+        select_tag(
+          name,
+          options_for_select(
+            translations_for_select,
+            ::I18n.locale
+          )
+        )
+      end
+
+      def render?
+        available_locales.many?
+      end
+
+      private
+
+      def available_locales
+        @_available_locales ||= Alchemy::I18n.available_locales.sort!
+      end
+
+      def translations_for_select
+        available_locales.map do |locale|
+          [Alchemy.t(locale, scope: :translations), locale]
+        end
+      end
+    end
+  end
+end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -114,7 +114,7 @@ module Alchemy
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
-        @preview_urls = Alchemy.preview_sources.map do |klass|
+        @preview_urls = Alchemy.config.preview_sources.map do |klass|
           [
             klass.model_name.human,
             klass.new(routes: Alchemy::Engine.routes).url_for(@page)

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -29,8 +29,10 @@ module Alchemy
       add_alchemy_filter :without_tag, type: :checkbox
       add_alchemy_filter :deletable, type: :checkbox
 
+      helper_method :picture_offset
+
       def index
-        @pictures = filtered_pictures
+        @pictures = filtered_pictures(page: params[:page])
 
         if in_overlay?
           archive_overlay
@@ -38,7 +40,7 @@ module Alchemy
       end
 
       def show
-        @pictures = filtered_pictures(per_page: 1)
+        @pictures = filtered_pictures(page: params[:picture_index], per_page: 1)
         @picture = @pictures.first
         @previous = @pictures.prev_page
         @next = @pictures.next_page
@@ -121,7 +123,7 @@ module Alchemy
         redirect_to_index
       end
 
-      def filtered_pictures(per_page: items_per_page)
+      def filtered_pictures(page: 1, per_page: items_per_page)
         @query = Picture.ransack(search_filter_params[:q])
         @query.sorts = default_sort_order if @query.sorts.empty?
         pictures = @query.result
@@ -130,7 +132,7 @@ module Alchemy
           pictures = pictures.tagged_with(params[:tagged_with])
         end
 
-        pictures = pictures.page(params[:page] || 1).per(per_page)
+        pictures = pictures.page(page).per(per_page)
         Alchemy.storage_adapter.preloaded_pictures(pictures)
       end
 
@@ -150,7 +152,7 @@ module Alchemy
           cookies[:alchemy_pictures_per_page] = params[:per_page] ||
             cookies[:alchemy_pictures_per_page] ||
             pictures_per_page_for_size
-        end
+        end.to_i
       end
 
       def items_per_page_options
@@ -160,6 +162,10 @@ module Alchemy
 
       private
 
+      def picture_offset
+        ((params[:page] || 1).to_i - 1) * items_per_page
+      end
+
       def set_size
         @size = params[:size] || session[:alchemy_pictures_size] || "medium"
         session[:alchemy_pictures_size] = @size

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -128,7 +128,7 @@ module Alchemy
       # @see Alchemy::Resource#editable_attributes
       def resource_params
         params.require(resource_handler.namespaced_resource_name).permit(
-          resource_handler.editable_attributes.map { _1[:name] }
+          resource_handler.permitted_attributes
         )
       end
 

data/app/decorators/alchemy/ingredient_editor.rb

@@ -108,7 +108,15 @@ module Alchemy
     end
 
     def format_validation
-      validations.select { _1.is_a?(Hash) }.find { _1[:format] }&.fetch(:format)
+      format = validations.select { _1.is_a?(Hash) }.find { _1[:format] }&.fetch(:format)
+      return nil unless format
+
+      # If format is a string or symbol, resolve it from config format_matchers
+      if format.is_a?(String) || format.is_a?(Symbol)
+        Alchemy.config.format_matchers.get(format)
+      else
+        format
+      end
     end
 
     def length_validation

data/app/helpers/alchemy/admin/base_helper.rb

@@ -66,13 +66,6 @@ module Alchemy
         end
       end
 
-      # Used for translations selector in Alchemy cockpit user settings.
-      def translations_for_select
-        Alchemy::I18n.available_locales.sort.map do |locale|
-          [Alchemy.t(locale, scope: :translations), locale]
-        end
-      end
-
       def alchemy_admin_js_translations(locale = ::I18n.locale)
         render partial: "alchemy/admin/translations/#{locale}", formats: [:js]
       rescue ActionView::MissingTemplate

data/app/helpers/alchemy/admin/form_helper.rb

@@ -19,7 +19,8 @@ module Alchemy
         options.key?(:remote) || options[:remote] = request.xhr?
         options[:html] = {
           id: options.delete(:id),
-          class: ["alchemy", options.delete(:class)].compact.join(" ")
+          class: ["alchemy", options.delete(:class)].compact.join(" "),
+          novalidate: false
         }
         simple_form_for(object, *(args << options), &block)
       end

data/app/models/alchemy/element_definition.rb

@@ -35,6 +35,8 @@ module Alchemy
 
     delegate :blank?, to: :name
 
+    DEFAULT_ICON_NAME = "layout-bottom-2-line"
+
     class << self
       # Returns the definitions from elements.yml file.
       #
@@ -168,8 +170,7 @@ module Alchemy
       case icon
       when TrueClass then name
       when String then icon
-      else
-        "default"
+      else DEFAULT_ICON_NAME
       end
     end
 

data/app/models/alchemy/ingredients/boolean.rb

@@ -6,7 +6,8 @@ module Alchemy
     #
     class Boolean < Alchemy::Ingredient
       def value
-        ActiveRecord::Type::Boolean.new.cast(self[:value])
+        val = self[:value].nil? ? definition.default : self[:value]
+        ActiveRecord::Type::Boolean.new.cast(val)
       end
 
       # The localized value

data/app/models/alchemy/page/publisher.rb

@@ -40,7 +40,7 @@ module Alchemy
           end
         end
 
-        Alchemy.publish_targets.each { |p| p.perform_later(page) }
+        Alchemy.config.publish_targets.each { |p| p.perform_later(page) }
       end
 
       private

data/app/models/alchemy/resource.rb

@@ -152,7 +152,7 @@ module Alchemy
     end
 
     def attributes
-      @_attributes ||= model.columns.collect do |col|
+      @_attributes ||= model.columns.filter_map do |col|
         next if skipped_attributes.include?(col.name)
 
         {
@@ -161,7 +161,7 @@ module Alchemy
           relation: resource_relation(col.name),
           enum: enum_values_collection_for_select(col.name)
         }.delete_if { |_k, v| v.blank? }
-      end.compact
+      end
     end
 
     def enum_values_collection_for_select(column_name)
@@ -199,6 +199,19 @@ module Alchemy
       attributes.reject { |h| restricted_attributes.map(&:to_s).include?(h[:name].to_s) }
     end
 
+    # Returns a list of attribute names that are permitted to be updated.
+    # Uses {editable_attributes} and adds {tag_list} if model is taggable.
+    # Used in strong parameters of Alchemy::Admin::ResourcesController.
+    #
+    # @return [Array<String>]
+    def permitted_attributes
+      attrs = editable_attributes.map { _1[:name] }
+      if model < Alchemy::Taggable
+        attrs << "tag_list"
+      end
+      attrs
+    end
+
     # Returns all attribute names that are searchable in the admin interface
     #
     def searchable_attribute_names

data/app/models/alchemy/storage_adapter/dragonfly.rb

@@ -15,7 +15,7 @@ module Alchemy
 
             has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
 
-            before_save do
+            before_save if: :image_file_name do
               self.image_file_name = sanitized_filename(image_file_name)
             end
 
@@ -35,7 +35,7 @@ module Alchemy
               }
             end
 
-            before_save do
+            before_save if: :file_name do
               self.file_name = sanitized_filename(file_name)
             end
           end

data/app/stylesheets/alchemy/admin/dashboard.scss

@@ -47,6 +47,19 @@
   }
 }
 
+.logo {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 0.5em;
+
+  svg {
+    width: 200px;
+    height: auto;
+  }
+}
+
 alchemy-update-check {
   display: flex;
   position: relative;

data/app/stylesheets/alchemy/admin/elements.scss

@@ -119,7 +119,7 @@ alchemy-tinymce {
   flex-grow: 1;
   white-space: nowrap;
   transition: color var(--transition-duration);
-  line-height: 1;
+  line-height: 1.5;
   max-width: 85%;
 
   .preview_text_quote {

data/app/stylesheets/alchemy/admin/nodes.scss

@@ -97,8 +97,12 @@
     background-color: var(--sitemap-highlight-color);
   }
 
-  &.no-match .sitemap_pagename_link {
-    color: var(--color-grey_light);
+  &.no-match {
+    .nodes_tree-right_tools,
+    .node_name,
+    .node_url {
+      opacity: 0.25;
+    }
   }
 
   &:hover {

data/app/stylesheets/alchemy/admin/sitemap.scss

@@ -118,8 +118,12 @@
     background-color: var(--sitemap-highlight-color);
   }
 
-  &.no-match .sitemap_pagename_link {
-    color: var(--color-grey_light);
+  &.no-match {
+    .sitemap_right_tools,
+    .sitemap_sitename,
+    .sitemap_url {
+      opacity: 0.25;
+    }
   }
 
   &:hover {
@@ -252,21 +256,6 @@
   margin-left: var(--spacing-2);
 }
 
-.alchemy-dialog {
-  #sitemap-wrapper {
-    min-height: 0;
-  }
-
-  #sitemap {
-    margin: 0;
-    padding: 0 var(--spacing-6) var(--spacing-2) var(--spacing-2);
-
-    .page_icon {
-      cursor: default;
-    }
-  }
-}
-
 #search_field_clear {
   cursor: pointer;
 }

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

@@ -7,7 +7,7 @@
       title: Alchemy.t(:info),
       dialog_options: {
         title: Alchemy.t(:info),
-        size: "420x435"
+        size: "420x380"
       },
       if_permitted_to: [:info, :alchemy_admin_dashboard],
       hotkey: 'alt+i'

data/app/views/alchemy/admin/dashboard/info.html.erb

@@ -1,12 +1,42 @@
+<div class="logo">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 267 91"
+  >
+    <path
+      d="M261.749 29.77h-9.812l-.72 2.738a193.53 193.53 0 0 0-.802 3.217c-.334-1.384-.604-2.5-.767-3.162l-.685-2.792H234.075c-1.102-.371-2.338-.564-3.705-.564-2.537 0-4.557.864-6.104 1.934-1.406-1.15-3.402-1.934-6.221-1.934-1.341 0-2.524.242-3.564.625l-.006-.061H201.334v4.17c-2.345-3.051-5.884-4.735-10.401-4.735-4.196 0-8.831 1.936-11.655 6.784-1.194-3.746-3.896-6.784-9.557-6.784-1.385 0-2.626.24-3.727.617v-12.19l-4.204.623-6.934 1.027-3.132.464v10.324a22.109 22.109 0 0 0-6.086-.864c-5.96 0-9.341 2.652-11.128 4.876-.108.133-.2.284-.303.422V17.633l-4.207.623-6.933 1.027-3.131.464v24.04l-5.118-18.709-.739-2.701H99.863l-.745 2.686L95.854 36.8 80.915 21.597a2.922 2.922 0 0 0-2.823-.776l-18.554 4.875a2.918 2.918 0 0 0-.634-.981L39.437 4.906a2.927 2.927 0 0 0-2.826-.777L9.797 11.173a2.92 2.92 0 0 0-2.073 2.054L.372 40.078a2.922 2.922 0 0 0 .735 2.818L20.6 62.705a2.921 2.921 0 0 0 2.822.774l9.259-2.43-3.051 11.1a2.921 2.921 0 0 0 .735 2.821l10.94 11.122a2.92 2.92 0 0 0 2.822.778l15.08-3.953a2.919 2.919 0 0 0 2.077-2.055l3.536-12.978.316.324a2.928 2.928 0 0 0 2.064.872c.254.001.508-.031.761-.098l20.839-5.48H103.275l.72-2.733.82-3.121h3.794l.822 3.122.718 2.732h24.059v-4.307c.07.092.133.194.207.282 1.729 2.119 5.001 4.643 10.76 4.643 2.735 0 4.945-.705 6.55-1.415v.797H180.119v-4.383c2.392 3.007 5.737 4.495 9.134 4.885-1.602 1.106-3.095 2.759-4.467 4.952-2.161 3.454-3.211 6.441-3.211 9.137 0 2.014.524 3.774 1.562 5.236 1.388 1.967 3.57 3.053 6.143 3.053.226 0 .384-.016.896-.073.142-.014.243-.025.312-.03 1.014-.043 2.078-.446 4.047-1.521.468-.248.973-.622 2.077-1.656.966 3.029 2.97 3.501 4.119 3.501 2.479 0 4.354-1.665 4.575-4.057.007-.045.041-.233.189-.649.774 1.335 2.059 2.415 4.188 2.415 2.658 0 4.791-2.088 6.555-4.378.065.155.132.312.203.47 1.794 4.082 4.646 4.694 6.185 4.694.76 0 1.52-.168 2.307-.503.228.213.463.419.726.605a6.818 6.818 0 0 0 3.993 1.302c2.273 0 4.515-.764 6.661-2.274 3.357-2.369 4.061-5.111 4.061-6.996 0-2.266-1.092-4.215-3.014-5.406a4.177 4.177 0 0 0 2.142-1.312c.918 1.27 1.794 2.475 2.303 3.129l1.917 2.468 2.74-1.503.268-.144c2.382-1.291 7.335-3.979 9.847-12.048l8.677-27.888 1.479-4.759h-4.984z"
+      fill="transparent"
+    />
+    <path
+      fill="currentColor"
+      d="M102.705 26.102h8.626l9.245 33.793h-7.549l-1.541-5.856h-9.448l-1.541 5.856h-7.189l9.397-33.793zm.411 23.008h7.291c-1.282-5.857-2.925-12.841-3.594-16.487-.719 3.647-2.362 10.63-3.697 16.487zm27.472 10.786h-6.931V22.969l6.931-1.026v37.953zm22.187-1.748c-.977.409-3.545 2.364-7.549 2.364-6.883 0-10.682-4.314-10.682-13.405 0-9.554 3.953-14.176 11.143-14.176 2.878 0 5.239.719 6.163 1.079l-.822 5.083c-.666-.256-2.517-.822-4.365-.822-3.388 0-4.981 2.62-4.981 8.579 0 6.061 1.747 8.267 4.775 8.267 2.108 0 4.008-1.128 4.726-1.386l1.592 4.417zm2.671-35.179l6.931-1.026v14.943h.105c.717-.667 3.079-3.954 7.291-3.954 4.826 0 6.728 2.979 6.728 9.193v17.771h-6.934V43.819c0-3.801-.616-4.879-2.721-4.879-2.107 0-3.853 2.157-4.47 2.876v18.079h-6.931V22.969zm44.73 35.026c-.771.514-3.956 2.518-9.038 2.518-5.957 0-10.785-3.852-10.785-13.097 0-9.811 4.775-14.484 10.63-14.484 5.854 0 9.963 3.646 9.963 12.273 0 1.851-.257 3.339-.309 3.597h-13.401c.05 4.571 2.311 6.469 5.235 6.469 2.773 0 5.086-1.231 6.319-1.795l1.386 4.519zm-12.941-13.509h7.034c0-5.237-1.437-6.624-3.338-6.624-1.798 0-3.646 1.643-3.696 6.624zm17.82-10.989h6.107l.31 3.543c.772-.925 2.722-4.109 6.624-4.109 2.98 0 4.828 1.027 5.598 4.057.874-1.181 3.03-4.057 6.728-4.057 4.468 0 6.37 2.517 6.37 9.141v17.823h-6.883V42.637c0-2.311-.358-3.697-2.158-3.697-1.797 0-3.183 2.054-3.543 2.876v18.079h-6.625V42.637c0-2.311-.358-3.697-2.157-3.697-1.796 0-3.131 2.003-3.542 2.876v18.079h-6.828V33.497zm56.744 0l-8.679 27.887c-2.156 6.934-6.213 8.886-8.37 10.067-.718-.926-2.414-3.287-3.081-4.213.771-.668 4.467-2.566 5.546-6.778l-8.318-26.963h7.239c.771 3.132 3.545 14.688 4.314 19.002.821-4.417 3.545-15.87 4.367-19.002h6.982z"
+    />
+    <g>
+      <path
+        fill="currentColor"
+        d="M193.986 68.011c.319 0 .667.193 1.031.578.897.95 1.506 1.125 2.353.546.367-.254.548-.633.508-1.05-.054-.799-.66-1.456-1.799-1.957-.818-.364-1.438-.541-1.896-.541-2.436.013-4.74 1.736-6.854 5.116-1.807 2.889-2.722 5.389-2.722 7.435 0 1.336.326 2.474.969 3.379.796 1.128 1.983 1.701 3.526 1.701.029 0 .213-.016.555-.054.268-.028.427-.045.47-.046.306 0 .867-.139 2.703-1.14.226-.117.704-.468 2.439-2.166 1.932-1.896 2.285-2.549 2.366-2.884.084-.275.01-.583-.22-.921-.238-.344-.523-.518-.838-.518a.786.786 0 0 0-.708.429c-.872 1.35-1.932 2.444-3.146 3.266-1.295.868-2.615 1.308-3.923 1.308-.778 0-1.671-.234-1.671-2.074 0-1.427.742-3.47 2.211-6.08 1.621-2.872 3.183-4.327 4.646-4.327zm30.25 10.553c-.354 0-.695.247-1.103.798-.301.408-.535.409-.654.408-.259-.01-1.135-.388-1.441-4.977l-.305-4.414c-.25-1.795-.915-2.704-1.979-2.704-.68 0-1.78.545-4.245 4.804a46.07 46.07 0 0 1-2.457 3.695c-.936 1.256-1.511 1.87-1.856 2.171-.082-.436-.124-.979-.124-1.635 0-.533.027-1.253.081-2.143.055-.995.089-1.633.101-1.925.039-2.004-.251-3.293-.885-3.941a1.569 1.569 0 0 0-1.157-.483c-1.114 0-2.453 1.26-4.214 3.968-.44.683-1.144 1.88-2.093 3.565.149-2.311.529-4.59 1.141-6.795.071-.267.054-.669-.433-1.089-.33-.287-.703-.436-1.107-.436-.863 0-1.277 1.173-1.539 2.19-.313 1.16-.526 2.592-.635 4.245-.119 1.754-.181 3.891-.181 6.36 0 .357.075.868.233 1.577.203.807.5 1.631 1.17 1.631.813 0 1.32-.423 1.381-1.157.113-1.165 1.095-3.422 2.918-6.71 1.54-2.804 2.334-3.953 2.701-4.42 0 .089 0 .194-.005.32-.15 3.265-.211 5.245-.182 5.886.105 2.516.823 3.792 2.139 3.792 1.21 0 2.685-1.261 4.636-3.968.255-.355 2.324-3.588 3.537-5.488.234-.37.414-.648.545-.854.012.086.021.184.031.293.052.55.064 1.329.038 2.328v2.002c.01 1.115.313 2.354.903 3.685.812 1.851 1.907 2.786 3.252 2.786.459 0 .972-.164 1.575-.502.819-.475 1.234-1.083 1.234-1.804.001-.652-.392-1.059-1.021-1.059zm6.628-4.902c-2.19 0-2.468-.365-2.475-.365 0-.874.821-2.04 2.372-3.37 1.809-1.556 2.828-1.882 3.366-1.882.036 0 .073.003.123.006.072.004.298.046.826.328.721.386.872.415 1.009.415.727 0 1.163-.494 1.163-1.324 0-.631-.425-1.187-1.268-1.647-.651-.35-1.201-.517-1.684-.517-1.572 0-3.401 1.039-5.592 3.175-2.195 2.138-3.262 3.892-3.262 5.361 0 .738.509 1.313 1.518 1.711.65.258 1.33.402 2.023.432l3.86.141c.473.023.891.157 1.28.407.556.367.619.737.619.983 0 .86-1.161 1.629-2.133 2.122-1.358.688-2.57 1.035-3.598 1.035-.625 0-.625-.247-.625-.444 0-.104.017-.197.054-.283.126-.3.213-.694.266-1.218l.035-.339-.312-.132c-.656-.279-1.311.032-1.813.841-.316.495-.47.93-.47 1.33 0 .904.4 1.646 1.192 2.199a3.557 3.557 0 0 0 2.134.712c1.598 0 3.218-.569 4.811-1.693 1.794-1.263 2.701-2.733 2.701-4.371.002-2.398-2.057-3.613-6.12-3.613z"
+      />
+    </g>
+    <g fill-rule="evenodd" clip-rule="evenodd" fill="currentColor">
+      <path
+        d="M47.632 51.588L23.382 57.956 5.754 40.043 12.401 15.762 36.65 9.393 54.254 27.305z"
+      />
+      <path
+        d="M57.42 79.029L43.781 82.603 33.888 72.543 37.632 58.91 51.244 55.334 61.138 65.395z"
+      />
+      <path
+        d="M86.963 59.079L67.775 64.128 53.829 49.94 59.066 30.726 78.277 25.679 92.223 39.865z"
+      />
+    </g>
+  </svg>
+  Version <%= @alchemy_version %>
+</div>
+
 <p class="center">
-  <%= image_tag('alchemy/alchemy-logo.svg', width: 267, height: 91) %>
-</p>
-<h2 class="center">
-  v<%= @alchemy_version %><br>
   <small>
-    Ruby v<%= RUBY_VERSION %>, Rails v<%= Rails.version %>
+    Ruby <%= RUBY_VERSION %>, Rails <%= Rails.version %>
   </small>
-</h2>
+</p>
 
 <% if can?(:update_check, :alchemy_admin_dashboard) %>
   <alchemy-update-check url="<%= alchemy.update_check_path %>">

data/app/views/alchemy/admin/elements/_header.html.erb

@@ -24,14 +24,13 @@
       <%= Alchemy.t(:element_hidden) %>
     </span>
   </span>
-  <%= button_tag({
-    title: Alchemy.t(element.folded? ? :show_element_content : :hide_element_content),
-    class: "element-toggle"
-  }) do %>
-    <% if element.compact? %>
-      <%= render_icon "more-2" %>
-    <% else %>
-      <%= render_icon element.folded? ? "arrow-left-s" : "arrow-down-s" %>
+  <sl-tooltip content="<%= Alchemy.t(element.folded? ? :show_element_content : :hide_element_content) %>">
+    <%= button_tag(class: "element-toggle") do %>
+      <% if element.compact? %>
+        <%= render_icon "more-2" %>
+      <% else %>
+        <%= render_icon element.folded? ? "arrow-left-s" : "arrow-down-s" %>
+      <% end %>
     <% end %>
-  <% end %>
+  </sl-tooltip>
 </div>

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -16,7 +16,11 @@
       <%= render Alchemy::Admin::PageSelect.new(node.page, allow_clear: true, query_params: {contentpages: true}) do %>
         <%= f.input :page_id, label: Alchemy::Page.model_name.human %>
       <% end %>
-      <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %>
+      <%= f.input :url, as: :string, input_html: {
+          disabled: node.page,
+          pattern: '/.*|[a-zA-Z][\w\+\-\.]*://.+',
+          title: Alchemy.t(:node_url_hint)
+        }, hint: Alchemy.t(:node_url_hint) %>
       <%= f.input :title %>
       <%= f.input :nofollow %>
       <%= f.input :external %>

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

@@ -35,7 +35,7 @@
     <% end %>
   <% else %>
     <div id="pictures" class="picture-size--<%= @size %>">
-      <%= render partial: 'picture', collection: @pictures %>
+      <%= render partial: "picture", collection: @pictures, locals: {picture_offset: picture_offset} %>
     </div>
   <% end %>
 <% end %>

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

@@ -1,5 +1,14 @@
 <%= turbo_frame_tag(@picture) do %>
-  <%= alchemy_form_for [alchemy, :admin, @picture], class: "picture-form" do |f| %>
+  <%= alchemy_form_for @picture,
+    url: alchemy.admin_picture_path(
+      @picture,
+      search_filter_params.merge(
+        size: @size,
+        picture_index: picture_index
+      ).to_h
+    ),
+    remote: false,
+    class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
     <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
@@ -7,10 +16,6 @@
       <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
       <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
     <% end %>
-    <%= hidden_field_tag :q, search_filter_params[:q] %>
-    <%= hidden_field_tag :size, @size %>
-    <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
-    <%= hidden_field_tag :filter, search_filter_params[:filter] %>
     <%= f.submit Alchemy.t(:save) %>
   <% end %>
 <% end %>

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

@@ -1,11 +1,3 @@
-<% picture_path = alchemy.admin_picture_path(
-  picture,
-  search_filter_params.merge(
-    page: params[:page],
-    size: @size.presence
-  ).to_h
-) %>
-
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
   <span class="picture_tool select">
     <%= check_box_tag "picture_ids[]", picture.id %>
@@ -16,7 +8,13 @@
       <%= link_to_confirm_dialog(
         render_icon("delete-bin-2"),
         Alchemy.t(:confirm_to_delete_image_from_server),
-        picture_path
+        alchemy.admin_picture_path(
+          picture,
+          search_filter_params.merge(
+            page: params[:page],
+            size: @size.presence
+          ).to_h
+        )
       ) -%>
     </sl-tooltip>
   </div>
@@ -24,9 +22,16 @@
   <% picture_url = picture.thumbnail_url(size: preview_size(@size)) %>
   <% image = picture_url ? image_tag(picture_url, alt: picture.name) : '<alchemy-icon name="file-damage"></alchemy-icon>'.html_safe %>
   <% if can?(:edit, picture) %>
+    <% picture_index ||= picture_offset + picture_iteration.index %>
     <%= link_to(
       image,
-      picture_path,
+      alchemy.admin_picture_path(
+        picture,
+        search_filter_params.merge(
+          picture_index: picture_index.to_i + 1,
+          size: @size.presence
+        ).to_h
+      ),
       class: 'thumbnail_background'
     ) %>
   <% else %>

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

@@ -9,12 +9,11 @@
 <div class="picture-overlay-navigation">
   <% if @previous %>
     <%= link_to alchemy.admin_picture_path(
-        id: :previous,
-        q: search_filter_params[:q],
-        page: @previous,
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
+        :previous,
+        search_filter_params.merge(
+          picture_index: @previous,
+          size: @size
+        ).to_h
       ),
       class: "previous-picture",
       remote: true do %>
@@ -23,12 +22,11 @@
   <% end %>
   <% if @next %>
     <%= link_to alchemy.admin_picture_path(
-        id: :next,
-        q: search_filter_params[:q],
-        page: @next,
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
+        :next,
+        search_filter_params.merge(
+          picture_index: @next,
+          size: @size
+        ).to_h
       ),
       class: "next-picture",
       remote: true do %>
@@ -38,7 +36,7 @@
 </div>
 
 <div class="picture-details-overlay">
-  <%= render 'form' %>
+  <%= render 'form', picture_index: @previous || @next || 0 %>
   <hr>
   <%= render 'infos' %>
 </div>

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

@@ -2,5 +2,5 @@
   <%= @message[:body] %>
 </alchemy-growl>
 <%= turbo_stream.replace("picture_#{@picture.id}") do %>
-  <%= render "picture", picture: @picture %>
+  <%= render "picture", picture: @picture, picture_index: params[:picture_index] %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% file_types = Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ['*'] %>
-<% accept = file_types == ["*"] ? false : file_types.map {|type| ".#{type}"}.join(", ") %>
+<% accept = file_types.to_a == ["*"] ? nil : file_types.map {|type| ".#{type}"}.join(", ") %>
 
 <alchemy-uploader dropzone="<%= local_assigns[:dropzone] || "#main_content" %>">
   <%= form_for [:admin, object], html: { multipart: true, class: 'upload-button' } do |f| %>

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

@@ -14,7 +14,7 @@
     <%= 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| %>
+    <% Alchemy.config.admin_stylesheets.each do |stylesheet| %>
       <%= stylesheet_link_tag(stylesheet, 'data-turbo-track' => true) %>
     <% end %>
     <%= yield :stylesheets %>
@@ -29,7 +29,7 @@
     <%= render 'alchemy/admin/tinymce/setup' %>
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
-    <% Alchemy.admin_js_imports.each do |path| %>
+    <% Alchemy.config.admin_js_imports.each do |path| %>
       <script type="module">
         import "<%= path %>"
       </script>
@@ -83,10 +83,7 @@
         <% end %>
         <div id="user_info">
           <%= current_alchemy_user_name %>
-          <% if Alchemy::I18n.available_locales.length > 1 %>
-            <%= select_tag 'change_locale',
-              options_for_select(translations_for_select, ::I18n.locale) %>
-          <% end %>
+          <%= render Alchemy::Admin::LocaleSelect.new %>
         </div>
       </div>
       <div id="toolbar">