alchemy_cms 2.0.rc3 → 2.0.rc4

data/.gitignore

@@ -1,3 +1,4 @@
+.idea
 .yardoc
 .DS_Store
 .svn
@@ -8,4 +9,5 @@ pkg
 /spec/dummy/log/development.log
 /spec/dummy/log/test.log
 /spec/dummy/db/test.sqlite3
-/spec/dummy/db/development.sqlite3
+/spec/dummy/db/development.sqlite3
+tmp

data/.rspec

@@ -1,3 +1,2 @@
 --color
---format documentation
---debug
+--format progress

data/.travis.yml

@@ -0,0 +1,11 @@
+rvm:
+  - 1.8.7
+branches:
+  only:
+    - next_stable
+before_script:
+  - "mysql -e 'create database alchemy_cms_test;'"
+  - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"
+script: "bundle exec rspec spec"
+# env:
+#   - DB=mysql

data/.yardopts

@@ -2,5 +2,4 @@
 app/**/*.rb
 config/**/*.yml
 lib/**/*
-recipes/*.rb
 README.md

data/Gemfile

@@ -5,13 +5,12 @@ gemspec
 
 group :development, :test do
 	gem 'gettext', '>=1.9.3', :require => false
-	gem "rspec-rails", ">= 2.0.0.beta"
 end
 
 group :test do
+	gem 'mysql2', '< 0.3'
 	gem 'factory_girl_rails'
 	gem "capybara", ">= 0.4.0"
 	gem "launchy"
-	gem "sqlite3"
 	gem "database_cleaner"
 end

data/README.md

@@ -1,6 +1,8 @@
 Alchemy CMS
 ===========
 
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png)](http://travis-ci.org/magiclabs/alchemy_cms)
+
 About
 -----
 
@@ -66,6 +68,7 @@ Installation
 
 Use the installer (recommended):
 
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -74,6 +77,17 @@ Start the local server:
 
 Then just switch to your browser and open `http://localhost:3000`.
 
+Add to existing Rails project:
+
+    add gem 'alchemy_cms' to Gemfile
+
+    bundle install
+    rake alchemy:prepare
+    rake alchemy:standard_set:install (optional)
+    rake db:migrate
+    rake db:seed
+
+
 Tipps
 -----
 

data/alchemy_cms.gemspec

@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.1"])
   
   s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
-  s.add_development_dependency(%q<sqlite3>)
+  s.add_development_dependency(%q<rspec-rails>, [">= 2.0"])
+	s.add_development_dependency(%q<sqlite3>)
+	s.add_development_dependency(%q<ruby-debug>)
+
 end

data/app/controllers/admin/clipboard_controller.rb

@@ -7,7 +7,9 @@ class Admin::ClipboardController < AlchemyController
   def index
     clipboard = get_clipboard(params[:remarkable_type].tableize)
     @clipboard_items = params[:remarkable_type].classify.constantize.all_from_clipboard(clipboard)
-    render :layout => false
+    respond_to do |format|
+      format.html { render :layout => false }
+    end
   end
 
   def insert
@@ -16,14 +18,8 @@ class Admin::ClipboardController < AlchemyController
     unless @clipboard.include?(params[:remarkable_id])
       @clipboard.push(params[:remarkable_id])
     end
-    if params[:remove] == 'true'
-      case params[:remarkable_type]
-        when 'element' then
-          @item.page = nil
-          @item.position = nil
-        when 'page' then #TODO: page.move feature
-      end
-      @item.save(false)
+    respond_to do |format|
+      format.js
     end
   rescue Exception => e
     exception_handler(e)
@@ -33,6 +29,9 @@ class Admin::ClipboardController < AlchemyController
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
     @clipboard.delete(params[:remarkable_id])
+    respond_to do |format|
+      format.js
+    end
   rescue Exception => e
     exception_handler(e)
   end

data/app/controllers/admin/contents_controller.rb

@@ -18,13 +18,13 @@ class Admin::ContentsController < AlchemyController
       @options = Rack::Utils.parse_query(@options)
     end
     if @content.essence_type == "EssencePicture"
+      @content.essence.picture = Picture.find(params[:picture_id])
+      @content.essence.save
       @contents_of_this_type = @element.contents.find_all_by_essence_type('EssencePicture')
       @dragable = @contents_of_this_type.length > 1
       @options = @options.merge(
         :dragable => @dragable
       ) if @options
-      @content.essence.picture = Picture.find(params[:picture_id])
-      @content.essence.save
     end
   rescue
     exception_handler($!)
@@ -48,6 +48,8 @@ class Admin::ContentsController < AlchemyController
       page.call("Alchemy.SortableContents", '#element_area .picture_gallery_images', form_authenticity_token)
       page.call('Alchemy.reloadPreview')
     end
+  rescue
+    exception_handler($!)
   end
   
   def destroy

data/app/controllers/admin/essence_pictures_controller.rb

@@ -79,10 +79,10 @@ class Admin::EssencePicturesController < AlchemyController
   def destroy
     content = Content.find_by_id(params[:id])
     @element = content.element
-    @essence_pictures = @element.contents.find_all_by_essence_type('EssencePicture')
     @content_id = content.id
-    @options = params[:options]
     content.destroy
+    @essence_pictures = @element.contents.find_all_by_essence_type('EssencePicture')
+    @options = params[:options]
   end
 
 end

data/app/controllers/admin/layoutpages_controller.rb

@@ -1,5 +1,7 @@
 class Admin::LayoutpagesController < AlchemyController
   
+  before_filter :set_translation
+  
   filter_access_to :all
   
   def index

data/app/controllers/admin/pages_controller.rb

@@ -46,9 +46,6 @@ class Admin::PagesController < AlchemyController
     else
       page = Page.create(params[:page])
     end
-    if page.valid? && parent
-      page.move_to_child_of(parent)
-    end
     render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, _("page '%{name}' created.") % {:name => page.name}, 'form#new_page_form button.button')
   rescue Exception => e
     exception_handler(e)
@@ -90,6 +87,7 @@ class Admin::PagesController < AlchemyController
     name = @page.name
     @page_id = @page.id
     @layoutpage = @page.layoutpage?
+		session[:language_id] = @page.language_id
     if @page.destroy
       @page_root = Page.language_root_for(session[:language_id])
       get_clipboard('pages').delete(@page.id)
@@ -145,7 +143,7 @@ class Admin::PagesController < AlchemyController
   
   def visit
     @page.unlock
-    redirect_to multi_language? ? show_page_path(:lang => @page.language_code, :urlname => @page.urlname) : show_page_path(@page.urlname)
+    redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
   end
   
   # Sets the page public and sweeps the page cache
@@ -206,7 +204,9 @@ class Admin::PagesController < AlchemyController
   end
   
   def switch_language
-    set_language_to(params[:language_id])
+		# we just set the new session here, because the AlchemyController
+		# will set the language via before_filter dependend on the session
+		session[:language_id] = params[:language_id]
     redirect_path = params[:layoutpages] ? admin_layoutpages_path : admin_pages_path
     if request.xhr?
       render :update do |page|

data/app/controllers/admin/pictures_controller.rb

@@ -101,7 +101,8 @@ class Admin::PicturesController < AlchemyController
       expire_page(:controller => '/pictures', :action => 'zoom', :id => picture.id)
     end
     render :update do |page|
-      page.call('Alchemy.growl', _('Picture cache flushed'))
+      page.call 'Alchemy.growl', _('Picture cache flushed')
+      page.call "Alchemy.pleaseWaitOverlay", false
     end
   end
 

data/app/controllers/admin/trash_controller.rb

@@ -2,6 +2,8 @@ class Admin::TrashController < AlchemyController
   
   filter_access_to [:index, :clear]
   
+  before_filter :set_translation
+  
   def index
     @elements = Element.trashed
     @page = Page.find_by_id(params[:page_id])

data/app/controllers/alchemy_controller.rb

@@ -12,9 +12,15 @@ class AlchemyController < ApplicationController
   before_filter :set_language
   before_filter :mailer_set_url_options
   
-  helper_method :current_server, :configuration, :multi_language?, :current_user, :clipboard_empty?, :trash_empty?, :get_clipboard
+  helper_method :current_server, :configuration, :multi_language?, :current_user, :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
   helper :layout
-  
+
+  # Returns true if the current_user (The logged-in Alchemy User) has the admin role.
+  def is_admin?
+    return false if !current_user
+    current_user.admin?
+  end
+
   def render_errors_or_redirect(object, redicrect_url, flash_notice, button = nil)
     if object.errors.empty?
       flash[:notice] = _(flash_notice)
@@ -23,7 +29,7 @@ class AlchemyController < ApplicationController
       render_remote_errors(object, button)
     end
   end
-  
+
   def render_remote_errors(object, button = nil)
     render :update do |page|
       page << "jQuery('#errors').html('<ul>" + object.errors.sum { |a, b| "<li>" + _(b) + "</li>" } + "</ul>')"
@@ -31,7 +37,7 @@ class AlchemyController < ApplicationController
       page << "Alchemy.enableButton('#{button}')" unless button.blank?
     end
   end
-  
+
   # Returns a host string with the domain the app is running on.
   def current_server
     # For local development server

data/app/controllers/elements_controller.rb

@@ -2,7 +2,7 @@ class ElementsController < AlchemyController
   
   filter_access_to [:show], :attribute_check => true
   layout false
-
+  
   # Returns the element partial as HTML or as JavaScript that tries to replace a given +container_id+ with the partial content via jQuery.
   def show
     @element = Element.find(params[:id])

data/app/helpers/admin/elements_helper.rb

@@ -1,5 +1,7 @@
 module Admin::ElementsHelper
 
+  include ::ElementsHelper
+
   # Returns an Array for essence_text_editor select options_for_select.
   def elements_by_name_for_select(name, options={})
     defaults = {
@@ -24,5 +26,34 @@ module Admin::ElementsHelper
     end
     return elements_for_options
   end
-  
+
+  # Renders the element editor partial
+  def render_editor(element)
+    render_element(element, :editor)
+  end
+
+  # This helper renderes the picture editor for the elements on the Alchemy Desktop.
+  # It brings full functionality for adding images to the element, deleting images from it and sorting them via drag'n'drop.
+  # Just place this helper inside your element editor view, pass the element as parameter and that's it.
+  #
+  # Options:
+  # :maximum_amount_of_images (integer), default nil. This option let you handle the amount of images your customer can add to this element.
+  def render_picture_editor(element, options={})
+    default_options = {
+      :last_image_deletable => true,
+      :maximum_amount_of_images => nil,
+      :refresh_sortable => true
+    }
+    options = default_options.merge(options)
+    picture_contents = element.all_contents_by_type("EssencePicture")
+    render(
+      :partial => "admin/elements/picture_editor",
+      :locals => {
+        :picture_contents => picture_contents,
+        :element => element,
+        :options => options
+      }
+    )
+  end
+
 end

data/app/helpers/alchemy_helper.rb

@@ -1,614 +1,15 @@
-# All methods (helpers) in this helper are used by Alchemy to render elements, contents and layouts on the Page.
-#
-# TODO: list all important infos here.
-# 
-# Most Important Infos:
-# ---
-#
-# 1. The most important helpers for webdevelopers are the render_navigation(), render_elements() and the render_page_layout() helpers.
-# 2. The currently displayed page can be accessed via the @page variable.
-# 3. All important meta data from @page will be rendered via the render_meta_data() helper.
-
 module AlchemyHelper
 
   include FastGettext::Translation
 
-  def configuration(name)
-    return Alchemy::Config.get(name)
-  end
-
   # An alias for truncate.
   # Left here for downwards compatibilty.
   def shorten(text, length)
     text.truncate(:length => length)
   end
 
-  def render_editor(element)
-    render_element(element, :editor)
-  end
-
-  def get_content(element, position)
-    return element.contents[position - 1]
-  end
-
-  # Renders all elements from @page.
-  # ---
-  # == Options are:
-  # :only => []                 A list of element names to be rendered only. Very usefull if you want to render a specific element type in a special html part (e.g.. <div>) of your page and all other elements in another part.
-  # :except => []               A list of element names to be rendered. The opposite of the only option.
-  # :from_page                  The Page.page_layout string from which the elements are rendered from, or you even pass a Page object.
-  # :count                      The amount of elements to be rendered (beginns with first element found)
-  # :fallback => {:for => 'ELEMENT_NAME', :with => 'ELEMENT_NAME', :from => 'PAGE_LAYOUT'} when no element from this name is found on page, then use this element from that page
-  # :sort_by => Content#name    A Content name to sort the elements by
-  # :reverse => boolean         Reverse the rendering order
-  #
-  # This helper also stores all pages where elements gets rendered on, so we can sweep them later if caching expires!
-  #
-  def render_elements(options = {})
-    default_options = {
-      :except => [],
-      :only => [],
-      :from_page => "",
-      :count => nil,
-      :offset => nil,
-      :locals => {},
-      :render_format => "html",
-      :fallback => nil
-    }
-    options = default_options.merge(options)
-    if options[:from_page].blank?
-      page = @page
-    else
-      if options[:from_page].class == Page
-        page = options[:from_page]
-      else
-        page = Page.find_all_by_page_layout_and_language_id(options[:from_page], session[:language_id])
-      end
-    end
-    if page.blank?
-      warning('Page is nil')
-      return ""
-    else
-      show_non_public = configuration(:cache_pages) ? false : defined?(current_user)
-      if page.class == Array
-        all_elements = page.collect { |p| p.find_elements(options, show_non_public) }.flatten
-      else
-        all_elements = page.find_elements(options, show_non_public)
-      end
-      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] }
-          if from = Page.find_by_page_layout(options[:fallback][:from])
-            all_elements += from.elements.find_all_by_name(options[:fallback][:with].blank? ? options[:fallback][:for] : options[:fallback][:with])
-          end
-        end
-      end
-      all_elements.each_with_index do |element, i|
-        element_string += render_element(element, :view, options, i+1)
-      end
-      element_string.html_safe
-    end
-  end
-
-  # This helper renders the Element partial for either the view or the editor part.
-  # Generate element partials with ./script/generate elements
-  def render_element(element, part = :view, options = {}, i = 1)
-    begin
-      if element.blank?
-        warning('Element is nil')
-        render :partial => "elements/#{part}_not_found", :locals => {:name => 'nil'}
-      else
-        default_options = {
-          :shorten_to => nil,
-          :render_format => "html"
-        }
-        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 => "elements/#{element.name.underscore}_#{part}.#{options[:render_format]}.erb",
-          :locals => {
-            :element => element, 
-            :options => options, 
-            :counter => i
-          }.merge(locals || {})
-        )
-      end
-    rescue ActionView::MissingTemplate
-      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'
-      ))
-      render :partial => "elements/#{part}_not_found", :locals => {:name => element.name, :error => "Element #{part} partial not found. Use rails generate alchemy:elements to generate them."}
-    end
-  end
-
-  # Renders the Content partial that is given (:editor, or :view).
-  # You can pass several options that are used by the different contents.
-  #
-  # For the view partial:
-  # :image_size => "111x93"                        Used by EssencePicture to render the image via RMagick to that size.
-  # :css_class => ""                               This css class gets attached to the content view.
-  # :date_format => "Am %d. %m. %Y, um %H:%Mh"     Espacially fot the EssenceDate. See Date.strftime for date formatting.
-  # :caption => true                               Pass true to enable that the EssencePicture.caption value gets rendered.
-  # :blank_value => ""                             Pass a String that gets rendered if the content.essence is blank.
-  #
-  # For the editor partial:
-  # :css_class => ""                               This css class gets attached to the content editor.
-  # :last_image_deletable => false                 Pass true to enable that the last image of an imagecollection (e.g. image gallery) is deletable.
-  def render_essence(content, part = :view, options = {}, html_options = {})
-    if content.nil?
-      return part == :view ? "" : warning('Content is nil', _("content_not_found"))
-    elsif content.essence.nil?
-      return part == :view ? "" : warning('Essence is nil', _("content_essence_not_found"))
-    end
-    defaults = {
-      :for_editor => {
-        :as => 'text_field',
-        :css_class => 'long',
-        :render_format => "html"
-      },
-      :for_view => {
-        :image_size => "120x90",
-        :css_class => "",
-        :date_format => "%d. %m. %Y, %H:%Mh",
-        :caption => true,
-        :blank_value => "",
-        :render_format => "html"
-      }
-    }
-    options_for_partial = defaults[('for_' + part.to_s).to_sym].merge(options[('for_' + part.to_s).to_sym])
-    options = options.merge(defaults)
-    render(
-      :partial => "essences/#{content.essence.class.name.underscore}_#{part.to_s}.#{options_for_partial[:render_format]}.erb",
-      :locals => {
-        :content => content,
-        :options => options_for_partial,
-        :html_options => html_options
-      }
-    )
-  end
-  
-  # Renders the Content editor partial from the given Content.
-  # For options see -> render_essence
-  def render_essence_editor(content, options = {})
-    render_essence(content, :editor, :for_editor => options)
-  end
-  
-  # Renders the Content view partial from the given Content.
-  # For options see -> render_essence
-  def render_essence_view(content, options = {}, html_options = {})
-    render_essence(content, :view, {:for_view => options}, html_options)
-  end
-  
-  # Renders the Content editor partial from essence_type.
-  # 
-  # Options are:
-  #   * element (Element) - the Element the contents are in (obligatory)
-  #   * type (String) - the type of Essence (obligatory)
-  #   * options (Hash):
-  #   ** :position (Integer) - The position of the Content inside the Element. I.E. for getting the n-th EssencePicture. Default is 1 (the first)
-  #   ** :all (String) - Pass :all to get all Contents of that name. Default false
-  #   * 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', _("no_element_given")) if element.blank?
-    return warning('EssenceType is blank', _("No EssenceType given")) if essence_type.blank?
-    defaults = {
-      :position => 1,
-      :all => false
-    }
-    options = defaults.merge(options)
-    return_string = ""
-    if options[:all]
-      contents = element.contents.find_all_by_essence_type_and_name(essence_type, options[:all])
-      contents.each do |content|
-        return_string << render_essence(content, :editor, :for_editor => editor_options)
-      end
-    else
-      content = element.contents.find_by_essence_type_and_position(essence_type, options[:position])
-      return_string = render_essence(content, :editor, :for_editor => editor_options)
-    end
-    return_string
-  end
-  
-  # Renders the Content view partial from the given Element for the essence_type (e.g. EssenceRichtext).
-  # For multiple contents of same kind inside one molecue just pass a position so that will be rendered.
-  # Otherwise the first content found for this type will be rendered.
-  # For options see -> render_essence
-  def render_essence_view_by_type(element, type, position, options = {}, html_options = {})
-    if element.blank?
-      warning('Element is nil')
-      return ""
-    end
-    if position.nil?
-      content = element.content_by_type(type)
-    else
-      content = element.contents.find_by_essence_type_and_position(type, position)
-    end
-    render_essence(content, :view, :for_view => options)
-  end
-
-  # Renders the Content view partial from the given Element by position (e.g. 1).
-  # For options see -> render_essence
-  def render_essence_view_by_position(element, position, options = {}, html_options = {})
-    if element.blank?
-      warning('Element is nil')
-      return ""
-    end
-    content = element.contents.find_by_position(position)
-    render_essence(content, :view, {:for_view => options}, html_options)
-  end
-  
-  # 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 = {})
-    if element.blank?
-      warning('Element is nil')
-      return ""
-    end
-    content = element.contents.find_by_position(position)
-    render_essence(content, :editor, :for_editor => options)
-  end
-  
-  # Renders the Content editor partial found in views/contents/ for the content with name inside the passed Element.
-  # For options see -> render_essence
-  # 
-  # Content creation on the fly:
-  # 
-  # If you update the elements.yml file after creating an element this helper displays a error message with an option to create the content.
-  #
-  def render_essence_editor_by_name(element, name, options = {})
-    if element.blank?
-      return warning('Element is nil', _("no_element_given"))
-    end
-    content = element.content_by_name(name)
-    if content.blank?
-      render :partial => 'admin/contents/missing', :locals => {:element => element, :name => name}
-    else
-      render_essence(content, :editor, :for_editor => options)
-    end
-  end
-  
-  # Renders the Content view partial from the passed Element for passed content name.
-  # For options see -> render_essence
-  def render_essence_view_by_name(element, name, options = {}, html_options = {})
-    if element.blank?
-      warning('Element is nil')
-      return ""
-    end
-    content = element.content_by_name(name)
-    render_essence(content, :view, {:for_view => options}, html_options)
-  end
-
-  # Renders the name of elements content or the default name defined in elements.yml
-  def render_content_name(content)
-    if content.blank?
-      warning('Element is nil')
-      return ""
-    else
-      content_name = content.name_for_label
-    end
-    if content.description.blank?
-      warning("Content #{content.name} is missing its description")
-      title = _("Warning: Content '%{contentname}' is missing its description.") % {:contentname => content.name}
-      content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;) + content_name
-    end
-    content.has_validations? ? "#{content_name}<span class='validation_indicator'>*</span>" : content_name
-  end
-  
-  # Returns @page.title
-  #
-  # The options are:
-  # :prefix => ""
-  # :seperator => "|"
-  #
-  # == Webdevelopers:
-  # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-  # So you dont have to worry about anything.
-  def render_page_title options={}
-    default_options = {
-      :prefix => "",
-      :seperator => "|"
-    }
-    default_options.update(options)
-    unless @page.title.blank?
-      h("#{default_options[:prefix]} #{default_options[:seperator]} #{@page.title}")
-    else
-      h("")
-    end
-  end
-
-  # Returns a complete html <title> tag for the <head> part of the html document.
-  #
-  # == Webdevelopers:
-  # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-  # So you dont have to worry about anything.
-  def render_title_tag options={}
-    default_options = {
-      :prefix => "",
-      :seperator => "|"
-    }
-    options = default_options.merge(options)
-    title = render_page_title(options)
-    %(<title>#{title}</title>).html_safe
-  end
-
-  # Renders a html <meta> tag for :name => "" and :content => ""
-  #
-  # == Webdevelopers:
-  # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-  # So you dont have to worry about anything.
-  def render_meta_tag(options={})
-    default_options = {
-      :name => "",
-      :default_language => "de",
-      :content => ""
-    }
-    options = default_options.merge(options)
-    lang = (@page.language.blank? ? options[:default_language] : @page.language.code)
-    %(<meta name="#{options[:name]}" content="#{options[:content]}" lang="#{lang}" />).html_safe
-  end
-
-  # Renders a html <meta http-equiv="Content-Language" content="#{lang}" /> for @page.language.
-  #
-  # == Webdevelopers:
-  # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-  # So you dont have to worry about anything.
-  def render_meta_content_language_tag(options={})
-    default_options = {
-      :default_language => "de"
-    }
-    options = default_options.merge(options)
-    lang = (@page.language_code.blank? ? options[:default_language] : @page.language_code)
-    %(<meta http-equiv="Content-Language" content="#{lang}" />).html_safe
-  end
-
-  # = This helper takes care of all important meta tags for your @page.
-  # ---
-  # The meta data is been taken from the @page.title, @page.meta_description, @page.meta_keywords, @page.updated_at and @page.language database entries managed by the Alchemy user via the Alchemy cockpit.
-  #
-  # Assume that the user has entered following data into the Alchemy cockpit of the Page "home" and that the user wants that the searchengine (aka. google) robot should index the page and should follow all links on this page:
-  #
-  # Title = Homepage
-  # 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:
-  #
-  # <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  # <meta http-equiv="Content-Language" content="de" />
-  # <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="robots" content="index, follow" />
-  # 
-  def render_meta_data options={}
-    if @page.blank?
-      warning("No Page found!")
-      return nil
-    end
-    default_options = {
-      :title_prefix => "",
-      :title_seperator => "|",
-      :default_lang => "de"
-    }
-    options = default_options.merge(options)
-    #render meta description of the root page from language if the current meta description is empty
-    if @page.meta_description.blank?
-      description = Page.find_by_language_root_and_language_id(true, session[:language_id]).meta_description rescue ""
-    else
-      description = @page.meta_description
-    end
-    #render meta keywords of the root page from language if the current meta keywords is empty
-    if @page.meta_keywords.blank?
-      keywords = Page.find_by_language_root_and_language_id(true, session[:language_id]).meta_keywords rescue ""
-    else
-      keywords = @page.meta_keywords
-    end
-    robot = "#{@page.robot_index? ? "" : "no"}index, #{@page.robot_follow? ? "" : "no"}follow"
-    meta_string = %(
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      #{render_meta_content_language_tag}
-      #{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)}
-      <meta name="generator" content="Alchemy #{Alchemy::VERSION}" />
-      <meta name="date" 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="#{multi_language? ? show_page_url(:protocol => 'feed', :urlname => @page.urlname, :lang => @page.language_code, :format => :rss) : show_page_url(:protocol => 'feed', :urlname => @page.urlname, :format => :rss)}" />
-    )
-    end
-    return meta_string.html_safe
-  end
-
-  # Returns an array of all pages in the same branch from current. Used internally to find the active page in navigations.
-  def breadcrumb(current)
-    return [] if current.nil?
-    result = Array.new
-    result << current
-    while current = current.parent
-      result << current
-    end
-    return result.reverse
-  end
-
-  # Returns a html string for a linked breadcrumb from root to current page.
-  # == Options:
-  # :seperator => %(<span class="seperator">></span>)      Maybe you don't want this seperator. Pass another one.
-  # :page => @page                                         Pass a different Page instead of the default (@page).
-  # :without => nil                                        Pass Pageobject or array of Pages that must not be displayed.
-  # :public_only => false                                  Pass boolean for displaying hidden pages only.
-  # :visible_only => true                                  Pass boolean for displaying (in navigation) visible pages only.
-  # :restricted_only => false                              Pass boolean for displaying restricted pages only.
-  # :reverse => false                                      Pass boolean for displaying reversed breadcrumb.
-  def render_breadcrumb(options={})
-    default_options = {
-      :seperator => %(<span class="seperator">&gt;</span>),
-      :page => @page,
-      :without => nil,
-      :public_only => false,
-      :visible_only => true,
-      :restricted_only => false,
-      :reverse => false
-    }
-    options = default_options.merge(options)
-    pages = breadcrumb(options[:page])
-    pages.delete(Page.root)
-    unless options[:without].nil?
-      unless options[:without].class == Array
-        pages.delete(options[:without])
-      else
-        pages = pages - options[:without]
-      end
-    end
-    if(options[:visible_only])
-      pages.reject!{|p| !p.visible? }
-    end
-    if(options[:public_only])
-      pages.reject!{|p| !p.public? }
-    end
-    if(options[:restricted_only])
-      pages.reject!{|p| !p.restricted? }
-    end
-    if(options[:reverse])
-      pages.reverse!
-    end
-    bc = []
-    pages.each do |page|
-      urlname = page.urlname
-      (page.name == @page.name) ? css_class = "active" : nil
-      if page == pages.last
-        css_class.blank? ? css_class = "last" : css_class = [css_class, "last"].join(" ")
-      elsif page == pages.first
-        css_class.blank? ? css_class = "first" : css_class = [css_class, "last"].join(" ")
-      end
-      if multi_language? 
-        url = show_page_url(:urlname => urlname, :lang => page.language_code)
-      else
-        url = show_page_url(:urlname => urlname)
-      end
-      bc << link_to( h(page.name), url, :class => css_class, :title => page.title )
-    end
-    bc.join(options[:seperator]).html_safe
-  end
-
-  # returns true if page is in the active branch
-  def page_active? page
-    @breadcrumb ||= breadcrumb(@page)
-    @breadcrumb.include? page
-  end
-
-  # = This helper renders the navigation.
-  #
-  # It produces a html <ul><li></li></ul> structure with all necessary classes and ids so you can produce nearly every navigation the web uses today.
-  # E.G. dropdown-navigations, simple mainnavigations or even complex nested ones.
-  # ---
-  # == En detail:
-  # 
-  # <ul>
-  #   <li class="first" id="home"><a href="home" class="active">Homepage</a></li>
-  #   <li id="contact"><a href="contact">Contact</a></li>
-  #   <li class="last" id="imprint"><a href="imprint">Imprint</a></li>
-  # </ul>
-  #
-  # As you can see: Everything you need.
-  #
-  # Not pleased with the way Alchemy produces the navigation structure?
-  # Then feel free to overwrite the partials (_navigation_renderer.html.erb and _navigation_link.html.erb) found in views/pages/partials/ or pass different partials via the options :navigation_partial and :navigation_link_partial.
-  #
-  # == The options are:
-  #
-  # :submenu => false                                     Do you want a nested <ul> <li> structure for the deeper levels of your navigation, or not? Used to display the subnavigation within the mainnaviagtion. E.g. for dropdown menues.
-  # :from_page => @root_page                               Do you want to render a navigation from a different page then the current page? Then pass an Page instance or a Alchemy::PageLayout name as string.
-  # :spacer => ""                                         Yeah even a spacer for the entries can be passed. Simple string, or even a complex html structure. E.g: "<span class='spacer'>|</spacer>". Only your imagination is the limit. And the W3C of course :)
-  # :navigation_partial => "navigation_renderer"          Pass a different partial to be taken for the navigation rendering. CAUTION: Only for the advanced Alchemy webdevelopers. The standard partial takes care of nearly everything. But maybe you are an adventures one ^_^
-  # :navigation_link_partial => "navigation_link"         Alchemy places an <a> html link in <li> tags. The tag automatically has an active css class if necessary. So styling is everything. But maybe you don't want this. So feel free to make you own partial and pass the filename here.
-  # :show_nonactive => false                              Commonly Alchemy only displays the submenu of the active page (if :submenu => true). If you want to display all child pages then pass true (together with :submenu => true of course). E.g. for the popular css-driven dropdownmenues these days.
-  # :show_title => true                                   For our beloved SEOs :). Appends a title attribute to all links and places the page.title content into it.
-  def render_navigation(options = {})
-    default_options = {
-      :submenu => false,
-      :all_sub_menues => false,
-      :from_page => @root_page,
-      :spacer => "",
-      :navigation_partial => "partials/navigation_renderer",
-      :navigation_link_partial => "partials/navigation_link",
-      :show_nonactive => false,
-      :restricted_only => nil,
-      :show_title => true,
-      :reverse => false,
-      :reverse_children => false
-    }
-    options = default_options.merge(options)
-    if options[:from_page].is_a?(String)
-      page = Page.find_by_page_layout_and_language_id(options[:from_page], session[:language_id])
-    else
-      page = options[:from_page]
-    end
-    if page.blank?
-      warning("No Page found for #{options[:from_page]}")
-      return ""
-    end
-    conditions = {
-      :parent_id => page.id,
-      :restricted => options[:restricted_only] || false,
-      :visible => true
-    }
-    if options[:restricted_only].nil?
-      conditions.delete(:restricted)
-    end
-    pages = Page.where(conditions).order("lft ASC")
-    if options[:reverse]
-      pages.reverse!
-    end
-    render :partial => options[:navigation_partial], :locals => {:options => options, :pages => pages}
-  end
-
-  # Renders the children of the given page (standard is the current page), the given page and its siblings if there are no children, or it renders just nil.
-  # Use this helper if you want to render the subnavigation independent from the mainnavigation. E.g. to place it in a different layer on your website.
-  # If :from_page's level in the site-hierarchy is greater than :level (standard is 2) and the given page has no children, the returned output will be the :from_page and it's siblings
-  # This method will assign all its options to the the render_navigation method, so you are able to assign the same options as to the render_navigation method.
-  # Normally there is no need to change the level parameter, just in a few special cases.
-  def render_subnavigation(options = {})
-    default_options = {
-      :from_page => @page,
-      :level => 2
-    }
-    options = default_options.merge(options)
-    if !options[:from_page].nil?
-      if (options[:from_page].children.blank? && options[:from_page].level > options[:level])
-        options = options.merge(:from_page => Page.find(options[:from_page].parent_id))
-      end
-      render_navigation(options)
-    else
-      return nil
-    end
-  end
-
-  # Returns true if the current_user (The logged-in Alchemy User) has the admin role.
-  def is_admin?
-    return false if !current_user
-    current_user.admin?
-  end
-
-  # This helper renders the link for a protoypejs-window overlay. We use this for our fancy modal overlay windows in the Alchemy cockpit.
+  # This helper renders the link for an overlay window.
+  # We use this for our fancy modal overlay windows in the Alchemy cockpit.
   def link_to_overlay_window(content, url, options={}, html_options={})
     default_options = {
       :size => "100x100",
@@ -653,24 +54,6 @@ module AlchemyHelper
     )
   end
 
-  # Renders an image_tag from for an image in public/images folder so it can be cached.
-  # *Not really working!*
-  def static_image_tag image, options={}
-    image_tag url_for(:controller => :images, :action => :show_static, :image => image)
-  end
-
-  # Renders the layout from @page.page_layout. File resists in /app/views/page_layouts/_LAYOUT-NAME.html.erb
-  def render_page_layout(options={})
-    default_options = {
-      :render_format => "html"
-    }
-    options = default_options.merge(options)
-    render :partial => "page_layouts/#{@page.page_layout.downcase}.#{options[:render_format]}.erb"
-  rescue ActionView::MissingTemplate
-    warning("PageLayout: '#{@page.page_layout}' not found. Rendering standard page_layout.")
-    render :partial => "page_layouts/standard"
-  end
-
   # Returns @current_language set in the action (e.g. Page.show)
   def current_language
     if @current_language.nil?
@@ -681,16 +64,6 @@ module AlchemyHelper
     end
   end
 
-  # Returns true if the current page is the root page in the nested set of Pages, false if not.
-  def root_page?
-    @page == @root_page
-  end
-
-  # Returns the full url containing host, page and anchor for the given element
-  def full_url_for_element element
-    "http://" + request.env["HTTP_HOST"] + "/" + element.page.urlname + "##{element.name}_#{element.id}"  
-  end
-
   # Used for language selector in Alchemy cockpit sitemap. So the user can select the language branche of the page.
   def language_codes_for_select
     configuration(:languages).collect{ |language|
@@ -784,7 +157,7 @@ module AlchemyHelper
       html_options
     )
   end
-  
+
   # Renders a form select tag for storing page urlnames
   # Options:
   #   * element - element the Content find via content_name to store the pages urlname in.
@@ -865,68 +238,6 @@ module AlchemyHelper
     options_for_select(result, selected.to_s)
   end
 
-  # Returns all public elements found by Element.name.
-  # Pass a count to return only an limited amount of elements.
-  def all_elements_by_name(name, options = {})
-    warning('options[:language] option not allowed any more in all_elements_by_name helper') unless options[:language].blank?
-    default_options = {
-      :count => :all,
-      :from_page => :all
-    }
-    options = default_options.merge(options)
-    if options[:from_page] == :all
-      elements = Element.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
-    elsif options[:from_page].class == String
-      page = Page.find_by_page_layout_and_language_id(options[:from_page], session[:language_id])
-      return [] if page.blank?
-      elements = page.elements.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
-    else
-      elements = options[:from_page].elements.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
-    end
-  end
-  
-  # Returns the public element found by Element.name from the given public Page, either by Page.id or by Page.urlname
-  def element_from_page(options = {})
-    default_options = {
-      :page_urlname => "",
-      :page_id => nil,
-      :element_name => ""
-    }
-    options = default_options.merge(options)
-    if options[:page_id].blank?
-      page = Page.find_by_urlname_and_public(options[:page_urlname], true)
-    else
-      page = Page.find_by_id_and_public(options[:page_id], true)
-    end
-    return "" if page.blank?
-    element = page.elements.find_by_name_and_public(options[:element_name], true)
-    return element
-  end
-  
-  # This helper renderes the picture editor for the elements on the Alchemy Desktop.
-  # It brings full functionality for adding images to the element, deleting images from it and sorting them via drag'n'drop.
-  # Just place this helper inside your element editor view, pass the element as parameter and that's it.
-  #
-  # Options:
-  # :maximum_amount_of_images (integer), default nil. This option let you handle the amount of images your customer can add to this element.
-  def render_picture_editor(element, options={})
-    default_options = {
-      :last_image_deletable => true,
-      :maximum_amount_of_images => nil,
-      :refresh_sortable => true
-    }
-    options = default_options.merge(options)
-    picture_contents = element.all_contents_by_type("EssencePicture")
-    render(
-      :partial => "admin/elements/picture_editor",
-      :locals => {
-        :picture_contents => picture_contents,
-        :element => element,
-        :options => options
-      }
-    )
-  end
-
   def render_essence_selection_editor(element, content, select_options)
     if content.class == String
        content = element.contents.find_by_name(content)
@@ -992,34 +303,6 @@ module AlchemyHelper
     end
   end
 
-  # Generates the url for the preview frame.
-  # target_url must contain target_controller and target_action.
-  def generate_preview_url(target_url)
-    preview_url = url_for(
-      :controller => ('/' + target_url["target_controller"]),
-      :action => target_url["target_action"],
-      :id => params[:id]
-    )
-  end
-
-  # 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}"
-  end
-
-  # Returns a string for the id attribute of a html element for the given content
-  def content_dom_id(content)
-    return "" if content.nil?
-    if content.class == String
-      a = Content.find_by_name(content)
-      return "" if a.nil?
-    else
-      a = content
-    end
-    "#{a.essence_type.underscore}_#{a.id}"
-  end
-
   # Helper for including the nescessary javascripts and stylesheets for the different views.
   # Together with the rails caching we achieve a good load time.
   def alchemy_assets_set(setname = 'combined')
@@ -1047,56 +330,11 @@ module AlchemyHelper
     pathname
   end
 
-  def render_new_content_link(element)
-    link_to_overlay_window(
-      _('add new content'),
-      new_admin_element_content_path(element),
-      {
-        :size => '305x40',
-        :title => _('Select an content'),
-        :overflow => true
-      },
-      {
-        :id => "add_content_for_element_#{element.id}",
-        :class => 'button new_content_link'
-      }
-    )
-  end
-
-  def render_create_content_link(element, options = {})
-    defaults = {
-      :label => _('add new content')
-    }
-    options = defaults.merge(options)
-    link_to(
-      options[:label],
-      admin_contents_path(
-        :content => {
-          :name => options[:content_name],
-          :element_id => element.id
-        }
-      ),
-      :method => 'post',
-      :remote => true,
-      :id => "add_content_for_element_#{element.id}",
-      :class => 'button new_content_link'
-    )
-  end
-
   # Returns an icon
   def render_icon(icon_class)
     content_tag('span', '', :class => "icon #{icon_class}")
   end
 
-  def alchemy_preview_mode_code
-    javascript_include_tag("alchemy/alchemy.preview") if @preview_mode
-  end
-  
-  # Renders the data-alchemy-element HTML attribut used for the preview window hover effect.
-  def element_preview_code(element)
-    " data-alchemy-element='#{element.id}'" if @preview_mode && element.page == @page
-  end
-
   # 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
@@ -1114,61 +352,11 @@ module AlchemyHelper
     alchemy_assets_set
   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])
-      return warning("No page found for #{options.inspect} ") if page.blank?
-      urlname = page.urlname
-    else
-      urlname = options[:urlname]
-    end
-    if multi_language?
-      show_page_path({:urlname => urlname, :lang => @language.code}.merge(options.except(:page_layout, :urlname)))
-    else
-      show_page_path({:urlname => urlname}.merge(options.except(:page_layout, :urlname)))
-    end
-  end
-
-  # Returns the current page.
-  def current_page
-    @page
-  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.
-  def render_cell(name)
-    cell = @page.cells.find_by_name(name)
-    return "" if cell.blank?    
-    render :partial => "cells/#{name}", :locals => {:cell => cell}
-  end
-  
-  # Renders all element partials from given cell.
-  def render_cell_elements(cell)
-    return warning("No cell given.") if cell.blank?
-    ret = ""
-    cell.elements.each do |element|
-      ret << render_element(element)
-    end
-    ret.html_safe
-  end
-  
-  # Returns true or false if no elements are in the cell found by name.
-  def cell_empty?(name)
-    cell = @page.cells.find_by_name(name)
-    return true if cell.blank?
-    cell.elements.blank?
-  end
-  
   def necessary_options_for_cropping_provided?(options)
     options[:crop].to_s == 'true' && !options[:image_size].blank?
   end
 
+  # Renders translated Module Names for html title element.
   def render_alchemy_title
     key = 'module: ' + controller_name
     if content_for?(:title)
@@ -1181,10 +369,19 @@ module AlchemyHelper
     "Alchemy CMS - #{title}"
   end
 
+  # Returns max image count as integer or nil. Used for the picture editor in element editor views.
   def max_image_count
     return nil if !@options
-    image_count = @options[:maximum_amount_of_images] || @options[:max_images]
-    image_count.to_i unless image_count.blank?
+    if @options[:maximum_amount_of_images].blank?
+      image_count = @options[:max_images]
+    else
+      image_count = @options[:maximum_amount_of_images]
+    end
+    if image_count.blank?
+      nil
+    else
+      image_count.to_i
+    end
   end
 
 end