alchemy_cms 2.1.rc2 → 2.1.rc3

data/app/models/alchemy/content.rb

@@ -63,15 +63,24 @@ module Alchemy
 			self.element.contents
 		end
 
-		# makes a copy of source and copies the polymorphic associated essence
+		# Makes a copy of source and also copies the associated essence.
+		# 
+		# You can pass a differences hash to update the attributes of the copy.
+		# 
+		# === Example
+		# 
+		#   @copy = Alchemy::Content.copy(@content, {:element_id => 3})
+		#   @copy.element_id # => 3
+		# 
 		def self.copy(source, differences = {})
 			differences[:position] = nil
 			differences[:id] = nil
-			attributes = source.attributes.merge(differences)
-			content = self.create!(attributes.except("id"))
-			new_essence = content.essence.clone
-			new_essence.save
-			content.essence_id = new_essence.id
+			attributes = source.attributes.except("id").merge(differences)
+			content = self.create!(attributes)
+			new_essence = content.essence.class.new(content.essence.attributes.except('id'))
+			new_essence.save!
+			raise "Essence not cloned" if new_essence.id == content.essence_id
+			content.update_attribute(:essence_id, new_essence.id)
 			content
 		end
 
@@ -120,17 +129,17 @@ module Alchemy
 
 		# Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
 		# 
-		# Example:
-		# ========
-		# 	<%= text_field_tag content.form_field_name, content.ingredient %>
+		# === Example:
+		# 
+		#   <%= text_field_tag content.form_field_name, content.ingredient %>
+		# 
+		# === Options:
 		# 
-		# Options:
-		# ========
 		# You can pass an Essence column_name. Default is self.essence.ingredient_column
 		# 
-		# Example:
-		# =======
-		# 	<%= text_field_tag content.form_field_name(:link), content.ingredient %>
+		# ==== Example:
+		# 
+		#   <%= text_field_tag content.form_field_name(:link), content.ingredient %>
 		# 
 		def form_field_name(essence_column = self.essence.ingredient_column)
 			"contents[content_#{self.id}][#{essence_column}]"

data/app/models/alchemy/element.rb

@@ -166,6 +166,62 @@ module Alchemy
 			element_definitions
 		end
 
+		# List all elements for page_layout
+		def self.all_for_page(page)
+			raise TypeError if page.class.name != "Alchemy::Page"
+			# if page_layout has cells, collect elements from cells and group them by cellname
+			page_layout = Alchemy::PageLayout.get(page.page_layout)
+			if page_layout.blank?
+				logger.warn "\n++++++\nWARNING! Could not find page_layout description for page: #{page.name}\n++++++++\n"
+				return []
+			end
+			elements_for_layout = []
+			elements_for_layout += all_definitions_for(page_layout['elements'])
+			return [] if elements_for_layout.blank?
+			# all unique elements from this layout
+			unique_elements = elements_for_layout.select{ |m| m["unique"] == true }
+			elements_already_on_the_page = page.elements
+			# delete all elements from the elements that could be placed that are unique and already and the page
+			unique_elements.each do |unique_element|
+				elements_already_on_the_page.each do |already_placed_element|
+					if already_placed_element.name == unique_element["name"]
+						elements_for_layout.delete(unique_element)
+					end
+				end
+			end
+			return elements_for_layout
+		end
+
+		def self.all_definitions_for(element_names)
+			return [] if element_names.blank?
+			if element_names.to_s == "all"
+				return element_descriptions
+			else
+				return definitions.select { |e| element_names.include? e['name'] }
+			end
+		end
+
+		# This methods does a copy of source and all depending contents and all of their depending essences.
+		# 
+		# == Options
+		# 
+		# You can pass a differences Hash as second option to update attributes for the copy.
+		# 
+		# == Example
+		# 
+		#   @copy = Alchemy::Element.copy(@element, {:public => false})
+		#   @copy.public? # => false
+		# 
+		def self.copy(source, differences = {})
+			attributes = source.attributes.except("id").merge(differences)
+			element = self.create!(attributes.merge(:create_contents_after_create => false, :id => nil, :position => nil))
+			source.contents.each do |content|
+				new_content = Content.copy(content, :element_id => element.id)
+				new_content.move_to_bottom
+			end
+			element
+		end
+
 		def self.definitions
 			self.descriptions
 		end
@@ -417,52 +473,6 @@ module Alchemy
 
 	private
 
-		# List all elements for page_layout
-		def self.all_for_page(page)
-			raise TypeError if page.class.name != "Alchemy::Page"
-			# if page_layout has cells, collect elements from cells and group them by cellname
-			page_layout = Alchemy::PageLayout.get(page.page_layout)
-			if page_layout.blank?
-				logger.warn "\n++++++\nWARNING! Could not find page_layout description for page: #{page.name}\n++++++++\n"
-				return []
-			end
-			elements_for_layout = []
-			elements_for_layout += all_definitions_for(page_layout['elements'])
-			return [] if elements_for_layout.blank?
-			# all unique elements from this layout
-			unique_elements = elements_for_layout.select{ |m| m["unique"] == true }
-			elements_already_on_the_page = page.elements
-			# delete all elements from the elements that could be placed that are unique and already and the page
-			unique_elements.each do |unique_element|
-				elements_already_on_the_page.each do |already_placed_element|
-					if already_placed_element.name == unique_element["name"]
-						elements_for_layout.delete(unique_element)
-					end
-				end
-			end
-			return elements_for_layout
-		end
-
-		def self.all_definitions_for(element_names)
-			return [] if element_names.blank?
-			if element_names.to_s == "all"
-				return element_descriptions
-			else
-				return definitions.select { |e| element_names.include? e['name'] }
-			end
-		end
-
-		# makes a copy of source and makes copies of the contents from source
-		def self.copy(source, differences = {})
-			attributes = source.attributes.except("id").merge(differences)
-			element = self.create!(attributes.merge(:create_contents_after_create => false, :id => nil, :position => nil))
-			source.contents.each do |content|
-				new_content = Content.copy(content, :element_id => element.id)
-				new_content.move_to_bottom
-			end
-			element
-		end
-
 		# creates the contents for this element as described in the elements.yml
 		def create_contents
 			contents = []

data/app/views/alchemy/admin/contents/_missing.html.erb

@@ -10,7 +10,8 @@
           :element_id => element.id,
           :name => name
         },
-        :was_missing => true
+        :was_missing => true,
+				:options => options
       ),
       :method => 'post',
       :remote => true,

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

@@ -7,7 +7,7 @@
       :partial => "alchemy/essences/essence_picture_editor",
       :locals => {
         :content => @content,
-        :options => @options
+        :options => @options.symbolize_keys
       }
     )
   ) -%>');
@@ -28,7 +28,7 @@
 
   <%- locals = {
     :content => @content,
-    :options => {:as => 'text_field'}.merge(@options.nil? ? {} : @options)
+    :options => {:as => 'text_field'}.merge(@options.nil? ? {} : @options.symbolize_keys)
   } -%>
 
   <%- if params[:was_missing] -%>
@@ -50,14 +50,16 @@
   ) -%>');
   Alchemy.reloadPreview();
   Alchemy.closeCurrentWindow();
-
+	
   <%- end -%>
 
+	Alchemy.SelectBox("#element_<%= @element.id %> select");
+
 <%- elsif @content.essence_type ==  "Alchemy::EssenceRichtext" -%>
 
   <%- locals = {
     :content => @content,
-    :options => (@options.nil? ? {} : @options)
+    :options => (@options.nil? ? {} : @options.symbolize_keys)
   } -%>
 
   <%- if params[:was_missing] -%>
@@ -90,7 +92,7 @@
       :partial => "alchemy/essences/#{@content.essence_type.underscore}_editor",
       :locals => {
         :content => @content,
-        :options => (@options.nil? ? {} : @options)
+        :options => (@options.nil? ? {} : @options.symbolize_keys)
       }
     )
   ) -%>');
@@ -98,5 +100,4 @@
 <%- end -%>
 
   Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
-
 })(jQuery);

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

@@ -1,6 +1,6 @@
 <div id="dashboard">
 	<h1><%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %></h1>
-	<h2><%= t('You were last time online at %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></h2>
+	<h2><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></h2>
 	
 	<div class="widget">
 		<h2><%= t('Your last updated pages') %>:</h2>

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -16,7 +16,8 @@
   <%- elsif content.settings[:display_as] == "select" -%>
   
   <label><%= render_content_name(content) %></label>
-  <%- if options[:select_values].blank? -%>
+
+  <%- if options[:select_values].nil? -%>
   <%= warning('options[:select_values] is nil', "No select values given. Please provide :select_values as argument to render_essence_editor_by_name() helper inside this element editor view.") %>
   <%- else -%>
   <%- if options[:select_values].is_a?(Hash)
@@ -36,7 +37,7 @@
     content.form_field_name,
     options_method,
     {
-      :class => "essence_editor_select full_width"
+      :class => "essence_editor_select"
     }
   ) %>
   <%- end -%>
@@ -66,13 +67,14 @@
   <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
   <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
   
-  <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
-    <span class="icon link"></span>
-  </a>
-  
-  <a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
-    <span class="icon unlink"></span>
-  </a>
+	<span class="linkable_text_essence_tools">
+		<a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
+			<span class="icon link"></span>
+		</a>
+		<a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
+			<span class="icon unlink"></span>
+		</a>
+	</span>
   
   <%- end -%>
   

data/app/views/alchemy/navigation/_renderer.html.erb

@@ -16,7 +16,7 @@
 		<%- end -%>
 	</li>
 	<%- unless options[:spacer].empty? -%>
-	<%= "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
+	<%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
 	<%- end -%>
 <%- end -%>
 </ul>

data/config/locales/alchemy.de.yml

@@ -304,7 +304,7 @@ de:
     "You have unsaved elements. Do you really want to close the elements window?": "Sie haben ungesicherte Elemente. Möchten Sie das Elemente Fenster wirklich schließen?"
     "You may upload files with following extensions": "Sie können %{file_types_description} mit folgenden Endungen hochladen: %{file_types}"
     "You may upload any file": "Sie können jede Art von Datei hochladen."
-    "You were last time online at %{time}": "Sie waren zuletzt angemeldet am %{time}."
+    "Your last login was on %{time}": "Sie waren zuletzt angemeldet am %{time}."
     "Your Alchemy Login": "Ihre Alchemy Zugangsdaten"
     "Your credentials are": "Ihre Zugangsdaten lauten"
     "Your last updated pages": "Ihre zuletzt bearbeiteten Seiten"

data/config/locales/alchemy.en.yml

@@ -162,7 +162,7 @@ en:
       overlay: Overlay
     
     create_tree_as_new_language: "Create %{language} as a new language tree"
-    "Delete image": "Remove this image."
+    "Delete image": "Remove this image"
     "Image size": "Imagesize"
     "Image deleted successfully": "Image deleted successfully."
     "Mandatory": "Mandatory fields"
@@ -176,10 +176,10 @@ en:
     "User created": "User created"
     "User deleted": "User deleted"
     "User updated": "User updated"
-    add_image_to_element: "Add an image."
+    add_image_to_element: "Add an image"
     align_in_text: "Alignment in text"
     allow_fullscreen: "Allow fullscreen"
-    assign_file: "Assign a file."
+    assign_file: "Assign a file"
     assign_file_from_archive: "assign a file from your archive"
     assign_image: "Assign an image"
     auto_play: "Play movie after load"
@@ -195,19 +195,19 @@ en:
     contactform_body: "Message Template"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
-    copy_element: "Copy this element."
+    copy_element: "Copy this element"
     copy_page: "Copy page"
     "Create language": "Create a new language"
-    create_page: "Create a new subpage."
-    create_user: "Create a new user."
+    create_page: "Create a new subpage"
+    create_user: "Create a new user"
     created_at: "Created at"
     currently_edited_by: "This page is currently locked by"
     cut_element: "Cut this element."
     delete_file: "Delete this file from server."
-    delete_image: "Remove this image."
-    delete_language: "Delete this language."
-    delete_page: "Delete this page."
-    delete_user: "Delete this user."
+    delete_image: "Remove this image"
+    delete_language: "Delete this language"
+    delete_page: "Delete this page"
+    delete_user: "Delete this user"
     document: "File"
     documents: "Files"
     download_file: "Download file '%{filename}'"
@@ -217,8 +217,8 @@ en:
     edit_image_properties: "Edit image properties."
     edit_language: "Edit language"
     edit_page: "Edit this page"
-    edit_page_properties: "Edit the page properties."
-    edit_user: "Edit this users properties."
+    edit_page_properties: "Edit the page´s properties."
+    edit_user: "Edit the user´s properties."
     element_editor_not_found: "Error within this Element"
     element_of_type: "Element"
     element_saved: "Saved element."
@@ -256,7 +256,7 @@ en:
       file: "File"
       internal: "Internal"
     link_title: "Linktitle"
-    logged_out: "You logged out successfully."
+    logged_out: "You´re logged out successfully."
     mail_to: "Recipient"
     male: "Male"
     medium_thumbnails: "Medium thumbnails"
@@ -289,7 +289,7 @@ en:
     page_locked: "This page is locked by another user."
     page_properties: "page properties"
     page_public: "published"
-    page_published: "Published page."
+    page_published: "Published page"
     page_restricted: "restricted"
     page_status: "Status"
     page_status_invisible_public: "Page is invisible in navigation but public."
@@ -329,7 +329,7 @@ en:
     small_thumbnails: "Small thumbnails"
     successfully_added_element: "Succesfully added new element."
     successfully_saved_element_position: "Element position updated succesfully."
-    swap_image: "Change image."
+    swap_image: "Change image"
     swfupload:
       cancel_uploads: "Cancel uploads"
     title: "Title"
@@ -339,8 +339,8 @@ en:
     unlock_page: "Leave page"
     unlocked_page: "Unlocked page %{name}."
     updated_at: "Updated at"
-    upload_file: "Upload file(s)."
-    upload_image: "Upload image(s)."
+    upload_file: "Upload file(s)"
+    upload_image: "Upload image(s)"
     url_name: "URL-Name"
     urlname_to_short: "The pages urlname is too short (minimum of 3 characters)"
     username: "Username"
@@ -350,9 +350,9 @@ en:
     width: "Width"
     "You are already logged in": "You are already logged in."
     "You may upload files with following extensions": "You may upload %{file_types_description} with following extensions: %{file_types}"
-    zoom_image: "Zoom this image."
-    "Nothing found": "Nothing found."
-    "Validation failed": "Validation failed."
+    zoom_image: "Zoom this image"
+    "Nothing found": "Nothing found"
+    "Validation failed": "Validation failed"
   
   # END of Alchemy translation
   
@@ -504,7 +504,7 @@ en:
         frontpage_name: "Name of frontpage"
         name: "Name"
         page_layout: "Pagetype of frontpage"
-        public: "public"
+        public: "Public"
       
       alchemy/page:
         created_at: "Created at"

data/lib/alchemy/capistrano.rb

@@ -5,47 +5,47 @@ require "alchemy/mount_point"
 
 Capistrano::Configuration.instance(:must_exist).load do
   
-  after "deploy:setup", "alchemy:shared_folders:create"
-  after "deploy:symlink", "alchemy:shared_folders:symlink"
-	before "deploy:start", "alchemy:seed"
+	after "deploy:setup", "alchemy:shared_folders:create"
+	after "deploy:symlink", "alchemy:shared_folders:symlink"
+	before "deploy:start", "alchemy:db:seed"
   
-  namespace :alchemy do
-
-    namespace :shared_folders do
-
-      # This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
-      # Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
-      desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
-      task :create, :roles => :app do
-        run "mkdir -p #{shared_path}/index"
-        run "mkdir -p #{shared_path}/uploads/pictures"
-        run "mkdir -p #{shared_path}/uploads/attachments"
-        run "mkdir -p #{File.join(shared_path, 'cache', Capistrano::CLI.ui.ask("Where is Alchemy CMS mounted at? (/)"), 'pictures')}"
-      end
-
-      # This task sets the symlinks for uploads, picture cache and ferret index folder.
-      # Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
-      desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
-      task :symlink, :roles => :app do
-        run "rm -rf #{current_path}/uploads"
-        run "ln -nfs #{shared_path}/uploads #{current_path}/"
+	namespace :alchemy do
+
+		namespace :shared_folders do
+
+			# This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
+			# Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
+			desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
+			task :create, :roles => :app do
+				run "mkdir -p #{shared_path}/index"
+				run "mkdir -p #{shared_path}/uploads/pictures"
+				run "mkdir -p #{shared_path}/uploads/attachments"
+				run "mkdir -p #{File.join(shared_path, 'cache', Capistrano::CLI.ui.ask("Where is Alchemy CMS mounted at? (/)"), 'pictures')}"
+			end
+
+			# This task sets the symlinks for uploads, picture cache and ferret index folder.
+			# Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
+			desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
+			task :symlink, :roles => :app do
+				run "rm -rf #{current_path}/uploads"
+				run "ln -nfs #{shared_path}/uploads #{current_path}/"
 				run "ln -nfs #{shared_path}/cache/* #{current_path}/public/"
-        run "rm -rf #{current_path}/index"
-        run "ln -nfs #{shared_path}/index #{current_path}/"
-      end
+				run "rm -rf #{current_path}/index"
+				run "ln -nfs #{shared_path}/index #{current_path}/"
+			end
 
-    end
+		end
 
 		desc "Upgrades production database to current Alchemy CMS version"
 		task :upgrade do
 			run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:upgrade"
 		end
 
-  	namespace :database_yml do
+		namespace :database_yml do
 
-  		desc "Creates the database.yml file"
-  	  task :create do
-  	    db_config = ERB.new <<-EOF
+			desc "Creates the database.yml file"
+			task :create do
+				db_config = ERB.new <<-EOF
   production:
     adapter: mysql
     encoding: utf8
@@ -57,29 +57,38 @@ Capistrano::Configuration.instance(:must_exist).load do
     socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
     host: #{ Capistrano::CLI.ui.ask("Database host: ") }
   EOF
-  	    run "mkdir -p #{shared_path}/config"
-  	    put db_config.result, "#{shared_path}/config/database.yml"
-  	  end
+				run "mkdir -p #{shared_path}/config"
+				put db_config.result, "#{shared_path}/config/database.yml"
+			end
 
-  		desc "Symlinks the database.yml file from shared folder into config folder"
-  		task :symlink, :except => { :no_release => true } do
-        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
-      end
+			desc "Symlinks the database.yml file from shared folder into config folder"
+			task :symlink, :except => { :no_release => true } do
+				run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
+			end
 
-  	end
+		end
 
   end
 
-  namespace :ferret do
+	namespace :db do
 
-    # This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
-    # Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
-    # It uses the +alchemy:rebuild_index+ rake task found in +vendor/plugins/alchemy/lib/tasks+.
-    desc "Rebuild the ferret index. Call before deploy:restart"
-    task :rebuild_index, :roles => :app do
-      run "cd #{current_path} && RAILS_ENV=production #{rake} ferret:rebuild_index"
-    end
+		desc "Seeds the database with essential data."
+		task :seed, :roles => :app do
+			run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:db:seed"
+		end
 
-  end
+	end
+
+	namespace :ferret do
+	
+		# This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
+		# Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
+		# It uses the +alchemy:rebuild_index+ rake task found in +vendor/plugins/alchemy/lib/tasks+.
+		desc "Rebuild the ferret index. Call before deploy:restart"
+		task :rebuild_index, :roles => :app do
+			run "cd #{current_path} && RAILS_ENV=production #{rake} ferret:rebuild_index"
+		end
+
+	end
   
 end