alchemy_cms 2.2.rc8 → 2.2.rc11

data/README.md

@@ -1,7 +1,7 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=next_stable)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
 ![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
 
 About

data/app/assets/javascripts/alchemy/alchemy.page_sorter.js

@@ -32,7 +32,7 @@ if (typeof(Alchemy) === 'undefined') {
         $.post(Alchemy.routes.order_admin_pages_path, params);
         return false;
       });
-      $('#bottom_buttons .button').click(Alchemy.pleaseWaitOverlay);
+      $('#sort_panel .button').click(Alchemy.pleaseWaitOverlay);
       Alchemy.PageSorter.disableButton();
       Alchemy.resizeFrame();
     },

data/app/assets/stylesheets/alchemy/sitemap.css.scss

@@ -1,22 +1,23 @@
 @import "alchemy/defaults";
 
-div#bottom_panel {
+div#sort_panel {
+  background: $medium-gray;
+  padding: 60px 0 8px 0;
   position: fixed;
-  bottom: 0;
-  right: 0;
-  width: 100%;
+  top: 27px;
+  left: 0;
   z-index: 10;
-  background: $medium-gray image-url('alchemy/shading.png') repeat-x 0 0;
-}
+  width: 100%;
+  border-bottom: $default-border;
 
-div#bottom_panel div.info {
-  margin: 16px 16px 8px 81px;
-  width: 720px;
-}
+  div.info {
+    margin: 8px 8px 8px 104px;
+    width: 720px;
+  }
 
-div#bottom_buttons {
-  padding: 0 16px 16px;
-  margin-left: 65px;
+  div.buttons {
+    margin: 0 0 8px 104px;
+  }
 }
 
 .sitemap_pagename_link {

data/app/assets/stylesheets/alchemy/standard_set.css

@@ -146,18 +146,17 @@ div#header_image {
   background-color: #ffa300;
 }
 
-#navigation ul.navigation_level_1 li {
+#navigation ul.navigation.level_1 li {
   display: inline;
   float: left;
 }
 
-#navigation ul.navigation_level_2 li,
-#navigation ul.navigation_level_-1 li {
+#navigation ul.navigation.level_2 li {
   display: block;
   float: none;
 }
 
-#navigation ul.navigation_level_3 li {
+#navigation ul.navigation.level_3 li {
 
 }
 
@@ -165,7 +164,7 @@ div#header_image {
   background-color: #c0c0c0;
 }
 
-#navigation ul.navigation_level_2 > li.last {
+#navigation ul.navigation.level_2 > li.last {
 
 }
 
@@ -181,7 +180,7 @@ div#header_image {
   color: #fff;
 }
 
-#navigation ul.navigation_level_2, #navigation ul.navigation_level_-1 {
+#navigation ul.navigation.level_2 {
   display: none;
   position: absolute;
   z-index: 10;
@@ -191,22 +190,22 @@ div#header_image {
   clear: both;
 }
 
-#navigation ul.navigation_level_3 {
+#navigation ul.navigation.level_3 {
   display: none;
   z-index: 20;
   background-color: white;
   float: none;
 }
 
-#navigation ul.navigation_level_3 li {
+#navigation ul.navigation.level_3 li {
   padding-left: 20px;
 }
 
-#navigation ul.navigation_level_1 li:hover ul.navigation_level_2, #navigation ul.navigation_level_1 li:hover ul.navigation_level_-1 {
+#navigation ul.navigation.level_1 li:hover ul.navigation.level_2 {
   display: block;
 }
 
-#navigation ul.navigation_level_2 li:hover ul.navigation_level_3 {
+#navigation ul.navigation.level_2 li:hover ul.navigation.level_3 {
   display: block;
 }
 

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

@@ -10,6 +10,7 @@ module Alchemy
       filter_access_to [:index, :link, :layoutpages, :new, :switch_language, :create, :move, :flush], :attribute_check => false
 
       cache_sweeper Alchemy::PagesSweeper, :only => [:publish], :if => proc { Alchemy::Config.get(:cache_pages) }
+      cache_sweeper Alchemy::ContentSweeper, :only => [:create, :update, :destroy]
 
       def index
         @page_root = Page.language_root_for(session[:language_id])

data/app/controllers/alchemy/base_controller.rb

@@ -129,7 +129,8 @@ module Alchemy
       if exception
         logger.info "Rendering 404: #{exception.message}"
       end
-      render :file => "#{Rails.root}/public/404", :status => 404
+      @page = Page.language_root_for(session[:language_id])
+      render :file => "#{Rails.root}/public/404", :status => 404, :layout => !@page.nil?
     end
 
     protected

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

@@ -46,6 +46,7 @@ module Alchemy
       # Renders the Content editor partial from the given Element by position (e.g. 1).
       # For options see -> render_essence
       def render_essence_editor_by_position(element, position, options = {})
+        ActiveSupport::Deprecation.warn 'Alchemy CMS: render_essence_editor_by_position is not supported anymore and will be removed.'
         if element.blank?
           warning('Element is nil')
           return ""

data/app/helpers/alchemy/elements_helper.rb

@@ -59,7 +59,6 @@ module Alchemy
         unless options[:sort_by].blank?
           all_elements = all_elements.sort_by { |e| e.contents.detect { |c| c.name == options[:sort_by] }.ingredient }
         end
-        all_elements.reverse! if options[:reverse_sort] || options[:reverse]
         element_string = ""
         if options[:fallback]
           unless all_elements.detect { |e| e.name == options[:fallback][:for] }
@@ -88,9 +87,6 @@ module Alchemy
           }
           options = default_options.merge(options)
           element.store_page(@page) if part == :view
-          path1 = "#{Rails.root}/app/views/elements/"
-          path2 = "#{Rails.root}/vendor/plugins/alchemy/app/views/elements/"
-          partial_name = "_#{element.name.underscore}_#{part}.html.erb"
           locals = options.delete(:locals)
           render(
             :partial => "alchemy/elements/#{element.name.underscore}_#{part}",
@@ -101,14 +97,10 @@ module Alchemy
             }.merge(locals || {})
           )
         end
-      rescue ActionView::MissingTemplate
+      rescue ActionView::MissingTemplate => e
         warning(%(
           Element #{part} partial not found for #{element.name}.\n
-          Looking for #{partial_name}, but not found
-          neither in #{path1}
-          nor in #{path2}
-          Use rails generate alchemy:elements to generate them.
-          Maybe you still have old style partial names? (like .rhtml). Then please rename them in .html.erb'
+          #{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."}
       end

data/app/helpers/alchemy/essences_helper.rb

@@ -83,6 +83,7 @@ module Alchemy
     #   <%= render_essence_view_by_type(element, 2) %>
     #
     def render_essence_view_by_position(element, position, options = {}, html_options = {})
+      ActiveSupport::Deprecation.warn 'Alchemy CMS: render_essence_view_by_position is not supported anymore and will be removed.'
       if element.blank?
         warning('Element is nil')
         return ""

data/app/helpers/alchemy/pages_helper.rb

@@ -112,12 +112,12 @@ module Alchemy
 
     # Renders the navigation.
     #
-    # It produces a html <ul><li></li></ul> structure with all necessary classes and ids so you can produce every navigation the web uses today.
+    # It produces a html <ul><li></li></ul> structure with all necessary classes so you can produce every navigation the web uses today.
     # I.E. dropdown-navigations, simple mainnavigations or even complex nested ones.
     # 
     # === En detail:
     # 
-    #   <ul class="navigation_level_1">
+    #   <ul class="navigation level_1">
     #     <li class="first home"><a href="/home" class="active" title="Homepage" lang="en" data-page-id="1">Homepage</a></li>
     #     <li class="contact"><a href="/contact" title="Contact" lang="en" data-page-id="2">Contact</a></li>
     #     <li class="last imprint"><a href="/imprint" title="Imprint" lang="en" data-page-id="3">Imprint</a></li>
@@ -143,7 +143,15 @@ module Alchemy
     #   :reverse => false                                     # Reverse the navigation
     #   :reverse_children => false                            # Reverse the nested children
     # 
-    def render_navigation(options = {})
+    # === Passing HTML classes and ids to the renderer
+    # 
+    # A second hash will be passed as html_options to the navigation renderer partial.
+    # 
+    # ==== Example:
+    # 
+    #   <%= render_navigation({from_page => 'subnavi'}, {:class => 'navigation', :id => 'subnavigation'}) %>
+    # 
+    def render_navigation(options = {}, html_options = {})
       default_options = {
         :submenu => false,
         :all_sub_menues => false,
@@ -179,7 +187,12 @@ module Alchemy
       if options[:reverse]
         pages.reverse!
       end
-      render :partial => options[:navigation_partial], :locals => {:options => options, :pages => pages}
+      render(
+        options[:navigation_partial],
+        :options => options,
+        :pages => pages,
+        :html_options => html_options
+      )
     end
 
     # Renders navigation the children and all siblings of the given page (standard is the current page).
@@ -217,6 +230,12 @@ module Alchemy
       @breadcrumb.include?(page)
     end
 
+    # Returns +'active'+ if the given external page is in the current url path or +nil+.
+    def external_page_css_class(page)
+      return nil if !page.redirects_to_external?
+      request.path.split('/').delete_if(&:blank?).first == page.urlname.gsub(/^\//, '') ? 'active' : nil
+    end
+
     # Returns page links in a breadcrumb beginning from root to current page.
     # 
     # === Options:
@@ -293,7 +312,7 @@ module Alchemy
         :seperator => ""
       }
       default_options.update(options)
-      [default_options[:prefix], @page.title].join(default_options[:seperator])
+      [default_options[:prefix], response.status == 200 ? @page.title : response.status].join(default_options[:seperator])
     end
 
     # Returns a complete html <title> tag for the <head> part of the html document.
@@ -306,11 +325,10 @@ module Alchemy
     def render_title_tag(options={})
       default_options = {
         :prefix => "",
-        :seperator => "|"
+        :seperator => ""
       }
       options = default_options.merge(options)
-      title = render_page_title(options)
-      %(<title>#{title}</title>).html_safe
+      %(<title>#{render_page_title(options)}</title>).html_safe
     end
 
     # Renders a html <meta> tag for :name => "" and :content => ""
@@ -358,7 +376,7 @@ module Alchemy
       end
       default_options = {
         :title_prefix => "",
-        :title_seperator => "|",
+        :title_seperator => "",
         :default_lang => "de"
       }
       options = default_options.merge(options)
@@ -378,15 +396,15 @@ module Alchemy
       meta_string = %(
         <meta charset="UTF-8">
         #{render_title_tag(:prefix => options[:title_prefix], :seperator => options[:title_seperator])}
-      #{render_meta_tag(:name => "description", :content => description)}
-      #{render_meta_tag(:name => "keywords", :content => keywords)}
+        #{render_meta_tag(:name => "description", :content => description)}
+        #{render_meta_tag(:name => "keywords", :content => keywords)}
         <meta name="created" content="#{@page.updated_at}">
         <meta name="robots" content="#{robot}">
       )
       if @page.contains_feed?
         meta_string += %(
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, :protocol => 'feed', :format => :rss)}">
-      )
+          <link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, :protocol => 'feed', :format => :rss)}">
+        )
       end
       return meta_string.html_safe
     end

data/app/models/alchemy/attachment.rb

@@ -3,7 +3,7 @@ module Alchemy
 
     attr_accessible :uploaded_data, :name
 
-    stampable
+    stampable(:stamper_class_name => 'Alchemy::User')
 
     has_attachment(
       :storage => :file_system,

data/app/models/alchemy/content.rb

@@ -6,7 +6,7 @@ module Alchemy
     belongs_to :essence, :polymorphic => true, :dependent => :destroy
     belongs_to :element
 
-    stampable :stamper_class_name => :user
+    stampable(:stamper_class_name => 'Alchemy::User')
 
     acts_as_list
 
@@ -55,9 +55,9 @@ module Alchemy
     # Settings from the elements.yml definition
     def settings
       return {} if description.blank?
-      settings = description['settings']
-      return {} if settings.blank?
-      settings.symbolize_keys
+      @settings ||= description['settings']
+      return {} if @settings.blank?
+      @settings.symbolize_keys
     end
 
     def siblings
@@ -104,11 +104,11 @@ module Alchemy
         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)
+        @desc ||= self.element.content_description_for(self.name)
+        if @desc.blank?
+          @desc ||= self.element.available_content_description_for(self.name)
         else
-          return desc
+          return @desc
         end
       end
     end

data/app/models/alchemy/element.rb

@@ -13,7 +13,7 @@ module Alchemy
 
     # All Elements inside a cell are a list. All Elements not in cell are in the cell_id.nil list.
     acts_as_list :scope => [:page_id, :cell_id]
-    stampable :stamper_class_name => :user
+    stampable(:stamper_class_name => 'Alchemy::User')
 
     has_many :contents, :order => :position, :dependent => :destroy
     belongs_to :cell
@@ -121,22 +121,26 @@ module Alchemy
       contents.find_by_name(rss_title['name'])
     end
 
-    # Inits a new element for page as described in /config/alchemy/elements.yml from element_name
+    # Builds a new element as described in +/config/alchemy/elements.yml+
     def self.new_from_scratch(attributes)
       attributes.stringify_keys!
       return Element.new if attributes['name'].blank?
       element_descriptions = Element.descriptions
       return if element_descriptions.blank?
-      element_scratch = element_descriptions.select { |m| m["name"] == attributes['name'].split('#').first }.first
-      element = Element.new(
-        element_scratch.except('contents', 'available_contents', 'display_name', 'amount').merge({
-          :page_id => attributes['page_id']
-        })
-      )
-      element
+      element_name = attributes['name'].split('#').first
+      element_scratch = element_descriptions.detect { |m| m["name"] == element_name }
+      if element_scratch
+        Element.new(
+          element_scratch.except('contents', 'available_contents', 'display_name', 'amount').merge({
+            :page_id => attributes['page_id']
+          })
+        )
+      else
+        raise "Element description for #{element_name} not found. Please check your elements.yml"
+      end
     end
 
-    # Inits a new element for page as described in /config/alchemy/elements.yml from element_name and saves it
+    # Builds a new element as described in +/config/alchemy/elements.yml+ and saves it
     def self.create_from_scratch(attributes)
       element = Element.new_from_scratch(attributes)
       element.save if element

data/app/models/alchemy/essence_file.rb

@@ -1,7 +1,7 @@
 module Alchemy
   class EssenceFile < ActiveRecord::Base
 
-    attr_accessible :title, :css_class
+    attr_accessible :title, :css_class, :attachment_id
 
     acts_as_essence(
       :ingredient_column => :attachment,

data/app/models/alchemy/message.rb

@@ -1,13 +1,13 @@
 # This is a tableless model only used for validating contactform fields.
-# 
+#
 # You can specify the fields for your contactform in the +config/alchemy/config.yml+ file in the +:mailer+ options.
-# 
+#
 # === Example Contactform Configuration:
-# 
-#   :mailer:
-#     :form_layout_name: contact
-#     :fields: [subject, name, email, message, info]
-#     :validate_fields: [name, email]
+#
+#   mailer:
+#     form_layout_name: contact
+#     fields: [subject, name, email, message, info]
+#     validate_fields: [name, email]
 
 module Alchemy
   class Message
@@ -22,12 +22,12 @@ module Alchemy
     attr_accessor :contact_form_id, :ip
     attr_accessible :contact_form_id
 
-    @@config[:fields].each do |field|
+    @@config['fields'].each do |field|
       attr_accessor field.to_sym
       attr_accessible field.to_sym
     end
 
-    @@config[:validate_fields].each do |field|
+    @@config['validate_fields'].each do |field|
       validates_presence_of field
       if field.to_s == 'email'
         validates_format_of field, :with => ::Authlogic::Regex.email, :if => :email_is_filled

data/app/models/alchemy/page.rb

@@ -30,7 +30,7 @@ module Alchemy
     RESERVED_URLNAMES = %w(admin messages)
 
     acts_as_nested_set(:dependent => :destroy)
-    stampable
+    stampable(:stamper_class_name => 'Alchemy::User')
 
     has_many :folded_pages
     has_many :cells, :dependent => :destroy
@@ -64,7 +64,7 @@ module Alchemy
     scope :not_locked, where(:locked => false)
     scope :visible, where(:visible => true)
     scope :published, where(:public => true)
-    scope :accessable, where(:restricted => false)
+    scope :accessible, where(:restricted => false)
     scope :restricted, where(:restricted => true)
     scope :not_restricted, where(:restricted => false)
     scope :public_language_roots, lambda {
@@ -107,6 +107,7 @@ module Alchemy
       elsif !options[:except].blank?
         elements = elements.excluded(options[:except])
       end
+      elements = elements.reverse_order if options[:reverse_sort] || options[:reverse]
       elements = elements.offset(options[:offset]).limit(options[:count])
       elements = elements.order("RAND()") if options[:random]
       if show_non_public
@@ -260,7 +261,7 @@ module Alchemy
 
     def fold(user_id, status)
       folded_page = FoldedPage.find_or_create_by_user_id_and_page_id(user_id, self.id)
-      folded_page.update_attributes(:folded => status)
+      folded_page.folded = status
       folded_page.save
     end