alchemy_cms 2.0.rc3 → 2.0.rc4

data/app/models/attachment.rb

@@ -68,6 +68,10 @@ class Attachment < ActiveRecord::Base
       then "word"
     when "application/vnd.ms-excel"
       then "excel"
+    when "text/x-vcard"
+      then "vcard"
+    when "application/vcard"
+      then "vcard"
     else
       "file"
     end

data/app/models/element.rb

@@ -17,7 +17,10 @@ class Element < ActiveRecord::Base
   
   # TODO: add a trashed column to elements table
   scope :trashed, where(:page_id => nil).order('updated_at DESC')
-  
+  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)) }
+
   # Returns next Element on self.page or nil. Pass a Element.name to get next of this kind.
   def next(name = nil)
     if name.nil?
@@ -38,13 +41,15 @@ class Element < ActiveRecord::Base
     self.class.where(find_conditions).order("position DESC").limit(1)
   end
 
-  def store_page page
+  # Stores the page into `to_be_sweeped_pages` (Pages that have to be sweeped after updating element).
+  def store_page(page)
+    return true if page.nil?
     unless self.to_be_sweeped_pages.include? page
       self.to_be_sweeped_pages << page
       self.save
     end
   end
-  
+
   # nullifies the page_id aka. trashs it.
   def trash
     self.page_id = nil
@@ -104,14 +109,23 @@ class Element < ActiveRecord::Base
     copy
   end
 
+  # Returns the descriptions from elements.yml file.
+  # Alchemy comes with its own elements.yml file. As so called standard set.
+  # Place a elements.yml file inside your apps config/alchemy folder to define
+  # your own set of elements
   def self.descriptions
     if File.exists? "#{Rails.root}/config/alchemy/elements.yml"
-      @elements = YAML.load_file( "#{Rails.root}/config/alchemy/elements.yml" )
-    elsif File.exists? "#{Rails.root}/vendor/plugins/alchemy/config/alchemy/elements.yml"
-      @elements = YAML.load_file( "#{Rails.root}/vendor/plugins/alchemy/config/alchemy/elements.yml" )
-    else
-      raise "Could not read config/alchemy/elements.yml"
-    end
+			element_definitions = YAML.load_file( "#{Rails.root}/config/alchemy/elements.yml" )
+		end
+		if !element_definitions
+			if File.exists?(File.join(File.dirname(__FILE__), "../../config/alchemy/elements.yml"))
+				element_definitions = YAML.load_file( File.join(File.dirname(__FILE__), "../../config/alchemy/elements.yml") )
+			end
+		end
+		if !element_definitions
+			raise LoadError, "Could not find elements.yml file! Please run: rails generate alchemy:scaffold"
+		end
+		element_definitions
   end
   
   def self.definitions
@@ -148,7 +162,6 @@ class Element < ActiveRecord::Base
 
   # returns the description of the element with my name in element.yml
   def description
-    return nil if Element.descriptions.blank?
     Element.descriptions.detect{ |d| d['name'] == self.name }
   end
 
@@ -390,13 +403,14 @@ private
   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)
@@ -410,12 +424,11 @@ private
 
   # creates the contents for this element as described in the elements.yml
   def create_contents
-    element_scratch = description
     contents = []
-    if element_scratch["contents"].blank?
+    if description["contents"].blank?
       logger.warn "\n++++++\nWARNING! Could not find any content descriptions for element: #{self.name}\n++++++++\n"
     else
-      element_scratch["contents"].each do |content_hash|
+      description["contents"].each do |content_hash|
         contents << Content.create_from_scratch(self, content_hash.symbolize_keys)
       end
     end

data/app/models/page.rb

@@ -1,5 +1,8 @@
 # encoding: UTF-8
 class Page < ActiveRecord::Base
+	
+	RESERVED_PAGE_LAYOUTS = %w(rootpage)
+	RESERVED_URLNAMES = %w(admin messages)
   
   acts_as_nested_set
   stampable
@@ -12,8 +15,11 @@ class Page < ActiveRecord::Base
 
   validates_presence_of :name, :message => N_("please enter a name")
   validates_presence_of :page_layout, :message => N_("Please choose a page layout.")
+  validates_presence_of :parent_id, :message => N_("No parent page was given."), :unless => :rootpage?
   validates_length_of :urlname, :minimum => 3, :too_short => N_("urlname_to_short"), :if => :urlname_entered?
   validates_uniqueness_of :urlname, :message => N_("URL-Name already token"), :scope => 'language_id', :if => :urlname_entered?
+	validates :page_layout, :exclusion => { :in => RESERVED_PAGE_LAYOUTS, :message => N_("This page_layout name is reserved.") }, :unless => :rootpage?
+	validates :urlname, :exclusion => { :in => RESERVED_URLNAMES, :message => N_("This urlname is reserved.") }
   
   attr_accessor :do_not_autogenerate
   attr_accessor :do_not_sweep
@@ -34,7 +40,7 @@ class Page < ActiveRecord::Base
   scope :accessable, where(:restricted => false)
   scope :restricted, where(:restricted => true)
   scope :public_language_roots, lambda {
-    where("language_root = 1 AND language_code IN ('#{Language.all_codes_for_published.join('\',\'')}') AND public = 1")
+		where(:language_root => true).where("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) }
   
@@ -44,24 +50,37 @@ class Page < ActiveRecord::Base
   
   scope :contentpages, where("pages.layoutpage = 0 AND pages.parent_id IS NOT NULL")
   
-  # Finds selected elements from page either except a passed collection or only the passed collection
-  # Collection is an array of strings from element names. E.g.: ['text', 'headline']
-  # Returns only public ones
-  def find_selected_elements(options, show_non_public = false)
-    public_condition = show_non_public ? nil : ' AND elements.public = 1'
-    if !options[:except].blank?
-      condition = ["elements.name NOT IN (?)#{public_condition}", options[:except]]
-    elsif !options[:only].blank?
-      condition = ["elements.name IN (?)#{public_condition}", options[:only]]
+  # Finds selected elements from page.
+  # 
+  # Options are:
+  # 
+  #     :only => Array of element names    # Returns only elements with given names
+  #     :except => Array of element names  # Returns all elements except the ones with given names
+  #     :count => Integer                  # Limit the count of returned elements
+  #     :offset => Integer                 # Starts with an offset while returning elements
+  #     :random => Boolean                 # Returning elements randomly shuffled
+  # 
+  # Returns only public elements by default.
+  # Pass true as second argument to get all elements.
+  # 
+  def find_selected_elements(options = {}, show_non_public = false)
+    elements = self.elements
+    if !options[:only].blank?
+      elements = self.elements.named(options[:only])
+    elsif !options[:except].blank?
+      elements = self.elements.excluded(options[:except])
+    end
+    elements = elements.offset(options[:offset]).limit(options[:count])
+    elements = elements.order("RAND()") if options[:random]
+    if show_non_public
+      elements
     else
-      condition = show_non_public.nil? ? nil : {:public => true}
+      elements.published
     end
-    elements = self.elements.where(condition).limit(options[:count]).offset(options[:offset])
-    elements.order("RAND()") unless options[:random].blank?
-    elements
   end
 
-  def find_elements(options, show_non_public = false)
+  def find_elements(options = {}, show_non_public = false) #:nodoc:
+    # TODO: What is this? A Kind of proxy method? Why not rendering the elements directly if you already have them????
     if !options[:collection].blank? && options[:collection].is_a?(Array)
       all_elements = options[:collection]
     else
@@ -69,7 +88,7 @@ class Page < ActiveRecord::Base
     end
     all_elements
   end
-  
+
   def elements_grouped_by_cells
     group = ActiveSupport::OrderedHash.new
     cells.each { |cell| group[cell] = cell.elements }
@@ -324,30 +343,39 @@ class Page < ActiveRecord::Base
     self.language_roots.find_by_language_id(language_id)
   end
 
-  # Creates a copy of source (an Page object) and does a copy of all elements depending to source.
+  # Creates a copy of source (a Page object) and does a copy of all elements depending to source.
   # You can pass any kind of Page#attributes as a difference to source.
   # Notice: It prevents the element auto_generator from running.
-  def self.copy(source, differences = {})
-    attributes = source.attributes.symbolize_keys.merge(differences)
-    attributes.merge!(
-      :do_not_autogenerate => true, 
-      :do_not_sweep => true, 
-      :visible => false,
-      :public => false,
-      :locked => false,
-      :locked_by => nil
-    )
-    page = self.new(attributes.except(["id", "updated_at", "created_at", "created_id", "updater_id"]))
-    if page.save
-      source.elements.each do |element|
-        new_element = Element.copy(element, :page_id => page.id)
-        new_element.move_to_bottom
-      end
-      return page
-    else
-      raise page.errors.full_messages
-    end
-  end
+	def self.copy(source, differences = {})
+		attributes = source.attributes.symbolize_keys.merge(differences)
+		attributes.merge!(
+			:do_not_autogenerate => true, 
+			:do_not_sweep => true, 
+			:visible => false,
+			:public => false,
+			:locked => false,
+			:locked_by => nil
+		)
+		page = self.new(attributes.except(["id", "updated_at", "created_at", "created_id", "updater_id"]))
+		if page.save
+			# copy the page´s cells
+			source.cells.each do |cell|
+				new_cell = Cell.create(:name => cell.name, :page_id => page.id)
+			end
+			# copy the page´s elements
+			source.elements.each do |element|
+				# detect cell for element
+				# if cell is nil also pass nil to element.cell_id
+				cell = nil
+				cell = page.cells.detect{ |c| c.name == element.cell.name } if element.cell
+				new_element = Element.copy(element, :page_id => page.id, :cell_id => (cell.blank? ? nil : cell.id))
+				new_element.move_to_bottom
+			end
+			return page
+		else
+			raise page.errors.full_messages
+		end
+	end
 
   # Gets the language_root page for page
   def get_language_root
@@ -432,6 +460,15 @@ class Page < ActiveRecord::Base
     return N_('unknown') if self.locker.nil?
     self.locker.name
   end
+
+	# is the curent object the main rootpage?
+	def rootpage?
+		(self.page_layout == "rootpage") && self.parent_id.blank?
+	end
+	
+	def self.rootpage
+		where(:page_layout => 'rootpage').where(:parent_id => nil).first
+	end
   
 private
 

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

@@ -3,7 +3,7 @@
   $('#essence_picture_<%= @content_id -%>').remove();
   Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
 
-  <%- if !max_image_count.blank? && (@essence_pictures.length == max_image_count) -%>
+  <%- if max_image_count.blank? || (@essence_pictures.length < max_image_count) -%>
   $('#element_<%= @element.id -%>_contents').append('<%= escape_javascript(
     render(
       :partial => "admin/elements/add_content",

data/app/views/admin/pages/_create_language_form.html.erb

@@ -33,10 +33,11 @@
 			<%= form.hidden_field :language_code, :value => lang.code %>
 			<%= form.hidden_field :page_layout, :value => lang.page_layout %>
 			<%= form.hidden_field :language_root, :value => true %>
+			<%= form.hidden_field :parent_id, :value => Page.rootpage.id %>
 			<%= form.submit(_("%{language}_as_new_language") % {:language => lang.name}, :class => 'button', :onclick => 'Alchemy.pleaseWaitOverlay();') %>
 		<% end %>
 		<%- end -%>
 	<%- else -%>
-		<p>Diese Sprache existiert noch nicht. Bitte legen Sie diese Sprache erst in den Sprachen an.</p>
+		<p><%= _("Actually this language does not exist. Please create this language first.") %></p>
 	<%- end -%>
 </div>

data/app/views/admin/pages/new.html.erb

@@ -12,7 +12,7 @@
 	</div>
 	<div id="paste_page_tab">
 		<%= form_for([:admin, @page], :remote => true, :html => {:id => 'paste_page_form'}) do |f| %>
-			<%= f.hidden_field("parent_id", :value => @parent_id) %>
+			<%= f.hidden_field(:parent_id) %>
 			<table id="new_page_form">
 				<tr>
 					<td class="label very_long">

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

@@ -2,7 +2,7 @@
 	Alchemy.closeCurrentWindow();
 	<%- if request.referer.include?('edit') -%>
 		Alchemy.reloadPreview();
-		$('#<%= dom_id(@page) -%>_status').replaceWith(<%= escape_javascript(render(:partial => 'page_status')) -%>)
+		$('#<%= dom_id(@page) -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
 	<%- else -%>
 		$('#<%= dom_id(@page) -%> > .sitemap_page > .sitemap_sitename .sitemap_pagename_link').text('<%= @page.name -%>');
 		<%- if @page.locked? && @page.locker == current_user -%>

data/app/views/admin/partials/_upload_form.html.erb

@@ -74,10 +74,10 @@
 			flash9_url : "/javascripts/alchemy/swfupload/swfupload.swf",
 			upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
 			post_params: <%= post_params.html_safe %>,
-			file_size_limit : "500 MB",
+			file_size_limit : "<%= configuration(:uploader)[:file_size_limit] -%> MB",
 			file_types : '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
 			file_types_description : "<%= file_types_description %>",
-			file_upload_limit : 500,
+			file_upload_limit : <%= configuration(:uploader)[:upload_limit] -%>,
 			file_queue_limit : 0,
 			custom_settings : {
 				progressTarget : "uploadProgressContainer",

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

@@ -56,11 +56,11 @@
 			<%= link_to(
 				content_tag('span', '', :class => 'icon flush'),
 				flush_admin_pictures_path,
-				:before => 'Alchemy.pleaseWaitOverlay();',
-				:complete => 'Alchemy.pleaseWaitOverlay(false);',
 				:class => 'icon_button',
 				:remote => true,
-				:title => _('Flush picture cache')
+				:method => :post,
+				:title => _('Flush picture cache'),
+				:id => 'flush_picture_cache_button'
 			) -%><br />
 			<label><%= _('Flush picture cache') %></label>
 		</div>
@@ -75,11 +75,14 @@
 <%- content_for :javascripts do -%>
 <script type="text/javascript" charset="utf-8">
 
-	jQuery(document).ready(function() {
+	jQuery(document).ready(function($) {
 		Alchemy.inPlaceEditor({
 			save_label: "<%= _('save') %>",
 			cancel_label: "<%= _('cancel') %>"
 		});
+		$('#flush_picture_cache_button').click(function() {
+			Alchemy.pleaseWaitOverlay();
+		});
 	});
 
 </script>

data/app/views/essences/_essence_picture_editor.html.erb

@@ -4,9 +4,7 @@
     <%= link_to_confirmation_window(
       "",
       _("confirm_to_delete_image"),
-      url_for(
-        :controller => 'essence_pictures',
-        :action => 'destroy',
+      admin_essence_picture_path(
         :id => content,
         :options => options
       ),

data/app/views/layouts/alchemy.html.erb

@@ -1,60 +1,60 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<%= current_user.language.blank? ? 'de' : current_user.language rescue 'de' %>">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="content-language" content="<%= current_user.language.blank? ? 'de' : current_user.language rescue 'de' %>">
-        <title><%= render_alchemy_title %></title>
-        <!--[if IE 6]><link rel="stylesheet" type="text/css" href="/plugin_assets/stylesheets/ie6.css" /><![endif]-->
-        <%= yield :stylesheets %>
-        <%= yield :javascript_includes %>
-        <script type="text/javascript" charset="utf-8">
-        // <![CDATA[
-            if(typeof(jQuery)=='function') {
-                jQuery.noConflict();
-            }
-        // ]]>
-        </script>
-    </head>
-    
-    <body id="alchemy">
-        <%#= overlay for indication of loading %>
-        <div id="overlay">
-            <div id="overlay_text_box">
-                <%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
-                <span id="overlay_text"><%= _("please_wait") %></span>
-            </div>
-        </div>
-        <%#= overlay end %>
-        <div id="corner"></div>
-        <div id="main_menu">
-            <div id="main_navi">
-                <%= yield(:navigation) %>
-                <%= admin_main_navigation %>
-            </div>
-            <div id="main_menu_background"></div>
-            <div id="logout">
-							<%= link_to_overlay_window("<span class='module icon exit'></span><br /> #{_('leave')}".html_safe, leave_admin_path, {:size => "300x140", :title => _("Leave Alchemy")}) %>
-            </div>
-        </div>
-        <div id="top_menu">
-            <div id="sub_navigation">
-              <%= admin_subnavigation %>
-              <div id="subnav_additions">
-                  <%= yield(:subnav_additions) %>
-              </div>
-            </div>
-            <%= yield(:toolbar) %>
-            <%- if current_user -%>
-            <div id="user_info">
-                <%= _('Logged in as') %> <%= current_user.name %>
-            </div>
-            <%- end -%>
-        </div>
-        <%= render :partial => 'admin/partials/flash_notices' %>
-        <div id="main_content">
-            <%= yield %>
-        </div>
-        <%= yield(:javascripts) %>
-    </body>
+<!DOCTYPE>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<meta http-equiv="content-language" content="<%= current_user.language.blank? ? 'de' : current_user.language rescue 'de' %>">
+		<title><%= render_alchemy_title %></title>
+		<%= csrf_meta_tag %>
+		<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/plugin_assets/stylesheets/ie6.css" /><![endif]-->
+		<%= yield :stylesheets %>
+		<%= yield :javascript_includes %>
+		<script type="text/javascript" charset="utf-8">
+		// <![CDATA[
+		if(typeof(jQuery)=='function') {
+			jQuery.noConflict();
+		}
+		// ]]>
+		</script>
+	</head>
+	
+	<body id="alchemy">
+		<%#= overlay for indication of loading %>
+		<div id="overlay">
+			<div id="overlay_text_box">
+				<%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
+				<span id="overlay_text"><%= _("please_wait") %></span>
+			</div>
+		</div>
+		<%#= overlay end %>
+		<div id="corner"></div>
+		<div id="main_menu">
+			<div id="main_navi">
+				<%= yield(:navigation) %>
+				<%= admin_main_navigation %>
+			</div>
+			<div id="main_menu_background"></div>
+			<div id="logout">
+				<%= link_to_overlay_window("<span class='module icon exit'></span><br /> #{_('leave')}".html_safe, leave_admin_path, {:size => "300x140", :title => _("Leave Alchemy")}) %>
+			</div>
+		</div>
+		<div id="top_menu">
+			<div id="sub_navigation">
+				<%= admin_subnavigation %>
+				<div id="subnav_additions">
+					<%= yield(:subnav_additions) %>
+				</div>
+			</div>
+			<%= yield(:toolbar) %>
+			<%- if current_user -%>
+			<div id="user_info">
+				<%= _('Logged in as') %> <%= current_user.name %>
+			</div>
+			<%- end -%>
+		</div>
+		<%= render :partial => 'admin/partials/flash_notices' %>
+		<div id="main_content">
+			<%= yield %>
+		</div>
+		<%= yield(:javascripts) %>
+	</body>
 </html>