alchemy_cms 2.5.0.b5 → 2.5.0.b9

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

@@ -3,7 +3,7 @@ module Alchemy
     module AttachmentsHelper
 
       def mime_to_human mime
-        Alchemy::I18n.t(mime, :scope => :mime_types, :default => t('document'))
+        Alchemy::I18n.t(mime, :scope => :mime_types, :default => _t('document'))
       end
 
     end

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

@@ -52,10 +52,10 @@ module Alchemy
         return '' if page.level == 1
         if page.folded?(current_user.id)
           css_class = 'folded'
-          title = t('Show childpages')
+          title = _t('Show childpages')
         else
           css_class = 'collapsed'
-          title = t('Hide childpages')
+          title = _t('Hide childpages')
         end
         link_to(
           '',
@@ -78,7 +78,7 @@ module Alchemy
       # Used for translations selector in Alchemy cockpit user settings.
       def translations_for_select
         Alchemy::I18n.available_locales.map do |locale|
-          [t(locale, :scope => :translations), locale]
+          [_t(locale, :scope => :translations), locale]
         end
       end
 
@@ -98,9 +98,9 @@ module Alchemy
           :onclick => "jQuery('##{options[:id]}').val(''); #{options[:onkeyup]}",
           :class => "js_filter_field_clear",
           :style => "display: none",
-          :title => t("click_to_show_all")
+          :title => _t("click_to_show_all")
         })
-        filter_field << %(<label for="#{options[:id]}">#{t(:search)}</label>)
+        filter_field << %(<label for="#{options[:id]}">#{_t(:search)}</label>)
         filter_field << '</div>'
         filter_field.html_safe
       end
@@ -122,10 +122,10 @@ module Alchemy
         link_to(link_string, url,
           html_options.merge(
             'data-alchemy-confirm-delete' => {
-              :title => t("please_confirm"),
+              :title => _t("please_confirm"),
               :message => message,
-              :ok_label => t("Yes"),
-              :cancel_label => t("No")
+              :ok_label => _t("Yes"),
+              :cancel_label => _t("No")
             }.to_json
           )
         )
@@ -143,7 +143,7 @@ module Alchemy
         defaults = {
           :from_page => nil,
           :elements_with_name => nil,
-          :prompt => t('Please choose')
+          :prompt => _t('Please choose')
         }
         options = defaults.merge(options)
         if options[:from_page]
@@ -171,7 +171,7 @@ module Alchemy
       # 4. The fourth parameter is the method that is called on the page object to get the value that is passed with the params of the form.
       #
       def pages_for_select(pages = nil, selected = nil, prompt = "", page_attribute = :id)
-        result = [[prompt.blank? ? t('Choose page') : prompt, ""]]
+        result = [[prompt.blank? ? _t('Choose page') : prompt, ""]]
         if pages.blank?
           pages = Page.with_language(session[:language_id]).published.order(:lft)
           pages.each do |p|
@@ -192,7 +192,7 @@ module Alchemy
           content = element.contents[content - 1]
         end
         if content.essence.nil?
-          return warning('Element', t('content_essence_not_found'))
+          return warning('Element', _t('content_essence_not_found'))
         end
         select_options = options_for_select(select_options, content.essence.content)
         select_tag(
@@ -292,7 +292,7 @@ module Alchemy
         if content_for?(:title)
           title = content_for(:title)
         else
-          title = t(controller_name, :scope => :modules)
+          title = _t(controller_name, :scope => :modules)
         end
         "Alchemy CMS - #{title}"
       end
@@ -314,7 +314,7 @@ module Alchemy
 
       # (internal) Renders a select tag for all items in the clipboard
       def clipboard_select_tag(items, html_options = {})
-        options = [[t('Please choose'), ""]]
+        options = [[_t('Please choose'), ""]]
         items.each do |item|
           options << [item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text : item.name, item.id]
         end

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

@@ -26,7 +26,7 @@ module Alchemy
         end
         if content.description.blank?
           warning("Content #{content.name} is missing its description")
-          title = t("Warning: Content is missing its description.", :contentname => content.name)
+          title = _t(:content_description_missing)
           content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;#{content_name}).html_safe
         end
         content.has_validations? ? "#{content_name}<span class='validation_indicator'>*</span>".html_safe : content_name
@@ -38,11 +38,11 @@ module Alchemy
       #
       def render_new_content_link(element)
         link_to_overlay_window(
-          render_icon(:create) + t('add new content'),
+          render_icon(:create) + _t('add new content'),
           alchemy.new_admin_element_content_path(element),
           {
             :size => '310x115',
-            :title => t('Select an content'),
+            :title => _t('Select an content'),
             :overflow => true
           },
           {
@@ -77,7 +77,7 @@ module Alchemy
       #
       def render_create_content_link(element, content_name, options = {}, options_for_content = {})
         defaults = {
-          :label => t('Add %{name}', :name => t(content_name, :scope => :content_names))
+          :label => _t('Add %{name}', :name => _t(content_name, :scope => :content_names))
         }
         options = defaults.merge(options)
         link_to(render_icon(:create) + options[:label], alchemy.admin_contents_path(
@@ -98,10 +98,10 @@ module Alchemy
       def delete_content_link(content)
         link_to_confirmation_window(
           render_icon('delete-small'),
-          t('Do you really want to delete this content?'),
+          _t('Do you really want to delete this content?'),
           alchemy.admin_content_path(content),
           :class => 'icon_button small',
-          :title => t('Remove this content')
+          :title => _t('Remove this content')
         ) if content.settings[:deletable]
       end
 

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

@@ -68,7 +68,7 @@ module Alchemy
       # The elements are returned as an array to be used in alchemy_selectbox form builder.
       def elements_for_select(elements)
         return [] if elements.nil?
-        options = elements.collect { |e| [t(e['name'], :scope => :element_names), e["name"]] }
+        options = elements.collect { |e| [_t(e['name'], :scope => :element_names), e["name"]] }
         return options_for_select(options)
       end
 
@@ -90,7 +90,7 @@ module Alchemy
         end
         other_elements = elements - celled_elements
         unless other_elements.blank?
-          optgroup_label = t(:main_content)
+          optgroup_label = _t(:main_content)
           options[optgroup_label] = other_elements.map do |e|
             element_array_for_options(e, object_method)
           end

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

@@ -22,8 +22,8 @@ module Alchemy
       #   * editor_options (Hash) - Will be passed to the render_essence_editor partial renderer
       #
       def render_essence_editor_by_type(element, essence_type, options = {}, editor_options = {})
-        return warning('Element is nil', t("no_element_given")) if element.blank?
-        return warning('EssenceType is blank', t("No EssenceType given")) if essence_type.blank?
+        return warning('Element is nil', _t("no_element_given")) if element.blank?
+        return warning('EssenceType is blank', _t("No EssenceType given")) if essence_type.blank?
         defaults = {
           :position => 1,
           :all => false
@@ -68,7 +68,7 @@ module Alchemy
       #
       def render_essence_editor_by_name(element, name, options = {}, html_options = {})
         if element.blank?
-          return warning('Element is nil', t("no_element_given"))
+          return warning('Element is nil', _t("no_element_given"))
         end
         content = element.content_by_name(name)
         if content.nil?
@@ -78,24 +78,24 @@ module Alchemy
         end
       end
 
-      # Renders the EssenceSelect editor partial with a form select for storing page urlnames
+      # Renders the EssenceSelect editor partial with a form select for storing page ids
       #
       # === Options:
       #
       #   :only            [Hash]     # Pagelayout names. Only pages with this page_layout will be displayed inside the select.
-      #   :page_attribute  [Symbol]   # The Page attribute which will be stored.
+      #   :page_attribute  [Symbol]   # The Page attribute which will be stored. Default is id.
       #   :global          [Boolean]  # Display only global pages. Default is false.
       #   :order_by        [Symbol]   # Order pages by this attribute.
       #
-      # NOTE: The order option only works if the +only+ option is also set.
-      # Then the default is :name.
+      # NOTE: The +order_by+ option only works if the +only+ or the +global+ option is also set.
+      # Then the default ordering is by :name.
       # Otherwise the pages are ordered by their position in the nested set.
       #
       def page_selector(element, content_name, options = {}, select_options = {})
         default_options = {
           :page_attribute => :id,
           :global => false,
-          :prompt => t('Choose page'),
+          :prompt => _t('Choose page'),
           :order_by => :name
         }
         options = default_options.merge(options)

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

@@ -52,7 +52,7 @@ module Alchemy
         custom_config_contents = Alchemy::Tinymce.custom_config_contents
         content_names = custom_config_contents.collect{ |c| c['name'] }
         if content_names.uniq.length != content_names.length
-          raise "Duplicated content names with tinymce setting in elements.yml found. Please rename these contents."
+          raise TinymceError, "Duplicated content names with tinymce setting in elements.yml found. Please rename these contents."
         end
         custom_config_contents.each do |content|
           next unless content['settings']['tinymce']
@@ -84,15 +84,21 @@ module Alchemy
       def preview_sizes_for_select
         options_for_select([
           'auto',
-          [t('240', :scope => 'preview_sizes'), 240],
-          [t('320', :scope => 'preview_sizes'), 320],
-          [t('480', :scope => 'preview_sizes'), 480],
-          [t('768', :scope => 'preview_sizes'), 768],
-          [t('1024', :scope => 'preview_sizes'), 1024],
-          [t('1280', :scope => 'preview_sizes'), 1280]
+          [_t('240', :scope => 'preview_sizes'), 240],
+          [_t('320', :scope => 'preview_sizes'), 320],
+          [_t('480', :scope => 'preview_sizes'), 480],
+          [_t('768', :scope => 'preview_sizes'), 768],
+          [_t('1024', :scope => 'preview_sizes'), 1024],
+          [_t('1280', :scope => 'preview_sizes'), 1280]
         ])
       end
 
+      # Returns the translated explanation of the page´s status.
+      #
+      def combined_page_status(page)
+        _t(page.status.to_a.map{ |k, v| "#{k}.#{v}" }.flatten, :scope => "page_states").delete_if(&:blank?).join("<br>").html_safe
+      end
+
     end
   end
 end

data/app/helpers/alchemy/base_helper.rb

@@ -1,6 +1,10 @@
 module Alchemy
   module BaseHelper
 
+    def _t(key, *args)
+      I18n.t(key, *args)
+    end
+
     # An alias for truncate.
     # Left here for downwards compatibilty.
     def shorten(text, length)
@@ -29,9 +33,7 @@ module Alchemy
 
     # Logs a message in the Rails logger (warn level) and optionally displays an error message to the user.
     def warning(message, text = nil)
-      logger.warn %(\n
-      ++++ WARNING: #{message}! from: #{caller.first}\n
-                  )
+      Logger.warn(message, caller.first)
       unless text.nil?
         warning = content_tag('p', :class => 'content_editor_error') do
           render_icon('warning') + text
@@ -55,8 +57,12 @@ module Alchemy
     #     <p>Caution! This is a warning!</p>
     #   <% end %>
     #
-    def render_message(type = :info, &blk)
-      content_tag :div, render_icon(type) + capture(&blk), :class => "#{type} message"
+    def render_message(type = :info, msg = nil, &blk)
+      if block_given?
+        content_tag :div, render_icon(type) + capture(&blk), :class => "#{type} message"
+      else
+        content_tag :div, render_icon(type) + msg, :class => "#{type} message"
+      end
     end
 
     # Returns an array of all pages in the same branch from current.
@@ -105,5 +111,14 @@ module Alchemy
       Alchemy::Language.published.count > 1
     end
 
+    # Renders the flash partial (+alchemy/admin/partials/flash+)
+    #
+    # @param [String] notice The notice you want to display
+    # @param [Symbol] style The style of this flash. Valid values are +:notice+ (default), +:warn+ and +:error+
+    #
+    def render_flash_notice(notice, style = :notice)
+      render('alchemy/admin/partials/flash', flash_type: style, message: notice)
+    end
+
   end
 end

data/app/helpers/alchemy/elements_helper.rb

@@ -81,7 +81,7 @@ module Alchemy
     end
 
     # This helper renders the Element partial for either the view or the editor part.
-    # Generate element partials with ./script/generate elements
+    # Generate element partials with rails generate alchemy:elements
     def render_element(element, part = :view, options = {}, i = 1)
       begin
         if element.blank?
@@ -108,7 +108,7 @@ module Alchemy
           Element #{part} partial not found for #{element.name}.\n
           #{e}
         ))
-        render :partial => "alchemy/elements/#{part}_not_found", :locals => {:name => element.name, :error => "Element #{part} partial not found. Use rails generate alchemy:elements to generate them."}
+        render :partial => "alchemy/elements/#{part}_not_found", :locals => {:name => element.name, :error => "Element #{part} partial not found.<br>Use <code>rails generate alchemy:elements</code> to generate it."}
       end
     end
 

data/app/helpers/alchemy/essences_helper.rb

@@ -110,9 +110,9 @@ module Alchemy
     def render_essence(content, part = :view, options = {}, html_options = {})
       options = {:for_view => {}, :for_editor => {}}.update(options)
       if content.nil?
-        return part == :view ? "" : warning('Content is nil', t("content_not_found"))
+        return part == :view ? "" : warning('Content is nil', _t("content_not_found"))
       elsif content.essence.nil?
-        return part == :view ? "" : warning('Essence is nil', t("content_essence_not_found"))
+        return part == :view ? "" : warning('Essence is nil', _t("content_essence_not_found"))
       end
       render(
         :partial => "alchemy/essences/#{content.essence_partial_name}_#{part.to_s}",

data/app/helpers/alchemy/pages_helper.rb

@@ -362,14 +362,13 @@ module Alchemy
     # Description = Your page description
     # Keywords: cms, ruby, rubyonrails, rails, software, development, html, javascript, ajax
     #
-    # Then placing +render_meta_data(:title_prefix => "company", :title_seperator => "-")+ into the <head> part of the +pages.html.erb+ layout produces:
+    # Then placing +render_meta_data(:title_prefix => "Company", :title_seperator => "-")+ into the <head> part of the +pages.html.erb+ layout produces:
     #
     #   <meta charset="UTF-8">
     #   <title>Company - #{@page.title}</title>
     #   <meta name="description" content="Your page description">
     #   <meta name="keywords" content="cms, ruby, rubyonrails, rails, software, development, html, javascript, ajax">
-    #   <meta name="generator" content="Alchemy VERSION">
-    #   <meta name="date" content="Tue Dec 16 10:21:26 +0100 2008">
+    #   <meta name="created" content="Tue Dec 16 10:21:26 +0100 2008">
     #   <meta name="robots" content="index, follow">
     #
     def render_meta_data options={}

data/app/models/alchemy/cell.rb

@@ -12,6 +12,7 @@
 #
 module Alchemy
   class Cell < ActiveRecord::Base
+    include Logger
 
     attr_accessible :page_id, :name
 
@@ -57,13 +58,20 @@ module Alchemy
     end
 
     # Returns the cell definition defined in +config/alchemy/cells.yml+
-    def definition
-      self.class.definition_for(self.name)
+    def description
+      description = self.class.definition_for(self.name)
+      if description.blank?
+        warn "Could not find cell definition for #{self.name}. Please check your cells.yml!"
+        return {}
+      else
+        description
+      end
     end
+    alias_method :definition, :description
 
     # Returns all elements that can be placed in this cell
     def available_elements
-      definition['elements']
+      description['elements'] || []
     end
 
     def name_for_label

data/app/models/alchemy/content.rb

@@ -1,5 +1,6 @@
 module Alchemy
   class Content < ActiveRecord::Base
+    include Logger
 
     attr_accessible(
       :do_not_index,
@@ -50,7 +51,9 @@ module Alchemy
           description = element.content_description_for(essences_hash[:name])
           description = element.available_content_description_for(essences_hash[:name]) if description.blank?
         end
-        raise "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}" if description.blank?
+        if description.blank?
+          raise ContentDefinitionError, "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}"
+        end
         content = new(:name => description['name'], :element_id => element.id)
         content.create_essence!(description)
         content
@@ -139,17 +142,15 @@ module Alchemy
     # Returns my description hash from elements.yml
     # Returns the description from available_contents if my own description is blank
     def description
-      if self.element.blank?
-        logger.warn("\n+++++++++++ Warning: Content with id #{self.id} is missing its Element\n")
-        return nil
-      else
-        @desc ||= self.element.content_description_for(self.name)
-        if @desc.blank?
-          @desc ||= self.element.available_content_description_for(self.name)
-        else
-          return @desc
-        end
+      if element.blank?
+        warn "Content with id #{self.id} is missing its Element."
+        return {}
+      end
+      desc = self.element.content_description_for(self.name)
+      if desc.blank?
+        self.element.available_content_description_for(self.name)
       end
+      desc || {}
     end
     alias_method :definition, :description
 
@@ -161,14 +162,14 @@ module Alchemy
 
     # Sets the ingredient from essence
     def ingredient=(value)
-      raise "No essence found" if essence.nil?
+      raise EssenceMissingError if essence.nil?
       essence.ingredient = value
     end
 
     # Calls essence.update_attributes. Called from +Alchemy::Element#save_contents+
     # Ads errors to self.base if essence validation fails.
     def update_essence(params={})
-      raise "Essence not found" if essence.nil?
+      raise EssenceMissingError if essence.nil?
       if essence.update_attributes(params)
         return true
       else
@@ -182,8 +183,7 @@ module Alchemy
     end
 
     def has_validations?
-      return false if description.blank?
-      !description['validate'].blank?
+      description['validate'].present?
     end
 
     # Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
@@ -243,7 +243,7 @@ module Alchemy
     def create_essence!(description)
       essence_class = self.class.normalize_essence_type(description['type']).constantize
       attributes = {
-        :ingredient => default_or_lorem_ipsum(description['default'])
+        :ingredient => default_text(description['default'])
       }
       if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
         attributes.merge!(:do_not_index => !description['do_not_index'].nil?)
@@ -257,7 +257,7 @@ module Alchemy
       end
     end
 
-    def default_or_lorem_ipsum(default)
+    def default_text(default)
       return if default.nil?
       if default.is_a? Symbol
         I18n.t(default, :scope => :default_content_texts)