alchemy_cms 2.1.beta5 → 2.1.beta6

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

@@ -18,7 +18,7 @@ module Alchemy
 				else
 					items = resource_model
 				end
-				instance_variable_set("@#{resources_name}", items.paginate(:page => params[:page] || 1, :per_page => 20))
+				instance_variable_set("@#{resources_name}", items.paginate(:page => params[:page] || 1, :per_page => per_page_value_for_screen_size))
 			end
 
 			def new

data/app/controllers/alchemy/pages_controller.rb

@@ -8,7 +8,7 @@ module Alchemy
 
 		caches_action(
 			:show,
-			:cache_path => proc { url_for(:action => :show, :urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
+			:cache_path => proc { show_page_url(:urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
 			:if => proc do
 				if Alchemy::Config.get(:cache_pages)
 					page = Page.find_by_urlname_and_language_id_and_public(
@@ -36,7 +36,7 @@ module Alchemy
 		def show
 			respond_to do |format|
 				format.html {
-					render :layout => params[:layout].blank? ? 'alchemy/pages' : params[:layout] == 'none' ? false : params[:layout]
+					render :layout => layout_for_page
 				}
 				format.rss {
 					if @page.contains_feed?
@@ -165,5 +165,17 @@ module Alchemy
 			end
 		end
 
+		def layout_for_page
+			if params[:layout] == 'none'
+				false
+			elsif not params[:layout].blank?
+				params[:layout]
+			elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
+				'application'
+			else
+				'alchemy/pages'
+			end
+		end
+
 	end
 end

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

@@ -96,8 +96,8 @@ module Alchemy
 
 			def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
 				title = t("please_confirm")
-				ok_lable = t("yes")
-				cancel_lable = t("no")
+				ok_lable = t("Yes")
+				cancel_lable = t("No")
 				link_to_function(
 					link_string,
 					"Alchemy.confirmToDeleteWindow('#{url}', '#{title}', '#{message}', '#{ok_lable}', '#{cancel_lable}');",

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

@@ -64,7 +64,7 @@ module Alchemy
 			# The elements are returned as an array to be used in alchemy_selectbox form builder.
 			def elements_for_select(elements)
 				return [] if elements.nil?
-				options = elements.collect{ |e| [t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize), e["name"]] }
+				options = elements.collect{ |e| [t("element_names.#{e['name']}", :default => e['name'].capitalize), e["name"]] }
 				return options_for_select(options)
 			end
 

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

@@ -29,7 +29,7 @@ module Alchemy
 					:all => false
 				}
 				options = defaults.merge(options)
-				essence_type = normalized_essence_type(essence_type)
+				essence_type = Alchemy::Content.normalize_essence_type(essence_type)
 				return_string = ""
 				if options[:all]
 					contents = element.contents.find_all_by_essence_type_and_name(essence_type, options[:all])

data/app/helpers/alchemy/base_helper.rb

@@ -53,13 +53,5 @@ module Alchemy
 			content_tag('span', '', :class => "icon #{icon_class}")
 		end
 
-		def normalized_essence_type(essence_type)
-			if not essence_type.match(/^Alchemy::/)
-				essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
-			else
-				essence_type
-			end
-		end
-
 	end
 end

data/app/helpers/alchemy/essences_helper.rb

@@ -77,11 +77,10 @@ module Alchemy
 				warning('Element is nil')
 				return ""
 			end
-			type = normalized_essence_type(type)
 			if position == 1
 				content = element.content_by_type(type)
 			else
-				content = element.contents.find_by_essence_type_and_position(type, position)
+				content = element.contents.find_by_essence_type_and_position(Alchemy::Content.normalize_essence_type(type), position)
 			end
 			render_essence(content, :view, :for_view => options)
 		end

data/app/helpers/alchemy/pages_helper.rb

@@ -510,7 +510,7 @@ module Alchemy
 				:show_heading => true
 			}
 			options = default_options.merge(options)
-			return content_tag :h2, t('alchemy.search.no_results') if @search_results.blank?
+			return content_tag :h2, t('search.no_results') if @search_results.blank?
 			results = ""
 			@search_results.each do |essence|
 				result = essence.highlight(
@@ -520,8 +520,8 @@ module Alchemy
 				results << render(:partial => options[:partial], :locals => {:result => result, :options => options, :page => essence.page}) if essence.page
 			end
 			output = ""
-			output << content_tag(:h1, t("alchemy.search.result_heading", :query => h(params[:query])), :class => 'search_results_heading') if options[:show_heading]
-			output << content_tag(:h2, t("alchemy.search.result_count", :result_count => @search_results.length), :class => 'search_result_count') if options[:show_result_count]
+			output << content_tag(:h1, t("search.result_heading", :query => h(params[:query])), :class => 'search_results_heading') if options[:show_heading]
+			output << content_tag(:h2, t("search.result_count", :result_count => @search_results.length), :class => 'search_result_count') if options[:show_result_count]
 			output << content_tag(:ul, results.html_safe, :class => 'search_result_list')
 			content_tag :div, :class => 'search_results' do
 				output.html_safe

data/app/models/alchemy/content.rb

@@ -14,20 +14,26 @@ module Alchemy
 
 		validates_uniqueness_of :position, :scope => [:element_id, :essence_type]
 
+		scope :essence_pictures, where(:essence_type => "Alchemy::EssencePicture")
+		scope :essence_texts, where(:essence_type => "Alchemy::EssenceText")
+		scope :essence_richtexts, where(:essence_type => "Alchemy::EssenceRichtext")
+
 		# Creates a new Content as descriped in the elements.yml file
 		def self.create_from_scratch(element, essences_hash)
 			if essences_hash[:name].blank? && !essences_hash[:essence_type].blank?
-				essences_of_same_type = element.contents.find_all_by_essence_type(essences_hash[:essence_type])
+				essences_of_same_type = element.contents.where(
+					:essence_type => Alchemy::Content.normalize_essence_type(essences_hash[:essence_type])
+				)
 				description = {
 					'type' => essences_hash[:essence_type],
-					'name' => "#{essences_hash[:essence_type].underscore}_#{essences_of_same_type.length + 1}"
+					'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
 				}
 			else
 				description = element.content_description_for(essences_hash[:name])
 				description = element.available_content_description_for(essences_hash[:name]) if description.blank?
 			end
 			raise "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}" if description.blank?
-			essence_class = "alchemy/#{description['type']}".classify.constantize
+			essence_class = Alchemy::Content.normalize_essence_type(description['type']).constantize
 			content = self.new(:name => description['name'], :element_id => element.id)
 			if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
 				essence = essence_class.create(:do_not_index => !description['do_not_index'].nil?)
@@ -51,6 +57,11 @@ module Alchemy
 			settings.symbolize_keys
 		end
 
+		def siblings
+			return [] if !element
+			self.element.contents
+		end
+
 		# makes a copy of source and copies the polymorphic associated essence
 		def self.copy(source, differences = {})
 			differences[:position] = nil
@@ -159,5 +170,18 @@ module Alchemy
 			essence.partial_name
 		end
 
+		def normalized_essence_type
+			self.class.normalize_essence_type(self.essence_type)
+		end
+
+		def self.normalize_essence_type(essence_type)
+			essence_type = essence_type.classify
+			if not essence_type.match(/^Alchemy::/)
+				essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
+			else
+				essence_type
+			end
+		end
+
 	end
 end

data/app/models/alchemy/element.rb

@@ -74,7 +74,7 @@ module Alchemy
 		end
 
 		def content_by_type(essence_type)
-			self.contents.find_by_essence_type(essence_type)
+			self.contents.find_by_essence_type(Content.normalize_essence_type(essence_type))
 		end
 
 		def all_contents_by_name(name)
@@ -82,7 +82,7 @@ module Alchemy
 		end
 
 		def all_contents_by_type(essence_type)
-			self.contents.find_all_by_essence_type(essence_type)
+			self.contents.find_all_by_essence_type(Content.normalize_essence_type(essence_type))
 		end
 
 		# Returns the content that is marked as rss title.

data/app/models/alchemy/page.rb

@@ -43,15 +43,15 @@ module Alchemy
 		scope :accessable, where(:restricted => false)
 		scope :restricted, where(:restricted => true)
 		scope :public_language_roots, lambda {
-			where(:language_root => true).where("language_code IN ('#{Language.all_codes_for_published.join('\',\'')}')").where(:public => true)
+			where(:language_root => true).where("`alchemy_pages`.`language_code` IN ('#{Language.all_codes_for_published.join('\',\'')}')").where(:public => true)
 		}
-		scope :all_last_edited_from, lambda { |user| where(:updater_id => user.id).order('updated_at DESC').limit(5) }
+		scope :all_last_edited_from, lambda { |user| where(:updater_id => user.id).order('`alchemy_pages`.`updated_at` DESC').limit(5) }
 		# Returns all pages that have the given language_id
 		scope :with_language, lambda { |language_id| where(:language_id => language_id) }
 		# Returns all pages that are not locked and public.
 		# Used for flushing all page caches at once.
-		scope :flushables, public.not_locked
-		scope :contentpages, where("pages.layoutpage = 0 AND pages.parent_id IS NOT NULL")
+		scope :contentpages, where("`alchemy_pages`.`layoutpage` = 0 AND `alchemy_pages`.`parent_id` IS NOT NULL")
+		scope :flushables, not_locked.published.contentpages
 
 		# Finds selected elements from page.
 		# 

data/app/models/alchemy/user.rb

@@ -48,7 +48,11 @@ module Alchemy
 			end
 		end
 		alias :name :fullname
-		
+
+		def human_role_name
+			self.class.human_rolename(self.role)
+		end
+
 		def self.human_rolename(role)
 			Alchemy::I18n.t("user_roles.#{role}")
 		end

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -1,14 +1,14 @@
 (function($) {
-  
+
 <%- if params[:remove] -%>
-  $("#<%= @item.class.to_s.downcase -%>_<%= @item.id -%>").remove();
-  <%- if @item.class.to_s == 'Element' -%>
-  $('#element_area').sortable('refresh');
-  <%- end -%>
-  Alchemy.growl('<%= t("item moved to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+	$(".element_editor[data-element-id='<%= @item.id -%>']").remove();
+<%- if @item.class.to_s == 'Element' -%>
+	$('#element_area').sortable('refresh');
+<%- end -%>
+	Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- else -%>
-  Alchemy.growl('<%= t("item copied to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>')
+	Alchemy.growl('<%= escape_javascript t("item copied to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>')
 <%- end -%>
-  $('#clipboard_button .icon.clipboard').addClass('full');
-  
+	$('#clipboard_button .icon.clipboard').addClass('full');
+
 })(jQuery);

data/app/views/alchemy/admin/dashboard/index.html.erb

@@ -46,7 +46,7 @@
 		<%- else -%>
 		<ul>
 			<%- @online_users.each do |user| -%>
-			<li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= Alchemy::I18n.t("alchemy.user_roles.#{user.role}") %>)</small></li>
+			<li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= user.human_role_name %>)</small></li>
 			<%- end -%>
 		</ul>
 		<%- end -%>

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

@@ -1,24 +1,31 @@
 (function($) {
-  
-  <%- if @page.can_have_cells? -%>
-  Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("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}) -%>');
-  $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
-  Alchemy.growl('<%= t("successfully_added_element") -%>');
-  Alchemy.closeCurrentWindow();
-  <%- @element.rtf_contents.each do |content| -%>
-  Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
-  <%- end -%>
-  Alchemy.PreviewWindow.refresh();
-  Alchemy.ElementEditorSelector.init();
-  $('.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');
+	<% if @cutted_element_id %>
+		$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+	<% end %>
+
+	<%- if @page.can_have_cells? -%>
+		Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("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}) -%>');
+	$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
+	Alchemy.growl('<%= t("successfully_added_element") -%>');
+	Alchemy.closeCurrentWindow();
+
+	<%- @element.rtf_contents.each do |content| -%>
+		Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
+	<%- end -%>
+
+	Alchemy.PreviewWindow.refresh();
+	Alchemy.ElementEditorSelector.init();
+	$('.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/alchemy/admin/essence_pictures/assign.js.erb

@@ -6,7 +6,7 @@
       :locals => {:content => @content, :options => params[:options]}
     )
   ) -%>');
-<%- if @content.element.contents.find_all_by_essence_type("Alchemy::EssencePicture").size > 1 -%>
+<%- if @content.siblings.essence_pictures.count > 1 -%>
   Alchemy.SortableContents('#<%= @content.element.id -%>_contents', '<%= form_authenticity_token -%>');
 <%- end -%>
   Alchemy.closeCurrentWindow();

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -16,17 +16,17 @@
     </tr>
     <tr>
       <td class="label"><%= f.label "title" %></td>
-      <td><%= f.text_field "title", :class => 'thin_border long' %></td>
+      <td class="input"><%= f.text_field "title", :class => 'thin_border long' %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label "alt_tag" %></td>
-      <td><%= f.text_field "alt_tag", :class => 'thin_border long' %></td>
+      <td class="input"><%= f.text_field "alt_tag", :class => 'thin_border long' %></td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
     <%- if @options[:sizes].is_a?(HashWithIndifferentAccess) -%>
     <tr>
       <td class="label"><%= f.label "render_size" %></td>
-      <td>
+      <td class="input">
       <%= f.select(
         "render_size",
         options_for_select(
@@ -66,7 +66,7 @@
     </tr>
     <%- end -%>
     <tr>
-      <td colspan="2" style="text-align:right">
+      <td colspan="2" class="submit">
         <%= hidden_field_tag 'content_id', @content.id %>
         <%= f.button t("save"), :class => 'button' %>
       </td>

data/app/views/alchemy/admin/essence_pictures/update.js.erb

@@ -2,7 +2,7 @@
   
   $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
     render(
-      :partial => "/essences/essence_picture_editor",
+      :partial => "alchemy/essences/essence_picture_editor",
       :locals => {:content => @content, :options => params[:options]}
     )
   ) -%>');

data/app/views/alchemy/admin/layoutpages/index.html.erb

@@ -20,20 +20,7 @@
 
 <%- content_for :toolbar do -%>
 <div id="toolbar_buttons">
-	<div class="button_with_label">
-		<%= select_tag(
-			'language', 
-			options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
-			:onchange => %(
-				Alchemy.pleaseWaitOverlay();
-				jQuery.get('/admin/pages/switch_language', {
-					language_id: this.value,
-					layoutpages: true
-				});
-			)
-		) %>
-		<label><%= t("Language tree") %></label>
-	</div>
+	<%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
 	<%= toolbar_button(
 		:icon => 'add_page',
 		:url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),

data/app/views/alchemy/admin/pages/_external_link.html.erb

@@ -4,18 +4,8 @@
   </h2>
   <table class="window_form">
     <tr>
-      <td>
-        <%= select_tag(
-          'url_protocol',
-          options_for_select([
-            ['http://', 'http://'],
-            ['mailto:', 'mailto:'],
-            ['ftp://', 'ftp://'],
-            ['https://', 'https://'],
-            ['ftps://', 'ftps://']
-          ]),
-          :class => 'medium'
-        ) %>
+      <td class="label long">
+				<%= label_tag 'external_url', 'URL', :for => 'external_url' %>
       </td>
       <td class="input">
         <%= text_field_tag 'external_url', '', :class => "thin_border auto_resize" %>
@@ -42,7 +32,7 @@
       %(
         Alchemy.LinkOverlay.createLink(
           'external',
-          jQuery('#url_protocol').val() + jQuery('#external_url').val(),
+          jQuery('#external_url').val(),
           jQuery('#extern_link_title').val(),
           jQuery('#link_target').val()
         );

data/app/views/alchemy/admin/pages/index.html.erb

@@ -20,20 +20,7 @@
 
 <%- content_for :toolbar do -%>
 <div id="toolbar_buttons">
-	<div class="button_with_label">
-		<%= select_tag(
-			'language', 
-			options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
-			:onchange => %(
-				Alchemy.pleaseWaitOverlay();
-				jQuery.get('/admin/pages/switch_language', {
-					language_id: this.value
-				});
-			),
-			:class => 'short'
-		) %>
-		<label><%= t("Language tree") %></label>
-	</div>
+	<%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
 	<%- permitted_to?(:flush, :alchemy_admin_pages) do -%>
 	<div class="button_with_label">
 		<%= link_to(