alchemy_cms 2.0 → 2.0.1

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
+  #- 1.9.3
 branches:
   only:
     - master

data/app/controllers/admin/clipboard_controller.rb

@@ -16,7 +16,7 @@ class Admin::ClipboardController < AlchemyController
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
     unless @clipboard.include?(params[:remarkable_id])
-      @clipboard.push(params[:remarkable_id])
+      @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
     end
     respond_to do |format|
       format.js
@@ -28,7 +28,7 @@ class Admin::ClipboardController < AlchemyController
   def remove
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
-    @clipboard.delete(params[:remarkable_id])
+    @clipboard.delete_if { |i| i[:id] == params[:remarkable_id] }
     respond_to do |format|
       format.js
     end

data/app/controllers/admin/elements_controller.rb

@@ -10,7 +10,7 @@ class Admin::ElementsController < AlchemyController
     @page = Page.find(params[:page_id], :include => {:elements => :contents})
     @cells = @page.cells
     if @cells.blank?
-      @elements = @page.elements
+      @elements = @page.elements.not_trashed
     else
       @elements = @page.elements_grouped_by_cells
     end
@@ -37,28 +37,20 @@ class Admin::ElementsController < AlchemyController
   end
   
   # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
-  # If a Ferret::FileNotFoundError raises we catch it and rebuilding the index.
   def create
-    @page = Page.find(params[:element][:page_id])
-    if params[:paste_from_clipboard].blank?
-      @element = Element.new_from_scratch(params[:element])
-      cell_definition = Cell.definition_for(params[:element][:name].split('#').last)
-    else
-      source_element = Element.find(params[:paste_from_clipboard].to_i)
-      cell_definition = Cell.definition_for(params[:paste_from_clipboard].split('#').last)
-      if source_element.page_id == blank? # aka. move
-        @element = source_element
-      else
-        @element = Element.copy(source_element, {:page_id => @page.id})
-      end
-    end
-    # if page has cells, put element in cell
-    if @page.has_cells?
-      if cell_definition
-        @cell = @page.cells.find_or_create_by_name(cell_definition['name'])
-      end
-      @element.cell = @cell
-    end
+		@page = Page.find(params[:element][:page_id])
+		@paste_from_clipboard = !params[:paste_from_clipboard].blank?
+		if @paste_from_clipboard
+			source_element = Element.find(element_from_clipboard[:id])
+			@element = Element.copy(source_element, {:page_id => @page.id})
+			if element_from_clipboard[:action] == 'cut'
+				source_element.destroy
+				@clipboard.delete_if { |i| i[:id].to_i == source_element.id }
+			end
+		else
+			@element = Element.new_from_scratch(params[:element])
+		end
+    put_element_in_cell if @page.can_have_cells?
     @element.page = @page
     if @element.save
       render :action => :create
@@ -113,11 +105,12 @@ class Admin::ElementsController < AlchemyController
   end
   
   def order
-    page = Page.find(params[:page_id])
     params[:element_ids].each do |element_id|
       element = Element.find(element_id)
       if element.trashed?
-        element.page = page
+				element.page_id = params[:page_id]
+				element.cell_id = params[:cell_id] if params[:cell_id]
+				element.position = 1
       end
       element.move_to_bottom
     end
@@ -129,9 +122,28 @@ class Admin::ElementsController < AlchemyController
     @element = Element.find(params[:id])
     @page = @element.page
     @element.folded = !@element.folded
-    @element.save(false)
+		@element.save
   rescue Exception => e
     exception_handler(e)
   end
 
+private
+
+	def put_element_in_cell
+		element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : params[:element][:name]
+		cell_definition = Cell.definition_for(element_with_cell_name.split('#').last) if !element_with_cell_name.blank?
+		if cell_definition
+			@cell = @page.cells.find_or_create_by_name(cell_definition['name'])
+			@element.cell = @cell
+			return true
+		else
+			return false
+		end
+	end
+
+	def element_from_clipboard
+		@clipboard = get_clipboard(:elements)
+		@clipboard.detect { |i| i[:id].to_i == params[:paste_from_clipboard].to_i }
+	end
+
 end

data/app/controllers/admin/trash_controller.rb

@@ -10,6 +10,8 @@ class Admin::TrashController < AlchemyController
     @elements = Element.trashed
     @page = Page.find_by_id(params[:page_id])
     @allowed_elements = Element.all_for_page(@page)
+		@draggable_trash_items = {}
+		@elements.each { |e| @draggable_trash_items["element_#{e.id}"] = e.belonging_cellnames(@page) }
     render :layout => false
   rescue Exception => e
     exception_handler(e)

data/app/helpers/admin/elements_helper.rb

@@ -56,21 +56,6 @@ module Admin::ElementsHelper
     )
   end
 
-	def clipboard_select_tag(items, html_options = {})
-    options = [[_('Please choose'), ""]]
-    items.each do |item|
-      options << [item.class.to_s == 'Element' ? item.display_name_with_preview_text : item.name, item.id]
-    end
-    select_tag(
-      'paste_from_clipboard',
-      @page.has_cells? ? grouped_elements_for_select(items, :id) : options_for_select(options),
-      {
-        :class => html_options[:class] || 'very_long',
-        :style => html_options[:style]
-      }
-    )
-  end
-  
   # Returns all elements that could be placed on that page because of the pages layout.
   # The elements are returned as an array to be used in alchemy_selectbox form builder.
   def elements_for_select(elements)
@@ -92,23 +77,31 @@ module Admin::ElementsHelper
       celled_elements += cell_elements
       optgroup_label = Cell.translated_label_for(cell['name'])
       options[optgroup_label] = cell_elements.map do |e|
-				[
-					I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
-					(e.class.name == 'Element' ? e.send(object_method).to_s : e[object_method]) + "##{cell['name']}"
-				]
+				element_array_for_options(e, object_method, cell)
 			end
     end
     other_elements = elements - celled_elements
     unless other_elements.blank?
       optgroup_label = _('other Elements')
       options[optgroup_label] = other_elements.map do |e|
-				[
-					I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
-					e.class.name == 'Element' ? e.send(object_method) : e[object_method]
-				]
+				element_array_for_options(e, object_method)
 			end
     end
     return grouped_options_for_select(options)
   end
 
+	def element_array_for_options(e, object_method, cell = nil)
+		if e.class.name == 'Element'
+			[
+				e.display_name_with_preview_text,
+				e.send(object_method).to_s + (cell ? "##{cell['name']}" : "")
+			]
+		else
+			[
+				I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
+				e[object_method] + (cell ? "##{cell['name']}" : "")
+			]
+		end
+	end
+
 end

data/app/helpers/alchemy_helper.rb

@@ -339,4 +339,19 @@ module AlchemyHelper
     end
   end
 
+	def clipboard_select_tag(items, html_options = {})
+    options = [[_('Please choose'), ""]]
+    items.each do |item|
+      options << [item.class.to_s == 'Element' ? item.display_name_with_preview_text : item.name, item.id]
+    end
+    select_tag(
+      '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',
+        :style => html_options[:style]
+      }
+    )
+  end
+
 end

data/app/models/cell.rb

@@ -37,19 +37,15 @@ class Cell < ActiveRecord::Base
     Element.all_definitions_for(element_names.uniq)
   end
   
-  def self.definition_for_element(element_name)
-    definitions_for_element(element_name).first
-  end
-  
   def self.definitions_for_element(element_name)
     return [] if definitions.blank?
     definitions.select { |d| d['elements'].include?(element_name) }
   end
   
-  def self.name_for_element(element_name)
-    definition = definition_for_element(element_name)
-    return nil if definition.blank?
-    definition['name']
+  def self.names_for_element(element_name)
+    definitions = definitions_for_element(element_name)
+    return nil if definitions.blank?
+    definitions.collect { |d| d['name'] }
   end
   
   def name_for_label

data/app/models/element.rb

@@ -17,6 +17,7 @@ class Element < ActiveRecord::Base
   
   # TODO: add a trashed column to elements table
   scope :trashed, where(:page_id => nil).order('updated_at DESC')
+  scope :not_trashed, where('`elements`.`page_id` IS NOT NULL')
   scope :published, where(:public => true)
   scope :named, lambda { |names| where(arel_table[:name].in(names)) }
   scope :excluded, lambda { |names| where(arel_table[:name].not_in(names)) }
@@ -52,11 +53,15 @@ class Element < ActiveRecord::Base
 
   # nullifies the page_id aka. trashs it.
   def trash
-    self.update_attributes({
-      :page_id => nil,
-      :folded => true,
-      :public => false
-    })
+		self.attributes = {
+			:page_id => nil,
+			:cell_id => nil,
+			:folded => true,
+			:public => false
+		}
+		# If we validate the element, it will not get trashed if another element with same postion is already trashed.
+		# And we cannot remove the position, because it will not be reordered in the list if its position is nil.
+		self.remove_from_list
   end
   
   def trashed?
@@ -286,7 +291,7 @@ class Element < ActiveRecord::Base
 
   def self.all_from_clipboard(clipboard)
     return [] if clipboard.nil?
-    self.find_all_by_id(clipboard)
+    self.find_all_by_id(clipboard.collect { |i| i[:id] })
   end
 
   def self.all_from_clipboard_for_page(clipboard, page)
@@ -399,12 +404,12 @@ class Element < ActiveRecord::Base
   alias_method :richtext_contents, :rtf_contents
   
   # The name of the cell the element could be placed in.
-  def belonging_cellname
-    cellname = Cell.name_for_element(name)
-    if cellname.blank?
-      return 'for_other_elements' 
+  def belonging_cellnames(page)
+    cellnames = Cell.names_for_element(name)
+    if cellnames.blank? || !page.has_cells?
+      return ['for_other_elements']
     else
-      return cellname
+      return cellnames
     end
   end
   

data/app/models/page.rb

@@ -111,8 +111,8 @@ class Page < ActiveRecord::Base
 
   def elements_grouped_by_cells
     group = ActiveSupport::OrderedHash.new
-    cells.each { |cell| group[cell] = cell.elements }
-    group[Cell.new({:name => 'for_other_elements'})] = elements.find_all_by_cell_id(nil)
+    cells.each { |cell| group[cell] = cell.elements.not_trashed }
+    group[Cell.new({:name => 'for_other_elements'})] = elements.not_trashed.where(:cell_id => nil)
     return group
   end
   
@@ -302,17 +302,18 @@ class Page < ActiveRecord::Base
     end
   end
 
-  # Returns the self#page_layout description from config/alchemy/page_layouts.yml file.
-  def layout_description
-    page_layout = Alchemy::PageLayout.get(self.page_layout)
-    if page_layout.nil?
-      logger.warn("\n+++++++++++  Warning! Alchemy::PageLayout description not found for layout: #{self.page_layout}\n")
-      return nil
-    else
-      return page_layout
-    end
-  end
-  alias_method :definition, :layout_description
+	# Returns the self#page_layout description from config/alchemy/page_layouts.yml file.
+	def layout_description
+		description = Alchemy::PageLayout.get(self.page_layout)
+		if self.root?
+			return {}
+		elsif description.nil?
+			raise "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
+		else
+			description
+		end
+	end
+	alias_method :definition, :layout_description
   
   # Returns translated name of the pages page_layout value.
   # Page layout names are defined inside the config/alchemy/page_layouts.yml file.
@@ -338,16 +339,12 @@ class Page < ActiveRecord::Base
   end
 
   def contains_feed?
-    desc = self.layout_description
-    return false if desc.blank?
-    desc["feed"]
+    definition["feed"]
   end
 
   # Returns true or false if the pages layout_description for config/alchemy/page_layouts.yml contains redirects_to_external: true
   def redirects_to_external?
-    desc = self.layout_description
-    return false if desc.blank?
-    desc["redirects_to_external"]
+    definition["redirects_to_external"]
   end
 
   # Returns an array of all pages currently locked by user
@@ -432,7 +429,7 @@ class Page < ActiveRecord::Base
 
   def self.all_from_clipboard(clipboard)
     return [] if clipboard.blank?
-    self.find_all_by_id(clipboard)
+    self.find_all_by_id(clipboard.collect { |i| i[:id] })
   end
 
   def self.all_from_clipboard_for_select(clipboard, language_id, layoutpage = false)
@@ -459,11 +456,13 @@ class Page < ActiveRecord::Base
   end
   
   # Returns true or false if the page has a page_layout that has cells.
-  def has_cells?
-    pagelayout = Alchemy::PageLayout.get(self.page_layout)
-    return false if pagelayout.blank?
-    !pagelayout['cells'].blank?
+  def can_have_cells?
+    !definition['cells'].blank?
   end
+
+	def has_cells?
+		cells.any?
+	end
   
   def self.link_target_options
     options = [
@@ -522,7 +521,6 @@ private
   # Looks in the layout_descripion, if there are elements to autogenerate.
   # If so, it generates them.
   def autogenerate_elements
-    return true if self.layout_description.blank?
     elements = self.layout_description["autogenerate"]
     unless (elements.blank?)
       elements.each do |element|
@@ -538,7 +536,7 @@ private
   end
   
   def create_cells
-    return true if !has_cells?
+    return false if !can_have_cells?
     definition['cells'].each do |cellname|
       cells.create({:name => cellname})
     end

data/app/views/admin/elements/_element.html.erb

@@ -1,4 +1,4 @@
-<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>">
+<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
   <%= render :partial => "admin/elements/element_head", :locals => {:element => element} %>
   <%- if !element.folded? -%>
     <%= form_for(

data/app/views/admin/elements/_new_element_form.html.erb

@@ -12,7 +12,7 @@
     <span style="margin-right: 16px"><%= _("element_of_type") %>:</span>
     <%= form.select(
       'name',
-      @page.has_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
+      @page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
       {:prompt => _('select_element')},
       {:class => 'very_long'}
     ) -%>

data/app/views/admin/elements/create.js.erb

@@ -1,6 +1,6 @@
 (function($) {
   
-  <%- if @page.has_cells? -%>
+  <%- if @page.can_have_cells? -%>
   Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
   <%- end -%>
   $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
@@ -12,9 +12,13 @@
   <%- end -%>
   Alchemy.PreviewWindow.refresh();
   Alchemy.ElementEditorSelector.init();
-  $('#element_<%= @element.id -%>').trigger('Alchemy.SelectElementEditor');
+  $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
   Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
   Alchemy.SelectBox('#element_<%= @element.id -%> select');
   Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
-  
+
+  <%- if @clipboard.blank? -%>
+	$('#clipboard_button .icon.clipboard').removeClass('full');
+	<%- end -%>
+
 })(jQuery);

data/app/views/admin/elements/destroy.js.erb

@@ -1,5 +1,5 @@
 (function($) {
-	$('#element_<%= @element.id -%>').remove();
+	$('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
 	Alchemy.growl('<%= _("element_deleted_successful") -%>');
 	$('#element_area').sortable('refresh');
 	Alchemy.PreviewWindow.refresh();

data/app/views/admin/elements/fold.js.erb

@@ -6,10 +6,12 @@
   
   <%- else -%>
   
-  $('#element_<%= @element.id -%>').replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
-  $('#element_area').sortable('refresh');
+  $('.element_editor[data-element-id="<%= @element.id -%>"]').replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
+  $('#element_area .sortable_cell').sortable('refresh');
   Alchemy.ElementEditorSelector.bindEvent('#element_<%= @element.id -%>');
-  
+
+  $('.element_editor[data-element-id="<%= @element.id -%>"]');
+
   <%- if @element.folded -%>
     
     <%- @element.rtf_contents.each do |content| -%>
@@ -22,7 +24,7 @@
     
   <%- else -%>
     
-    $('#element_<%= @element.id -%>').trigger('Alchemy.SelectElementEditor');
+    $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
     Alchemy.SelectBox('#element_<%= @element.id -%> select');
     
     <%- @element.rtf_contents.each do |content| -%>

data/app/views/admin/elements/index.html.erb

@@ -11,13 +11,13 @@
       <%- end -%>
     </ul>
     <%- @elements.each do |cell, elements| -%>
-    <div id="cell_<%= cell.name %>" class="sortable_cell">
+    <div id="cell_<%= cell.name %>" class="sortable_cell <%= cell.name %>_cell" data-cell-id="<%= cell.id %>">
     	<%= render :partial => 'element', :collection => elements, :locals => {:draggable => true} %>
     </div>
     <%- end -%>
   </div>
   <%- else -%>
-  <div class="sortable_cell" id="cell_for_other_elements">
+  <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements">
     <%= render :partial => @elements, :locals => {:draggable => true} %>
   </div>
   <%- end -%>

data/app/views/admin/elements/trash.js.erb

@@ -1,6 +1,6 @@
 (function($) {
   
-  $("#element_<%= @element.id -%>").remove();
+  $('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
   Alchemy.growl('<%= _("Element trashed") -%>');
   $('#element_area').sortable('refresh');
   Alchemy.refreshTrashWindow(<%= @page_id -%>);

data/app/views/admin/elements/update.js.erb

@@ -1,7 +1,7 @@
 (function($) {
   $('div#element_<%= @element.id -%> div.element_handle span.icon').removeClass('element_<%= @element.public? ? "draft" : "public" -%>').addClass('element_<%= @element.public? ? "public" : "draft" -%>');
-  $('#element_<%= @element.id -%> .element_heading .preview_text_element_name').text('<%= @element.display_name -%>');
-  $('#element_<%= @element.id -%> .element_heading .preview_text_quote').text('<%= escape_javascript(@element.preview_text) -%>');
+  $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_element_name').text('<%= @element.display_name -%>');
+  $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_quote').text('<%= escape_javascript(@element.preview_text) -%>');
   $('div.content_editor').removeClass('validation_failed');
   $("#element_<%= @element.id -%>_errors").hide();
   Alchemy.setElementSaved('#element_<%= @element.id -%>');

data/app/views/admin/trash/index.html.erb

@@ -19,7 +19,5 @@
 	<%- end -%>
 </div>
 <script type="text/javascript" charset="utf-8">
-	<%- cells_items = {} %>
-	<%- @elements.each { |e| cells_items["element_#{e.id}"] = e.belonging_cellname };  -%>
-	Alchemy.DraggableTrashItems(<%= cells_items.to_json.html_safe %>);
+	Alchemy.DraggableTrashItems(<%= @draggable_trash_items.to_json.html_safe %>);
 </script>

data/assets/javascripts/alchemy.js

@@ -549,8 +549,10 @@ if (typeof(Alchemy) === 'undefined') {
 				tolerance: 'pointer',
 				update: function(event, ui) {
 					var ids = $.map($(event.target).children(), function(child) {
-						return child.id.replace(/element_/, '');
+						return $(child).attr('data-element-id');
 					});
+					var params_string = '';
+					var cell_id = $(event.target).attr('data-cell-id');
 					// Is the trash window open?
 					if ($('#alchemyTrashWindow').length > 0) {
 						// updating the trash icon
@@ -560,10 +562,14 @@ if (typeof(Alchemy) === 'undefined') {
 						}
 					}
 					$(event.target).css("cursor", "progress");
+					params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param({element_ids: ids});
+					if (cell_id) {
+						params_string += "&cell_id=" + cell_id;
+					}
 					$.ajax({
 						url: '/admin/elements/order',
 						type: 'POST',
-						data: "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param({element_ids: ids}),
+						data: params_string,
 						complete: function () {
 							$(event.target).css("cursor", "auto");
 							Alchemy.refreshTrashWindow(page_id);
@@ -788,10 +794,15 @@ if (typeof(Alchemy) === 'undefined') {
 		
 		DraggableTrashItems: function (items_n_cells) {
 			$("#trash_items div.draggable").each(function () {
+				var cell_classes = '';
+				var cell_names = items_n_cells[this.id];
+				$.each(cell_names, function (i) {
+					cell_classes += '.' + this + '_cell' + ', ';
+				});
 				$(this).draggable({
 					helper: 'clone',
 					iframeFix: 'iframe#alchemyPreviewWindow',
-					connectToSortable: '#cell_' + items_n_cells[this.id],
+					connectToSortable: cell_classes,
 					start: function(event, ui) { 
 						$(this).hide().addClass('dragged');
 						ui.helper.css({width: '300px'});

data/lib/alchemy/page_layout.rb

@@ -30,9 +30,6 @@ module Alchemy
     # Returns the page_layout description found by name in page_layouts.yml
     def self.get(name = "")
       self.get_layouts.detect{ |a| a["name"].downcase == name.downcase }
-    rescue Exception => e
-      Rails.logger.error("++++++ ERROR\n#{e}")
-      return nil
     end
     
     # Returns page layouts ready for Rails' select form helper.

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0"
+  VERSION = "2.0.1"
   
 end

data/lib/rails/templates/alchemy.rb

@@ -2,7 +2,7 @@
 
 # Installing Alchemy Gem
 
-gem 'alchemy_cms', '>= 2.0.rc5'
+gem 'alchemy_cms'
 gem 'ruby-debug', :group => :development, :platform => :ruby_18
 gem 'ruby-debug19', :group => :development, :platform => :ruby_19
 

data/locale/de/alchemy.po

@@ -71,7 +71,7 @@ msgstr "Seite wählen"
 
 #: app/controllers/admin/trash_controller.rb:15
 msgid "Cleared trash"
-msgstr "Der Papierkorb wurde entleert"
+msgstr "Der Papierkorb wurde geleert"
 
 #: app/views/admin/pictures/_picture.html.erb:35
 msgid "Click to rename"
@@ -106,11 +106,11 @@ msgstr "Bild löschen"
 
 #: app/views/admin/clipboard/index.html.erb:15
 msgid "Do you really want to clear the clipboard?"
-msgstr "Wollen Sie die Zwischenablage wirklich entleeren?"
+msgstr "Wollen Sie die Zwischenablage wirklich leeren?"
 
 #: app/views/admin/trash/index.html.erb:16
 msgid "Do you really want to clear the trash?"
-msgstr "Wollen Sie den Papierkorb wirklich entleeren?"
+msgstr "Wollen Sie den Papierkorb wirklich leeren?"
 
 #: app/views/essences/_essence_text_editor.html.erb:50
 msgid "Do you really want to delete this content?"
@@ -932,11 +932,11 @@ msgstr "Bitte wählen Sie eine Datei zum Verlinken aus."
 
 #: app/views/admin/clipboard/index.html.erb:15
 msgid "clear clipboard"
-msgstr "Zwischenablage entleeren"
+msgstr "Zwischenablage leeren"
 
 #: app/views/admin/trash/index.html.erb:16
 msgid "clear trash"
-msgstr "Papierkorb entleeren"
+msgstr "Papierkorb leeren"
 
 #: app/helpers/alchemy_helper.rb:790
 #: app/views/admin/partials/_remote_search_form.html.erb:30

data/spec/helpers/elements_helper_spec.rb

@@ -23,7 +23,7 @@ describe ElementsHelper do
 	  helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
 	end
 
-	it "should render elements for a cell", :focus => true do
+	it "should render elements for a cell" do
 		cell = Factory(:cell)
 		Factory(:element, :cell_id => cell.id)
 		helper.stub(:configuration).and_return(true)

data/spec/models/page_spec.rb

@@ -7,7 +7,28 @@ describe Page do
 	before(:each) do
 		@rootpage = Page.rootpage
 		@language = Language.get_default
-		@language_root = Factory(:page, :parent_id => @rootpage.id, :language => @language, :language_root => true)
+		@language_root = Factory(:page, :parent_id => @rootpage.id, :language => @language, :language_root => true, :page_layout => 'intro')
+	end
+	
+	describe ".layout_description" do
+		
+		context "for a language root page" do
+			
+			it "should return the page layout description as hash" do
+				@language_root.layout_description['name'].should == 'intro'
+			end
+			
+			it "should return an empty hash for root page" do
+				@rootpage.layout_description.should == {}
+			end
+			
+		end
+		
+		it "should raise Exception if the page_layout could not be found in the definition file" do
+			@page = mock(:page, :page_layout => 'foo')
+			expect { @page.layout_description }.to raise_error
+		end
+		
 	end
 	
 	it "should contain one rootpage" do

metadata

@@ -2,7 +2,7 @@
 name: alchemy_cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "2.0"
+  version: 2.0.1
 platform: ruby
 authors: 
 - Thomas von Deyen
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails