alchemy_cms 5.0.0.beta2 → 5.1.0.beta1

data/app/assets/stylesheets/alchemy/search.scss

@@ -11,9 +11,19 @@
     top: 9px;
   }
 
-  label {
-    display: block;
+  button {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
     height: inherit;
+    appearance: none;
+    background-color: transparent;
+    border: 0 none;
+    border-radius: 0;
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
   }
 }
 

data/app/assets/stylesheets/alchemy/tags.scss

@@ -1,26 +1,10 @@
 .tag-list {
+  display: flex;
+  flex-direction: column;
   height: 100%;
-  padding-bottom: 138px;
-
-  &.filtered {
-    padding-bottom: 164px;
-  }
-
-  &.with_filter_bar {
-    padding-bottom: 218px;
-
-    &.filtered {
-      padding-bottom: 244px;
-    }
-  }
 
   .js_filter_field_box {
-    position: absolute;
-    right: auto;
-    top: auto;
-    width: 200px;
-    z-index: 1100;
-    transition: background-color $transition-duration;
+    margin: 0;
 
     input {
       background-color: transparentize($white, 0.25);
@@ -29,23 +13,22 @@
         background-color: $white;
       }
     }
-
-    label { display: none }
   }
 
   ul {
     list-style-type: none;
     padding: 0;
-    margin: 44px 0 4px 0;
+    margin: 0;
     height: 100%;
-    width: 200px;
     overflow-x: hidden;
     overflow-y: auto;
 
     li {
       display: block;
 
-      &:first-child { margin-top: 0 }
+      &:first-child {
+        margin-top: 0;
+      }
 
       a {
         @include tag-base;
@@ -53,13 +36,14 @@
         display: block;
       }
 
-      &:hover { background-color: $very-light-blue }
+      &:hover {
+        background-color: $very-light-blue;
+      }
 
       &.active {
-
         a {
           background-color: $dark-gray;
-          color: $light-gray
+          color: $light-gray;
         }
       }
     }
@@ -69,7 +53,7 @@
 .tag {
   @include tag-base(
     $margin: $default-margin/2 0,
-    $padding: $default-padding 2*$default-padding $default-padding
+    $padding: $default-padding 2 * $default-padding $default-padding
   );
   pointer-events: none;
   font-size: $small-font-size;
@@ -124,7 +108,9 @@
       position: relative;
       border-radius: $default-border-radius;
 
-      &.odd { background-color: #eaf3f9 }
+      &.odd {
+        background-color: #eaf3f9;
+      }
 
       input {
         position: absolute;
@@ -141,14 +127,16 @@
   }
 }
 
-.tag_list, .autocomplete_tag_list {
+.tag_list,
+.autocomplete_tag_list {
   .select2-container.select2-container-multi {
     .select2-search-choice {
       padding: 0;
 
       div {
         @include tag-base(
-          $padding: $default-padding 6*$default-padding $default-padding 3*$default-padding,
+          $padding: $default-padding 6 * $default-padding $default-padding 3 *
+            $default-padding,
           $margin: 0
         );
       }

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

@@ -138,7 +138,7 @@ module Alchemy
 
       def link
         @attachments = Attachment.all.collect { |f|
-          [f.name, download_attachment_path(id: f.id, name: f.urlname)]
+          [f.name, download_attachment_path(id: f.id, name: f.slug)]
         }
       end
 

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

@@ -11,16 +11,18 @@ module Alchemy
       before_action :load_resource,
         only: [:show, :edit, :update, :destroy, :info]
 
+      before_action :set_size, only: [:index, :show, :edit_multiple]
+
       authorize_resource class: Alchemy::Picture
 
       def index
-        @size = params[:size].present? ? params[:size] : "medium"
         @query = Picture.ransack(search_filter_params[:q])
         @pictures = Picture.search_by(
           search_filter_params,
           @query,
           items_per_page,
         )
+        @pictures = @pictures.includes(:thumbs)
 
         if in_overlay?
           archive_overlay
@@ -115,7 +117,7 @@ module Alchemy
 
       def items_per_page
         if in_overlay?
-          case params[:size]
+          case @size
           when "small" then 25
           when "large" then 4
           else
@@ -124,19 +126,24 @@ module Alchemy
         else
           cookies[:alchemy_pictures_per_page] = params[:per_page] ||
             cookies[:alchemy_pictures_per_page] ||
-            pictures_per_page_for_size(params[:size])
+            pictures_per_page_for_size
         end
       end
 
       def items_per_page_options
-        per_page = pictures_per_page_for_size(@size)
+        per_page = pictures_per_page_for_size
         [per_page, per_page * 2, per_page * 4]
       end
 
       private
 
-      def pictures_per_page_for_size(size)
-        case size
+      def set_size
+        @size = params[:size] || session[:alchemy_pictures_size] || "medium"
+        session[:alchemy_pictures_size] = @size
+      end
+
+      def pictures_per_page_for_size
+        case @size
         when "small" then 60
         when "large" then 12
         else

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

@@ -148,15 +148,15 @@ module Alchemy
 
       def common_search_filter_includes
         [
-          {q: [
+          { q: [
             resource_handler.search_field_name,
             :s,
-          ]},
+          ] },
           :tagged_with,
           :filter,
           :page,
           :per_page,
-        ].freeze
+        ]
       end
 
       def items_per_page

data/app/controllers/alchemy/pages_controller.rb

@@ -13,7 +13,10 @@ module Alchemy
 
     # Redirecting concerns. Order is important here!
     include SiteRedirects
-    include LocaleRedirects
+
+    before_action :enforce_no_locale,
+      if: :locale_prefix_not_allowed?,
+      only: [:index, :show]
 
     before_action :load_index_page, only: [:index]
     before_action :load_page, only: [:show]
@@ -21,11 +24,13 @@ module Alchemy
     # Legacy page redirects need to run after the page was loaded and before we render 404.
     include LegacyPageRedirects
 
-    # From here on, we need a +@page+ to work with!
-    before_action :page_not_found!, if: -> { @page.blank? }, only: [:index, :show]
+    # From here on, we need a published +@page+ to work with!
+    before_action :page_not_found!, unless: -> { @page&.public? }, only: [:index, :show]
 
-    # Page redirects need to run after the page was loaded and we're sure to have a +@page+ set.
-    include PageRedirects
+    # Page redirects need to run after the page was loaded and we're sure to have a public +@page+ set.
+    before_action :enforce_locale,
+      if: :locale_prefix_missing?,
+      only: [:index, :show]
 
     # We only need to set the +@root_page+ if we are sure that no more redirects happen.
     before_action :set_root_page, only: [:index, :show]
@@ -66,12 +71,8 @@ module Alchemy
     # descendant it finds. If no public page can be found it renders a 404 error.
     #
     def show
-      if redirect_url.present?
-        redirect_permanently_to redirect_url
-      else
-        authorize! :show, @page
-        render_page if render_fresh_page?
-      end
+      authorize! :show, @page
+      render_page if render_fresh_page?
     end
 
     # Renders a search engine compatible xml sitemap.
@@ -84,13 +85,25 @@ module Alchemy
 
     private
 
+    # Redirects to requested action without locale prefixed
+    def enforce_no_locale
+      redirect_permanently_to additional_params.merge(locale: nil)
+    end
+
+    # Is the requested locale allowed?
+    #
+    # If Alchemy is not in multi language mode or the requested locale is the default locale,
+    # then we want to redirect to a non prefixed url.
+    #
+    def locale_prefix_not_allowed?
+      params[:locale].present? && !multi_language? ||
+        params[:locale].presence == ::I18n.default_locale.to_s
+    end
+
     # == Loads index page
     #
     # Loads the current public language root page.
     #
-    # If the root page is not public it redirects to the first published child.
-    # This can be configured via +redirect_to_public_child+ [default: true]
-    #
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
@@ -116,6 +129,28 @@ module Alchemy
       )
     end
 
+    def enforce_locale
+      redirect_permanently_to page_locale_redirect_url(locale: Language.current.code)
+    end
+
+    def locale_prefix_missing?
+      multi_language? && params[:locale].blank? && !default_locale?
+    end
+
+    def default_locale?
+      Language.current.code.to_sym == ::I18n.default_locale.to_sym
+    end
+
+    # Page url with or without locale while keeping all additional params
+    def page_locale_redirect_url(options = {})
+      options = {
+        locale: prefix_locale? ? @page.language_code : nil,
+        urlname: @page.urlname,
+      }.merge(options)
+
+      alchemy.show_page_path additional_params.merge(options)
+    end
+
     # Redirects to given url with 301 status
     def redirect_permanently_to(url)
       redirect_to url, status: :moved_permanently

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

@@ -272,48 +272,6 @@ module Alchemy
         end
       end
 
-      # Renders the toolbar shown on top of the records.
-      #
-      # == Example
-      #
-      #   <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
-      #   <% toolbar(
-      #     buttons: [
-      #       {
-      #         icon: :plus,
-      #         label: label_title,
-      #         url: new_resource_path,
-      #         title: label_title,
-      #         hotkey: 'alt+n',
-      #         dialog_options: {
-      #           title: label_title,
-      #           size: "430x400"
-      #         },
-      #         if_permitted_to: [:create, resource_model]
-      #       }
-      #     ]
-      #   ) %>
-      #
-      # @option options [Array] :buttons ([])
-      #   Pass an Array with button options. They will be passed to {#toolbar_button} helper.
-      # @option options [Boolean] :search (true)
-      #   Show searchfield.
-      #
-      def toolbar(options = {})
-        defaults = {
-          buttons: [],
-          search: true,
-        }
-        options = defaults.merge(options)
-        content_for(:toolbar) do
-          content = <<-CONTENT.strip_heredoc
-            #{options[:buttons].map { |button_options| toolbar_button(button_options) }.join}
-            #{render("alchemy/admin/partials/search_form", url: options[:search_url]) if options[:search]}
-          CONTENT
-          content.html_safe
-        end
-      end
-
       # (internal) Used by upload form
       def new_asset_path_with_session_information(asset_type)
         session_key = Rails.application.config.session_options[:key]

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

@@ -175,7 +175,8 @@ module Alchemy
       # Returns true if the given entry's controller is current controller
       #
       def is_entry_controller_active?(entry)
-        entry["controller"].gsub(/\A\//, "") == params[:controller]
+        entry["controller"].gsub(/\A\//, "") == params[:controller] ||
+          entry.fetch("nested_controllers", []).include?(params[:controller])
       end
 
       # Returns true if the given entry's action is current controllers action

data/app/helpers/alchemy/url_helper.rb

@@ -26,12 +26,12 @@ module Alchemy
 
     # Returns the path for downloading an alchemy attachment
     def download_alchemy_attachment_path(attachment)
-      alchemy.download_attachment_path(attachment, attachment.urlname)
+      alchemy.download_attachment_path(attachment, attachment.slug)
     end
 
     # Returns the url for downloading an alchemy attachment
     def download_alchemy_attachment_url(attachment)
-      alchemy.download_attachment_url(attachment, attachment.urlname)
+      alchemy.download_attachment_url(attachment, attachment.slug)
     end
 
     # Returns the full url containing host, page and anchor for the given element

data/app/models/alchemy/attachment.rb

@@ -37,6 +37,20 @@ module Alchemy
 
     # We need to define this method here to have it available in the validations below.
     class << self
+      # The class used to generate URLs for attachments
+      #
+      # @see Alchemy::Attachment::Url
+      def url_class
+        @_url_class ||= Alchemy::Attachment::Url
+      end
+
+      # Set a different attachment url class
+      #
+      # @see Alchemy::Attachment::Url
+      def url_class=(klass)
+        @_url_class = klass
+      end
+
       def searchable_alchemy_resource_attributes
         %w(name file_name)
       end
@@ -76,8 +90,14 @@ module Alchemy
       }
     end
 
+    def url(options = {})
+      if file
+        self.class.url_class.new(self).call(options)
+      end
+    end
+
     # An url save filename without format suffix
-    def urlname
+    def slug
       CGI.escape(file_name.gsub(/\.#{extension}$/, "").tr(".", " "))
     end
 

data/app/models/alchemy/attachment/url.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Attachment < BaseRecord
+    # The class representing an URL to an attachment
+    #
+    # Set a different one
+    #
+    #     Alchemy::Attachment.url_class = MyRemoteUrlClass
+    #
+    class Url
+      def initialize(attachment)
+        @attachment = attachment
+      end
+
+      # The attachment url
+      #
+      # @param [Hash] options
+      # @option options [Symbol] :download return a URL for downloading the attachment
+      # @option options [Symbol] :name The filename
+      # @option options [Symbol] :format The file extension
+      #
+      # @return [String]
+      #
+      def call(options = {})
+        if options.delete(:download)
+          routes.download_attachment_path(@attachment, options)
+        else
+          routes.show_attachment_path(@attachment, options)
+        end
+      end
+
+      private
+
+      def routes
+        Alchemy::Engine.routes.url_helpers
+      end
+    end
+  end
+end