alchemy_cms 5.0.3 → 5.1.1

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: 178px;
-  }
-
-  &.with_filter_bar {
-    padding-bottom: 218px;
-
-    &.filtered {
-      padding-bottom: 256px;
-    }
-  }
 
   .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

@@ -2,12 +2,12 @@
 
 module Alchemy
   module Admin
-    class PagesController < Alchemy::Admin::BaseController
+    class PagesController < ResourcesController
       include OnPageLayout::CallbacksRunner
 
       helper "alchemy/pages"
 
-      before_action :load_page, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
 
       authorize_resource class: Alchemy::Page, except: [:index, :tree]
 
@@ -27,11 +27,33 @@ module Alchemy
         if: :run_on_page_layout_callbacks?,
         only: [:show]
 
+      before_action :load_languages_and_layouts,
+        unless: -> { @page_root },
+        only: [:index]
+
+      before_action :set_view, only: [:index]
+
       def index
-        if !@page_root
-          @language = @current_language
-          @languages_with_page_tree = Language.on_current_site.with_root_page
-          @page_layouts = PageLayout.layouts_for_select(@language.id)
+        @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
+
+        if @view == "list"
+          @query.sorts = default_sort_order if @query.sorts.empty?
+          items = @query.result
+
+          if search_filter_params[:tagged_with].present?
+            items = items.tagged_with(search_filter_params[:tagged_with])
+          end
+
+          if search_filter_params[:filter].present?
+            items = items.public_send(sanitized_filter_params)
+          end
+
+          if search_filter_params[:page_layout].present?
+            items = items.where(page_layout: search_filter_params[:page_layout])
+          end
+
+          items = items.page(params[:page] || 1).per(items_per_page)
+          @pages = items
         end
       end
 
@@ -85,7 +107,12 @@ module Alchemy
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
-        @preview_url = Alchemy::Admin::PREVIEW_URL.url_for(@page)
+        @preview_urls = Alchemy.preview_sources.map do |klass|
+          [
+            klass.model_name.human,
+            klass.new(routes: Alchemy::Engine.routes).url_for(@page),
+          ]
+        end
         @layoutpage = @page.layoutpage?
       end
 
@@ -178,6 +205,10 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
+
+        # Send publish notification to all registered publish targets
+        Alchemy.publish_targets.each { |p| p.perform_later(@page) }
+
         flash[:notice] = Alchemy.t(:page_published, name: @page.name)
         redirect_back(fallback_location: admin_pages_path)
       end
@@ -220,6 +251,19 @@ module Alchemy
 
       private
 
+      def resource_handler
+        @_resource_handler ||= Alchemy::Resource.new(controller_path, alchemy_module, Alchemy::Page)
+      end
+
+      def common_search_filter_includes
+        super.push(:page_layout, :view)
+      end
+
+      def set_view
+        @view = params[:view] || session[:alchemy_pages_view] || "tree"
+        session[:alchemy_pages_view] = @view
+      end
+
       def copy_of_language_root
         Page.copy(
           language_root_to_copy_from,
@@ -301,7 +345,7 @@ module Alchemy
         { my_urlname: default_urlname, children_path: default_urlname }
       end
 
-      def load_page
+      def load_resource
         @page = Page.find(params[:id])
       end
 
@@ -364,6 +408,12 @@ module Alchemy
                                       user: current_alchemy_user,
                                       full: params[:full] == "true")
       end
+
+      def load_languages_and_layouts
+        @language = @current_language
+        @languages_with_page_tree = Language.on_current_site.with_root_page
+        @page_layouts = PageLayout.layouts_for_select(@language.id)
+      end
     end
   end
 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/decorators/alchemy/element_editor.rb

@@ -18,6 +18,7 @@ module Alchemy
         folded ? "folded" : "expanded",
         compact? ? "compact" : nil,
         fixed? ? "is-fixed" : "not-fixed",
+        public? ? "visible" : "hidden",
       ].join(" ")
     end
 

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

@@ -272,50 +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
-
-      deprecate toolbar: "Please use `content_for(:toolbar)` instead", deprecator: Alchemy::Deprecation
-
       # (internal) Used by upload form
       def new_asset_path_with_session_information(asset_type)
         session_key = Rails.application.config.session_options[:key]