alchemy_cms 2.2.4 → 2.3.rc5

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,9 +1,10 @@
 module Alchemy
   class UserSessionsController < Alchemy::BaseController
 
+    before_filter :set_translation
     before_filter :check_user_count, :only => :login
 
-    layout 'alchemy/login'
+    layout 'alchemy/admin'
 
     helper 'Alchemy::Admin::Base'
 
@@ -30,8 +31,6 @@ module Alchemy
       else
         if request.get?
           @user_session = UserSession.new()
-          @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
-          @user_genders = User.genders_for_select
           flash.now[:info] = params[:message] || t("welcome_please_identify_notice")
         else
           @user_session = UserSession.new(params[:alchemy_user_session])
@@ -51,7 +50,6 @@ module Alchemy
     end
 
     def leave
-      ::I18n.locale = current_user.try(:language)
       render :layout => false
     end
 

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

@@ -23,12 +23,12 @@ module Alchemy
       #   :overflow         [Boolean]             # Should the dialog have overlapping content. If not, it shows scrollbars. Good for select boxes. Default false.
       #   :resizable        [Boolean]             # Is the dialog window resizable? Default false.
       #   :modal            [Boolean]             # Show as modal window. Default true.
-      #   :overflow         [Boolean]             # Should the window show overflowing content? Default false.
+      #   :overflow         [Boolean]             # Should the window show overflowing content? Default true.
       #
       def link_to_overlay_window(content, url, options={}, html_options={})
         default_options = {
           :modal => true,
-          :overflow => false,
+          :overflow => true,
           :resizable => false
         }
         options = default_options.merge(options)
@@ -121,7 +121,7 @@ module Alchemy
       def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
         link_to(link_string, url,
           html_options.merge(
-            'data-alchemy-confirm' => {
+            'data-alchemy-confirm-delete' => {
               :title => t("please_confirm"),
               :message => message,
               :ok_label => t("Yes"),
@@ -334,7 +334,7 @@ module Alchemy
       #   :overlay_options        [Hash]                # Overlay options. See link_to_overlay_window helper.
       #   :if_permitted_to        [Array]               # Check permission for button. [:action, :controller]. Exactly how you defined the permission in your +authorization_rules.rb+. Defaults to controller and action from button url.
       #   :skip_permission_check  [Boolean]             # Skip the permission check. Default false. NOT RECOMMENDED!
-      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Only for buttons not opening an overlay window. Default true.
+      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Default false.
       #
       def toolbar_button(options = {})
         options.symbolize_keys!
@@ -344,25 +344,25 @@ module Alchemy
           :active => false,
           :link_options => {},
           :overlay_options => {},
-          :loading_indicator => true
+          :loading_indicator => false
         }
         options = defaults.merge(options)
         button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
           link = if options[:overlay]
-                   link_to_overlay_window(
-                     render_icon(options[:icon]),
-                     options[:url],
-                     options[:overlay_options],
-                     {
-                       :class => 'icon_button',
-                       :title => options[:title]
-                     }
-                   )
-                 else
-                   link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? ' please_wait' : nil}", :title => options[:title]}.merge(options[:link_options]) do
-                     render_icon(options[:icon])
-                   end
-                 end
+            link_to_overlay_window(
+              render_icon(options[:icon]),
+              options[:url],
+              options[:overlay_options],
+              {
+                :class => 'icon_button',
+                :title => options[:title]
+              }
+            )
+          else
+            link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
+              render_icon(options[:icon])
+            end
+          end
           link += content_tag('label', options[:label])
         end
         if options[:skip_permission_check]
@@ -454,6 +454,85 @@ module Alchemy
         }.merge(html_options))
       end
 
+      # Merges the params-hash with the given hash
+      def merge_params(p={})
+        params.merge(p).delete_if { |k, v| v.blank? }
+      end
+
+      # Deletes one or several params from the params-hash and merges some new params in
+      def merge_params_without(excludes, p={})
+        current_params = params.clone.symbolize_keys
+        if excludes.is_a?(Array)
+          excludes.map { |i| current_params.delete(i.to_sym) }
+        else
+          current_params.delete(excludes.to_sym)
+        end
+        current_params.merge(p).delete_if { |k, v| v.blank? }
+      end
+
+      # Deletes all params from the params-hash except the given ones and merges some new params in
+      def merge_params_only(includes, p={})
+        current_params = params.clone.symbolize_keys
+        if includes.is_a?(Array)
+          symbolized_includes = includes.map(&:to_sym)
+          current_params.delete_if { |k, v| !symbolized_includes.include?(k) }
+        else
+          current_params.delete_if { |k, v| k != includes.to_sym }
+        end
+        current_params.merge(p).delete_if { |k, v| v.blank? }
+      end
+
+      # Checks if the pictures tag-filter contains the given tag
+      def pictures_filtered_by_tag?(tag)
+        if params[:tagged_with].present?
+          tags = params[:tagged_with].split(',')
+          tags.include?(tag.name)
+        else
+          false
+        end
+      end
+
+      # Adds the given tag to the pictures tag-filter
+      def add_to_picture_tag_filter(tag)
+        if params[:tagged_with].present?
+          tags = params[:tagged_with].split(',')
+          tags << tag.name
+        else
+          [tag.name]
+        end
+      end
+
+      # Removes the given tag from the pictures tag-filter
+      def remove_from_picture_tag_filter(tag)
+        if params[:tagged_with].present?
+          tags = params[:tagged_with].split(',')
+          tags.delete_if { |t| t == tag.name }
+        else
+          []
+        end
+      end
+
+      # Returns the picture tag-filter from params.
+      # A tag can be added to the filter.
+      # A tag can also be removed.
+      #
+      # Options are:
+      #   * options (Hash):
+      #   ** :add (ActsAsTaggableOn::Tag) - The tag that should be added to the tag-filter
+      #   ** :remove (ActsAsTaggableOn::Tag) - The tag that should be removed from the tag-filter
+      def picture_tag_filter(options={})
+        case
+          when options[:add]
+            taglist = add_to_picture_tag_filter(options[:add]) if options[:add]
+          when options[:remove]
+            taglist = remove_from_picture_tag_filter(options[:remove]) if options[:remove]
+          else
+            return params[:tagged_with]
+        end
+        return nil if taglist.blank?
+        taglist.uniq.join(',')
+      end
+
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Alchemy
           render_icon(:create) + t('add new content'),
           alchemy.new_admin_element_content_path(element),
           {
-            :size => '335x70',
+            :size => '310x115',
             :title => t('Select an content'),
             :overflow => true
           },
@@ -90,7 +90,7 @@ module Alchemy
           :method => :post,
           :remote => true,
           :id => "add_content_for_element_#{element.id}",
-          :class => 'button new_content_link'
+          :class => 'button with_icon new_content_link'
         )
       end
 

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

@@ -52,11 +52,10 @@ module Alchemy
           :grouped => true
         }
         options = default_options.merge(options)
-        picture_contents = element.contents.where(:essence_type => "Alchemy::EssencePicture")
         render(
-          :partial => "alchemy/admin/elements/picture_editor",
+          :partial => "alchemy/admin/elements/picture_gallery_editor",
           :locals => {
-            :picture_contents => picture_contents,
+            :pictures => element.contents.gallery_pictures,
             :element => element,
             :options => options
           }

data/app/helpers/alchemy/base_helper.rb

@@ -7,13 +7,14 @@ module Alchemy
       text.truncate(:length => length)
     end
 
-    # Returns @current_language set in the action (e.g. Page.show)
+    # Returns @language set in the action (e.g. Page.show)
     def current_language
-      if @current_language.nil?
-        warning('@current_language is not set')
-        return nil
+      ActiveSupport::Deprecation.warn('This Proxy-method is deprecated. Please use @language directly.')
+      if @language.nil?
+        warning('@language is not set')
+        nil
       else
-        @current_language
+        @language
       end
     end
 

data/app/helpers/alchemy/elements_helper.rb

@@ -153,13 +153,13 @@ module Alchemy
     # Returns a string for the id attribute of a html element for the given element
     def element_dom_id(element)
       return "" if element.nil?
-      "#{element.name}_#{element.id}".html_safe
+      "#{element.name}_#{element.id}"
     end
 
     # Renders the data-alchemy-element HTML attribut used for the preview window hover effect.
     def element_preview_code(element)
       return "" if element.nil?
-      " data-alchemy-element='#{element.id}'".html_safe if @preview_mode && element.page == @page
+      " data-alchemy-element='#{element.id}'" if @preview_mode && element.page == @page
     end
 
     # Returns the full url containing host, page and anchor for the given element

data/app/helpers/alchemy/essences_helper.rb

@@ -129,15 +129,14 @@ module Alchemy
     # == Options:
     #
     #   :image_size => "111x93"                        # Used by EssencePicture to render the image via RMagick to that size. [Default nil]
-    #   :date_format => "Am %d. %m. %Y, um %H:%Mh"     # Espacially for EssenceDate. See Rubys Date.strftime for date formatting options. [Default nil]
-    #   :caption => true                               # Pass Boolean to enable/disable the EssencePicture.caption. [Default true]
-    #   :blank_value => "Not found"                    # Pass a String that gets rendered if the content.essence is blank. [Default nil]
+    #   :date_format => "Am %d. %m. %Y, um %H:%Mh"     # Especially for EssenceDate. See Rubys Date.strftime for date formatting options. [Default nil]
+    #   :show_caption => true                          # Pass Boolean to show/hide the caption of an EssencePicture. [Default true]
     #
     def render_essence_view(content, options = {}, html_options = {})
       defaults = {
-        :caption => true
+        :show_caption => true
       }
-      render_essence(content, :view, {:for_view => options}, html_options)
+      render_essence(content, :view, {:for_view => defaults.update(options)}, html_options)
     end
 
   end

data/app/helpers/alchemy/pages_helper.rb

@@ -4,6 +4,7 @@ module Alchemy
     include Alchemy::BaseHelper
     include Alchemy::ElementsHelper
     include Alchemy::PicturesHelper
+    include Alchemy::UrlHelper
 
     def render_classes(classes=[])
       s = classes.uniq.delete_if { |x| x.blank? }.join(" ")
@@ -49,7 +50,7 @@ module Alchemy
         return nil if (pages.blank? || pages.length == 1)
         pages.each_with_index do |page, i|
           if (options[:link_to_page_with_layout] != nil)
-            page_found_by_layout = Page.where(:page_layout => options[:link_to_page_with_layout].to_s, :language_id => page.language_id)
+            page_found_by_layout = Page.where(:page_layout => options[:link_to_page_with_layout].to_s, :language_id => page.language_id).first
           end
           page = page_found_by_layout || page
           page = (options[:link_to_public_child] ? (page.first_public_child.blank? ? nil : page.first_public_child) : nil) if !page.public?
@@ -91,7 +92,6 @@ module Alchemy
         nil
       end
     end
-
     alias_method :language_switches, :language_switcher
 
     # Renders the layout from @page.page_layout. File resists in /app/views/page_layouts/_LAYOUT-NAME.html.erb
@@ -256,7 +256,8 @@ module Alchemy
         :public_only => true,
         :visible_only => true,
         :restricted_only => false,
-        :reverse => false
+        :reverse => false,
+        :link_active_page => false
       }
       options = default_options.merge(options)
       pages = breadcrumb(options[:page])
@@ -288,7 +289,11 @@ module Alchemy
         elsif page == pages.first
           css_class = css_class.blank? ? "first" : [css_class, "first"].join(" ")
         end
-        bc << link_to(h(page.name), show_alchemy_page_path(page), :class => css_class, :title => page.title)
+        if !options[:link_active_page] && page.name == @page.name
+          bc << content_tag(:span, h(page.name), :class => css_class)
+        else
+          bc << link_to(h(page.name), show_alchemy_page_path(page), :class => css_class, :title => page.title)
+        end
       end
       bc.join(options[:seperator]).html_safe
     end
@@ -409,30 +414,6 @@ module Alchemy
       return meta_string.html_safe
     end
 
-    # This helper returns a path for use inside a link_to helper.
-    #
-    # You may pass a page_layout or an urlname.
-    # Any additional options are passed to the url_helper, so you can add arguments to your url.
-    #
-    # Example:
-    #
-    #   <%= link_to '&raquo order now', page_path_for(:page_layout => 'orderform', :product_id => element.id) %>
-    #
-    def page_path_for(options={})
-      return warning("No page_layout, or urlname given. I got #{options.inspect} ") if options[:page_layout].blank? && options[:urlname].blank?
-      if options[:urlname].blank?
-        page = Page.find_by_page_layout(options[:page_layout])
-        if page.blank?
-          warning("No page found for #{options.inspect} ")
-          return
-        end
-        urlname = page.urlname
-      else
-        urlname = options[:urlname]
-      end
-      alchemy.show_page_path({:urlname => urlname, :lang => multi_language? ? session[:language_code] : nil}.merge(options.except(:page_layout, :urlname, :lang)))
-    end
-
     # Renders the partial for the cell with the given name of the current page.
     # Cell partials are located in +app/views/cells/+ of your project.
     #
@@ -467,68 +448,23 @@ module Alchemy
     # Renders the search form
     def render_search_form(options={})
       default_options = {
-        :page => @search_result_page,
-        :html5 => false,
-        :button_value => t("search"),
-        :button_class => nil
+        :html5 => false
       }
-      options = default_options.merge(options)
-      if options[:page].class.name != "Alchemy::Page"
-        warning("No page found for #{options[:page].inspect}")
+      if @search_result_page.blank?
+        warning("No search result page found")
         return
       end
-      form_tag(show_alchemy_page_path(options[:page]), :method => :get, :class => 'fulltext_search') do
-        if options[:html5]
-          search_field_tag(:query, params[:query])
-        else
-          text_field_tag(:query, params[:query]) + submit_tag(options[:button_value], :class => options[:button_class], :name => nil)
-        end
-      end
+      render :partial => 'alchemy/search/form', :locals => {:options => default_options.merge(options)}
     end
 
-    # Renders the search-results
+    # Renders the search +results+ partial from +app/views/alchemy/search/+
     def render_search_results(options={})
       default_options = {
-        :partial => 'alchemy/search/result',
         :show_language => true,
         :show_result_count => true,
         :show_heading => true
       }
-      options = default_options.merge(options)
-      return content_tag :h2, t('search_result_page.no_results'), :class => 'no_search_results' if @search_results.blank?
-      results = ""
-      @search_results.each do |essence|
-        result = essence.highlight(
-          "*#{params[:query]}*", {
-            :field => (essence.class.name == "Alchemy::EssenceRichtext" ? :stripped_body : :body)
-          })
-        results << render(:partial => options[:partial], :locals => {:result => result, :options => options, :page => essence.page}) if essence.page
-      end
-      output = ""
-      output << content_tag(:h1, t("search_result_page.result_heading", :query => h(params[:query])), :class => 'search_results_heading') if options[:show_heading]
-      output << content_tag(:h2, t("search_result_page.result_count", :count => @search_results.length), :class => 'search_result_count') if options[:show_result_count]
-      output << content_tag(:ul, results.html_safe, :class => 'search_result_list')
-      content_tag :div, :class => 'search_results' do
-        output.html_safe
-      end
-    end
-
-    # Returns the correct params-hash for passing to show_page_path
-    def show_page_path_params(page, optional_params={})
-      url_params = {:level1 => nil, :level2 => nil, :level3 => nil, :urlname => page.urlname}
-      url_params.update(optional_params)
-      url_params.update(params_for_nested_url(page)) if configuration(:url_nesting)
-      return multi_language? ? url_params.update(:lang => page.language_code) : url_params
-    end
-
-    #
-    def show_alchemy_page_path(page, optional_params={})
-      alchemy.show_page_path(show_page_path_params(page, optional_params))
-    end
-
-    #
-    def show_alchemy_page_url(page, optional_params={})
-      alchemy.show_page_url(show_page_path_params(page, optional_params))
+      render 'alchemy/search/results', :options => default_options.merge(options)
     end
 
     # Renders a menubar for logged in users that are visiting a page.

data/app/helpers/alchemy/url_helper.rb

@@ -0,0 +1,67 @@
+# Alchemy url helpers
+#
+# This helper is included within alchemy/pages_helper
+#
+module Alchemy
+  module UrlHelper
+
+    # Returns the correct params-hash for passing to show_page_path
+    def show_page_path_params(page, optional_params={})
+      url_params = {:level1 => nil, :level2 => nil, :level3 => nil, :urlname => page.urlname}
+      url_params.update(optional_params)
+      url_params.update(params_for_nested_url(page)) if configuration(:url_nesting)
+      multi_language? ? url_params.update(:lang => page.language_code) : url_params
+    end
+
+    # Returns the path for rendering an alchemy page
+    def show_alchemy_page_path(page, optional_params={})
+      alchemy.show_page_path(show_page_path_params(page, optional_params))
+    end
+
+    # Returns the url for rendering an alchemy page
+    def show_alchemy_page_url(page, optional_params={})
+      alchemy.show_page_url(show_page_path_params(page, optional_params))
+    end
+
+    # Returns the correct params-hash for passing to show_picture_path
+    def show_picture_path_params(picture, optional_params={})
+      url_params = {:id => picture.id, :name => picture.urlname, :format => configuration(:image_output_format)}
+      url_params.update(optional_params.update({:crop => optional_params[:crop] ? 'crop' : nil}))
+    end
+
+    # Returns the path for rendering an alchemy picture
+    def show_alchemy_picture_path(picture, optional_params={})
+      alchemy.show_picture_path(show_picture_path_params(picture, optional_params))
+    end
+
+    # Returns the url for rendering an alchemy picture
+    def show_alchemy_picture_url(picture, optional_params={})
+      alchemy.show_picture_url(show_picture_path_params(picture, optional_params))
+    end
+
+    # This helper returns a path for use inside a link_to helper.
+    #
+    # You may pass a page_layout or an urlname.
+    # Any additional options are passed to the url_helper, so you can add arguments to your url.
+    #
+    # Example:
+    #
+    #   <%= link_to '&raquo order now', page_path_for(:page_layout => 'orderform', :product_id => element.id) %>
+    #
+    def page_path_for(options={})
+      return warning("No page_layout, or urlname given. I got #{options.inspect} ") if options[:page_layout].blank? && options[:urlname].blank?
+      if options[:urlname].blank?
+        page = Page.find_by_page_layout(options[:page_layout])
+        if page.blank?
+          warning("No page found for #{options.inspect} ")
+          return
+        end
+        urlname = page.urlname
+      else
+        urlname = options[:urlname]
+      end
+      alchemy.show_page_path({:urlname => urlname, :lang => multi_language? ? session[:language_code] : nil}.merge(options.except(:page_layout, :urlname, :lang)))
+    end
+
+  end
+end