alchemy_cms 2.1.rc2 → 2.1.rc3

data/Gemfile

@@ -23,5 +23,6 @@ group :development do
 		gem 'ruby-debug19', '~> 0.11.6', :require => 'ruby-debug', :platform => :ruby_19
 		gem 'ruby-debug', :platform => :ruby_18
 		gem 'guard-spork'
+		gem 'yard'
 	end
 end

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

@@ -72,7 +72,7 @@ if (typeof(Alchemy) === 'undefined') {
         });
         editor.selection.collapse();
       } else {
-        // aka: we are linking an content
+        // aka: we are linking an essence
         var essence_type = element.name.replace('essence_', '').split('_')[0];
         var content_id = null;
         switch (essence_type) {
@@ -83,7 +83,7 @@ if (typeof(Alchemy) === 'undefined') {
           content_id = element.name.replace('essence_text_', '');
           break;
         }
-        $('#contents_content_' + content_id + '_link').val(url);
+        $('#contents_content_' + content_id + '_link').val(url).change();
         $('#contents_content_' + content_id + '_link_title').val(title);
         $('#contents_content_' + content_id + '_link_class_name').val(link_type);
         $('#contents_content_' + content_id + '_link_target').val(target);
@@ -203,7 +203,7 @@ if (typeof(Alchemy) === 'undefined') {
     
     removeLink : function(link, content_id) {
       Alchemy.setElementDirty($(link).parents('.element_editor'));
-      $('#contents_content_' + content_id + '_link').val('');
+      $('#contents_content_' + content_id + '_link').val('').change();
       $('#contents_content_' + content_id + '_link_title').val('');
       $('#contents_content_' + content_id + '_link_class_name').val('');
       $('#contents_content_' + content_id + '_link_target').val('');

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

@@ -321,17 +321,28 @@ div#element_area .sortable_cell {
 	top: 5px;
 }
 
-div.content_editor a.icon_button {
-	margin: 0 0 0 4px;
+span.linkable_text_essence_tools {
 	position: absolute;
 	bottom: 0;
-	right: 24px;
-	@include reset-border-radius;
-}
-
-div.content_editor a.icon_button.unlink {
-	@include right-rounded-border;
-	right: 1px;
+	right: 2px;
+	a.icon_button {
+		margin: 0 0 0 4px;
+		position: absolute;
+		bottom: 0;
+		right: 26px;
+		@include reset-border-radius;
+		height: 27px;
+		width: 27px;
+		background-position: 0 -72px;
+		&.unlink {
+			right: 0;
+			@include right-rounded-border;
+		}
+		.icon {
+			left: 5px;
+			top: 6px;
+		}
+	}
 }
 
 a.expand_element {

data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /*
  * jQuery UI CSS Framework 1.8.7

data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
 .jcrop-holder { text-align: left; }
 

data/app/assets/stylesheets/alchemy/jquery.sb.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /* always visible styles */
 

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

@@ -2,7 +2,7 @@
  *= require_self
 */
 
-@import "defaults";
+@import "alchemy/defaults";
 
 @mixin transition {
 	-webkit-transition: left 0.15s ease;
@@ -61,8 +61,9 @@
 		background: image-url('alchemy/icons.png') -240px 0;
 	};
 	ul {
-		padding: 6px 0;
+		padding: 0;
 		margin: 0;
+		line-height: 2em;
 		li {
 			line-height: normal;
 			margin-right: $default-padding;

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

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 body, td, pre {
 	color: $text-color;

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

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /* Generic */
 

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

@@ -61,7 +61,7 @@ module Alchemy
 
 			def get_clipboard(category = nil)
 				clipboard = (session[:clipboard] ||= {})
-				clipboard[category.pluralize] ||= [] if category
+				clipboard[category.to_s.pluralize] ||= [] if category
 			end
 
 			def clipboard_empty?(category = nil)

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

@@ -105,45 +105,6 @@ module Alchemy
 				)
 			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.
-			#   * content_name - the name of the content from element to store the pages urlname in.
-			#   * options (Hash)
-			#   ** :only (Hash)  - pass page_layout names to :page_layout => [""] so only pages with this page_layout will be displayed inside the select.
-			#   ** :except (Hash)  - pass page_layout names to :page_layout => [""] so all pages except these with this page_layout will be displayed inside the select.
-			#   ** :page_attribute (Symbol) - The Page attribute which will be stored.
-			#   * select_options (Hash) - will be passed to the select_tag helper
-			def page_selector(element, content_name, options = {}, select_options = {})
-				default_options = {
-					:except => {
-						:page_layout => [""]
-					},
-					:only => {
-						:page_layout => [""]
-					},
-					:page_attribute => :urlname,
-					:prompt => t('Choose page')
-				}
-				options = default_options.merge(options)
-				content = element.content_by_name(content_name)
-				if content.nil?
-					return warning('Content', t('content_not_found'))
-				elsif content.essence.nil?
-					return warning('Content', t('content_essence_not_found'))
-				end
-				pages = Page.where({
-					:language_id => session[:language_id],
-					:page_layout => options[:only][:page_layout],
-					:public => true
-				})
-				select_tag(
-					"contents[content_#{content.id}][body]",
-					pages_for_select(pages, content.essence.body, options[:prompt], options[:page_attribute]),
-					select_options
-				)
-			end
-
 			# Returns an Array build for passing it to the options_for_select helper inside an essence editor partial.
 			# Usefull for the select_values options from the render_essence_editor helpers.
 			# Options:
@@ -318,7 +279,7 @@ module Alchemy
 					'paste_from_clipboard',
 					!@page.new_record? && @page.can_have_cells? ? grouped_elements_for_select(items, :id) : options_for_select(options),
 					{
-						:class => html_options[:class] || 'very_long',
+						:class => html_options[:class],
 						:style => html_options[:style]
 					}
 				)

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

@@ -27,7 +27,7 @@ module Alchemy
 				if content.description.blank?
 					warning("Content #{content.name} is missing its description")
 					title = t("Warning: Content is missing its description.", :contentname => content.name)
-					content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;) + content_name.html_safe
+					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
 			end
@@ -70,6 +70,12 @@ module Alchemy
 				)
 			end
 
+			# Returns a textarea ready to use with tinymce
+			def tinymce_tag(name, content = '', options = {})
+				append_class_name(options, 'tinymce')
+				text_area_tag(name, content, options)
+			end
+
 		end
 	end
 end

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

@@ -4,6 +4,7 @@ module Alchemy
 
 			include Alchemy::ElementsHelper
 			include Alchemy::Admin::BaseHelper
+			include Alchemy::Admin::ContentsHelper
 			include Alchemy::Admin::EssencesHelper
 
 			# Returns an Array for essence_text_editor select options_for_select.
@@ -108,11 +109,6 @@ module Alchemy
 				end
 			end
 
-			def tinymce_tag(name, content = '', options = {})
-				append_class_name(options, 'tinymce')
-				text_area_tag(name, content, options)
-			end
-
 		end
 	end
 end

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

@@ -34,11 +34,11 @@ module Alchemy
 				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)
+						return_string << render_essence_editor(content, 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)
+					return_string = render_essence_editor(content, editor_options)
 				end
 				return_string
 			end
@@ -51,7 +51,11 @@ module Alchemy
 					return ""
 				end
 				content = element.contents.find_by_position(position)
-				render_essence(content, :editor, :for_editor => options)
+				if content.nil?
+					render_missing_content(element, position, options)
+				else
+					render_essence_editor(content, options)
+				end
 			end
 
 			# Renders the Content editor partial found in views/contents/ for the content with name inside the passed Element.
@@ -66,13 +70,53 @@ module Alchemy
 					return warning('Element is nil', t("no_element_given"))
 				end
 				content = element.content_by_name(name)
-				if content.blank?
-					render :partial => 'alchemy/admin/contents/missing', :locals => {:element => element, :name => name}
+				if content.nil?
+					render_missing_content(element, name, options)
+				else
+					render_essence_editor(content, options)
+				end
+			end
+
+			# Renders the EssenceText editor partial with a form select for storing page urlnames
+			# Options:
+			#   * element - element the Content find via content_name to store the pages urlname in.
+			#   * content_name - the name of the content from element to store the pages urlname in.
+			#   * options (Hash)
+			#   ** :only (Hash)  - pass page_layout names to :page_layout => [""] so only pages with this page_layout will be displayed inside the select.
+			#   ** :except (Hash)  - pass page_layout names to :page_layout => [""] so all pages except these with this page_layout will be displayed inside the select.
+			#   ** :page_attribute (Symbol) - The Page attribute which will be stored.
+			def page_selector(element, content_name, options = {}, select_options = {})
+				default_options = {
+					:except => {
+						:page_layout => [""]
+					},
+					:only => {
+						:page_layout => [""]
+					},
+					:page_attribute => :id,
+					:prompt => t('Choose page')
+				}
+				options = default_options.merge(options)
+				pages = Page.where({
+					:language_id => session[:language_id],
+					:page_layout => options[:only][:page_layout],
+					:public => true
+				})
+				content = element.content_by_name(content_name)
+				options.update(
+					:select_values => pages_for_select(pages, content ? content.essence.body : nil, options[:prompt], options[:page_attribute])
+				)
+				if content.nil?
+					render_missing_content(element, content_name, options)
 				else
-					render_essence(content, :editor, :for_editor => options)
+					render_essence_editor(content, options)
 				end
 			end
 
+			def render_missing_content(element, name, options)
+				render :partial => 'alchemy/admin/contents/missing', :locals => {:element => element, :name => name, :options => options}
+			end
+
 		end
 	end
 end

data/app/helpers/alchemy/elements_helper.rb

@@ -3,18 +3,24 @@ module Alchemy
 
 		include Alchemy::EssencesHelper
 
-		# Renders all elements from @page.
-		# ---
-		# == Options are:
-		# :only => []                 A list of element names to be rendered only. Very useful 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 Alchemy::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 (begins 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
-		# :random => boolean          Random output of elements
+		# Renders all elements from current page.
 		# 
+		# === Options are:
+		# 
+		#   :only => []                          # A list of element names to be rendered only. Very useful 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 Alchemy::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 (begins with first element found)
+		#   :fallback => {                       # You can use the fallback option as an override. So you can take elements from a glo´bal laout page and only if the user adds an element on current page the local one gets rendered.
+		#     :for => 'ELEMENT_NAME',            # The name of the element the fallback is for
+		#     :with => 'ELEMENT_NAME',           # (OPTIONAL) the name of element to fallback with
+		#     :from => 'PAGE_LAYOUT'             # The page_layout name from the global page the fallback elements lie on. I.E 'left_column'
+		#   }                                    # 
+		#   :sort_by => Content#name             # A Content name to sort the elements by
+		#   :reverse => boolean                  # Reverse the rendering order
+		#   :random => boolean                   # Randomize the output of elements
+		# 
+		# === Note:
 		# This helper also stores all pages where elements gets rendered on, so we can sweep them later if caching expires!
 		# 
 		def render_elements(options = {})

data/app/helpers/alchemy/pages_helper.rb

@@ -69,8 +69,21 @@ module Alchemy
 			)
 		end
 
-		# helper for language switching
-		# returns a string with links or nil
+		# == Helper for rendering language switches
+		# 
+		# Renders links to all public language root pages
+		# 
+		# === Options:
+		# 
+		#   :linkname => :name,
+		#   :spacer => "",
+		#   :link_to_public_child => configuration(:redirect_to_public_child),
+		#   :link_to_page_with_layout => nil,
+		#   :show_title => true,
+		#   :reverse => false,
+		#   :as_select_box => false,
+		#   :show_flags => false
+		# 
 		def language_switcher(options={})
 			default_options = {
 				:linkname => :name,
@@ -79,7 +92,8 @@ module Alchemy
 				:link_to_page_with_layout => nil,
 				:show_title => true,
 				:reverse => false,
-				:as_select_box => false
+				:as_select_box => false,
+				:show_flags => false
 			}
 			options = default_options.merge(options)
 			if multi_language?
@@ -99,7 +113,7 @@ module Alchemy
 							language_links << [linkname, show_page_url(:urlname => page.urlname, :lang => page.language.code)]
 						else
 							language_links << link_to(
-								"#{content_tag(:span, '', :class => "flag")}#{ content_tag(:span, linkname)}".html_safe,
+								"#{content_tag(:span, '', :class => "flag") if options[:show_flags]}#{ content_tag(:span, linkname)}".html_safe,
 								alchemy.show_page_path(:urlname => page.urlname, :lang => page.language.code),
 								:class => "#{(active ? 'active ' : nil)}#{page.language.code} #{(i == 0) ? 'first' : (i==pages.length-1) ? 'last' : nil}",
 								:title => options[:show_title] ? Alchemy::I18n.t("alchemy.language_links.#{page.language.code}.title", :default => page.language.name) : nil
@@ -152,18 +166,18 @@ module Alchemy
 			page_title.ingredient('name')
 		end
 
-		# == This helper renders the navigation.
+		# 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.
 		# I.E. dropdown-navigations, simple mainnavigations or even complex nested ones.
 		# 
 		# === En detail:
 		# 
-		# <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>
-		# </ul>
+		#   <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>
+		#   </ul>
 		#
 		# As you can see: Everything you need.
 		#
@@ -172,18 +186,18 @@ module Alchemy
 		#
 		# === 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.
-		#   :all_sub_menues => false
-		#   :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.
-		#   :restricted_only => nil                               Render only restricted pages.
-		#   :show_title => true                                   Show a title on navigation links. Title attribute from page.
-		#   :reverse => false                                     Reverse the navigation
-		#   :reverse_children => false                            Reverse the nested children
+		#   :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.
+		#   :all_sub_menues => false                              # Renders the whole page tree.
+		#   :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.
+		#   :restricted_only => nil                               # Render only restricted pages.
+		#   :show_title => true                                   # Show a title on navigation links. Title attribute from page.
+		#   :reverse => false                                     # Reverse the navigation
+		#   :reverse_children => false                            # Reverse the nested children
 		# 
 		def render_navigation(options = {})
 			default_options = {
@@ -224,20 +238,28 @@ module Alchemy
 			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.
+		# Renders navigation the children and all siblings of the given page (standard is the current page).
+		# 
+		# Use this helper if you want to render the subnavigation independent from the mainnavigation. I.E. to place it in a different area on your website.
+		# 
+		# This helper passes all its options to the the render_navigation helper.
+		# 
+		# === Options:
+		# 
+		#   :from_page => @page                              # The page to render the navigation from
+		#   :submenu => true                                 # Shows the nested children
+		#   :level => 2                                      # 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,
+				:submenu => true,
 				: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))
+				while options[:from_page].level > options[:level] do
+					options[:from_page] = options[:from_page].parent
 				end
 				render_navigation(options)
 			else
@@ -245,23 +267,23 @@ module Alchemy
 			end
 		end
 
-		# returns true if page is in the active branch
+		# Returns true if page is in the active branch
 		def page_active?(page)
 			@breadcrumb ||= breadcrumb(@page)
 			@breadcrumb.include?(page)
 		end
 
-		# Returns a HTML string for a linked breadcrumb from root to current page.
+		# Returns page links in a breadcrumb beginning from root to current page.
 		# 
-		# == Options:
+		# === 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 published 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.
+		#   :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 published 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 = {
@@ -310,34 +332,31 @@ module Alchemy
 			bc.join(options[:seperator]).html_safe
 		end
 
-		# Returns @page.title
+		# Returns current page title
 		#
-		# The options are:
+		# === Options:
 		# 
-		#   :prefix => ""
-		#   :seperator => "|"
+		#   :prefix => ""                 # Prefix
+		#   :seperator => ""              # Seperating prefix and title
 		#
-		# == Webdevelopers:
+		# === Webdevelopers
 		# 
-		# Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
+		# Please use the render_meta_data() helper instead. There all important meta information gets rendered in one helper.
 		# So you dont have to worry about anything.
 		# 
 		def render_page_title(options={})
+			return "" if @page.title.blank?
 			default_options = {
 				:prefix => "",
-				:seperator => "|"
+				:seperator => ""
 			}
 			default_options.update(options)
-			unless @page.title.blank?
-				h("#{default_options[:prefix]} #{default_options[:seperator]} #{@page.title}")
-			else
-				h("")
-			end
+			[default_options[:prefix], @page.title].join(default_options[:seperator])
 		end
 
 		# Returns a complete html <title> tag for the <head> part of the html document.
 		#
-		# == Webdevelopers:
+		# === 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.
@@ -354,7 +373,7 @@ module Alchemy
 
 		# Renders a html <meta> tag for :name => "" and :content => ""
 		#
-		# == Webdevelopers:
+		# === 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.
@@ -370,7 +389,7 @@ module Alchemy
 			%(<meta name="#{options[:name]}" content="#{options[:content]}" lang="#{lang}">).html_safe
 		end
 
-		# = This helper takes care of all important meta tags for your @page.
+		# 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.
 		# 
@@ -489,7 +508,7 @@ module Alchemy
 				if options[:html5]
 					search_field_tag(:query, params[:query])
 				else
-					text_field_tag(:query, params[:query]) + submit_tag(:search)
+					text_field_tag(:query, params[:query]) + submit_tag(t("search"))
 				end
 			end
 		end
@@ -560,7 +579,7 @@ module Alchemy
 						}
 					</script>
 				STR
-				content_for(:layout) { menu_bar_string.html_safe }
+				menu_bar_string.html_safe
 			else
 				nil
 			end