alchemy_cms 2.0.rc6 → 2.0

data/app/helpers/pages_helper.rb

@@ -488,16 +488,6 @@ module PagesHelper
     render :partial => "cells/#{name}", :locals => {:cell => cell}
   end
 
-  # Renders all element partials from given cell.
-  def render_cell_elements(cell)
-    return warning("No cell given.") if cell.blank?
-    ret = ""
-    cell.elements.each do |element|
-      ret << render_element(element)
-    end
-    ret.html_safe
-  end
-
   # Returns true or false if no elements are in the cell found by name.
   def cell_empty?(name)
     cell = @page.cells.find_by_name(name)

data/app/models/element.rb

@@ -52,9 +52,11 @@ class Element < ActiveRecord::Base
 
   # nullifies the page_id aka. trashs it.
   def trash
-    self.page_id = nil
-    self.folded = true
-    self.save(false)
+    self.update_attributes({
+      :page_id => nil,
+      :folded => true,
+      :public => false
+    })
   end
   
   def trashed?
@@ -77,9 +79,39 @@ class Element < ActiveRecord::Base
     self.contents.find_all_by_essence_type(essence_type)
   end
 
+	# Returns the content that is marked as rss title.
+	# 
+	# Mark a content as rss title in your +elements.yml+ file:
+	# 
+	#   - name: news
+	#     contents:
+	#     - name: headline
+	#       type: EssenceText
+	#       rss_title: true
+	# 
+	def content_for_rss_title
+		rss_title = content_descriptions.detect { |c| c['rss_title'] }
+		contents.find_by_name(rss_title['name'])
+	end
+
+	# Returns the content that is marked as rss description.
+	# 
+	# Mark a content as rss description in your +elements.yml+ file:
+	# 
+	#   - name: news
+	#     contents:
+	#     - name: body
+	#       type: EssenceRichtext
+	#       rss_description: true
+	# 
+	def content_for_rss_description
+		rss_title = content_descriptions.detect { |c| c['rss_description'] }
+		contents.find_by_name(rss_title['name'])
+	end
+
   # Inits a new element for page as described in /config/alchemy/elements.yml from element_name
   def self.new_from_scratch(attributes)
-    attributes.stringify_keys!    
+    attributes.stringify_keys!
     return Element.new if attributes['name'].blank?
     element_descriptions = Element.descriptions
     return if element_descriptions.blank?
@@ -162,8 +194,9 @@ class Element < ActiveRecord::Base
 
   # returns the description of the element with my name in element.yml
   def description
-    Element.descriptions.detect{ |d| d['name'] == self.name }
+    self.class.descriptions.detect{ |d| d['name'] == self.name }
   end
+	alias_method :definition, :description
 
   # Human name for displaying in selectboxes and element editor views.
   # The name is beeing translated from elements name value as described in config/alchemy/elements.yml
@@ -379,6 +412,7 @@ private
   
   # List all elements for page_layout
   def self.all_for_page(page)
+    raise TypeError if page.class != 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?

data/app/models/page.rb

@@ -35,6 +35,7 @@ class Page < ActiveRecord::Base
   scope :language_roots, where(:language_root => true)
   scope :layoutpages, where(:layoutpage => true)
   scope :all_locked, where(:locked => true)
+  scope :not_locked, where(:locked => false)
   scope :visible, where(:visible => true)
   scope :public, where(:public => true)
   scope :accessable, where(:restricted => false)
@@ -43,10 +44,13 @@ class Page < ActiveRecord::Base
 		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) }
-  
-  # Returns all pages for langugae that are not locked and public.
+
+	# 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, lambda { |language_id| where({:public => true, :locked => false, :language_id => language_id}) }
+  scope :flushables, public.not_locked
   
   scope :contentpages, where("pages.layoutpage = 0 AND pages.parent_id IS NOT NULL")
   
@@ -59,12 +63,17 @@ class Page < ActiveRecord::Base
   #     :count => Integer                  # Limit the count of returned elements
   #     :offset => Integer                 # Starts with an offset while returning elements
   #     :random => Boolean                 # Returning elements randomly shuffled
+	#     :from_cell => Cell                 # Returning elements from given cell
   # 
   # 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[:from_cell].class.name == 'Cell'
+			elements = options[:from_cell].elements
+		else
+			elements = self.elements
+		end
     if !options[:only].blank?
       elements = self.elements.named(options[:only])
     elsif !options[:except].blank?
@@ -82,13 +91,24 @@ class Page < ActiveRecord::Base
   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]
+      return options[:collection]
     else
-      all_elements = find_selected_elements(options, show_non_public)
+      find_selected_elements(options, show_non_public)
     end
-    all_elements
   end
 
+	# Returns all elements that should be feeded via rss.
+	# 
+	# Define feedable elements in your +page_layouts.yml+:
+	# 
+	#   - name: news
+	#     feed: true
+	#     feed_elements: [element_name, element_2_name]
+	# 
+	def feed_elements
+		elements.find_all_by_name(definition['feed_elements'])
+	end
+
   def elements_grouped_by_cells
     group = ActiveSupport::OrderedHash.new
     cells.each { |cell| group[cell] = cell.elements }

data/app/sweepers/pages_sweeper.rb

@@ -34,13 +34,4 @@ private
     end
   end
 
-  def expire_page(page)
-    if multi_language?
-      path = "#{page.language_code}/#{page.urlname_was}"
-    else
-      path = page.urlname_was
-    end
-    expire_action(path) unless page.do_not_sweep
-  end
-
 end

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

@@ -1,19 +1,33 @@
 (function($) {
+	
 	Alchemy.closeCurrentWindow();
+
 	<%- if request.referer.include?('edit') -%>
+	
 		Alchemy.reloadPreview();
 		$('#<%= 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 -%>
 			$('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
 		<%- end -%>
+		
 		$('#page_<%= @page.id -%>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>');
+		
 		<%- if @page.restricted? -%>
+		
 			$('#<%= dom_id(@page) -%> .page_status:nth-child(3)').addClass('restricted', 'not_restricted').removeClass('not_restricted');
+			
 		<%- else -%>
+		
 			$('#<%= dom_id(@page) -%> .page_status:nth-child(3)').addClass('not_restricted').removeClass('restricted');
 		<%- end -%>
+	
 	<%- end -%>
-	Alchemy.growl('<%= @notice -%>');
+	
+	Alchemy.growl("<%= @notice -%>");
+	
 })(jQuery);

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

@@ -22,7 +22,7 @@
 <%- end -%>
 <p style="margin-top: 8px" id="choose_alternative_uploader">
 	<small>
-		<%= raw _('If you have any problems using the Flash® uploader you can switch to the %{link}') % {:link => %(<a href="#" onclick="jQuery('#choose_alternative_uploader').hide();jQuery('#alternativeUpload').show();jQuery('#SWFUpload_0').hide();" style="text-decoration: underline">%{value}</a>) % {:value => _('regular method')}} %>
+		<%= raw _('If you have any problems using the Flash® uploader you can switch to the %{link}') % {:link => %(<a href="#" onclick="jQuery('#choose_alternative_uploader').hide();jQuery('#alternativeUpload').show();jQuery('object.swfupload').hide();" style="text-decoration: underline">%{value}</a>) % {:value => _('regular method')}} %>
 	</small>
 </p>
 <div id="swfUploadFlashError" style="display: none">
@@ -46,7 +46,7 @@
 	<p>
 		<small>
 			<a href="#" 
-			onclick="jQuery('#choose_alternative_uploader').show();jQuery('#alternativeUpload').hide();jQuery('#SWFUpload_0').show();" 
+			onclick="jQuery('#choose_alternative_uploader').show();jQuery('#alternativeUpload').hide();jQuery('object.swfupload').show();" 
 			style="text-decoration: underline">
 				<%= _('Switch to Flash® Uploader') %>
 			</a>

data/app/views/elements/_contactform_view.html.erb

@@ -1,13 +1,11 @@
-<%= form_for(@mail ||= Mail.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
+<%= form_for(@message ||= Message.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
     <%= f.error_messages %>
     <%= f.hidden_field "contact_form_id", :value => element.id %>
     <%= hidden_field_tag "mail_to", params[:mail_to] %>
     <table class="contactform">
     	<tr>
     		<td class="label">
-    			<label for="mail_salutation">
-    				<%= t('alchemy.contactform.labels.salutation') %>
-    			</label>
+					<%= f.label :salutation, t('alchemy.contactform.labels.salutation') %>
     		</td>
     		<td class="field">
     			<%= f.select(
@@ -23,9 +21,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_firstname">
-    				<%= t('alchemy.contactform.labels.firstname') %>
-    			</label>
+					<%= f.label :firstname, t('alchemy.contactform.labels.firstname') %>
     		</td>
     		<td class="field">
     			<%= f.text_field(:firstname, :class => "field") %>
@@ -33,9 +29,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_lastname">
-    				<%= t('alchemy.contactform.labels.lastname') %>
-    			</label><small>*</small>
+					<%= f.label :lastname, (t('alchemy.contactform.labels.lastname') + '<small>*</small>').html_safe %>
     		</td>
     		<td class="field">
     			<%= f.text_field(:lastname, :class => "field") %>
@@ -43,9 +37,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_address">
-    				<%= t('alchemy.contactform.labels.address') %>
-    			</label>
+					<%= f.label :address, t('alchemy.contactform.labels.address') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :address, :class => 'field' %>
@@ -53,9 +45,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_zip">
-    				<%= t('alchemy.contactform.labels.zip') %>
-    			</label>
+					<%= f.label :zip, t('alchemy.contactform.labels.zip') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :zip, :class => 'field short' %>
@@ -64,9 +54,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_phone">
-    				<%= t('alchemy.contactform.labels.phone') %>
-    			</label>
+					<%= f.label :phone, t('alchemy.contactform.labels.phone') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :phone, :class => 'field' %>
@@ -74,9 +62,7 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_email">
-    				<%= t('alchemy.contactform.labels.email') %>
-    			</label><small>*</small>
+					<%= f.label :email, (t('alchemy.contactform.labels.email') + '<small>*</small>').html_safe %>
     		</td>
     		<td class="field">
     			<%= f.text_field :email, :class => 'field' %>
@@ -84,8 +70,9 @@
     	</tr>
     </table>
     <div id="message">
-        <%= f.text_area :message %>
+			<%= f.text_area :message %>
     </div>
+		<p class="foot_notice">*) <%= t('alchemy.contactform.labels.mandatory_fields') %></p>
     <p class="right">
     	<%= f.button t('alchemy.contactform.labels.send'), :name => nil, :class => 'button' %>
     </p>

data/app/views/elements/_searchresult_view.html.erb

@@ -1,42 +1,49 @@
 <div class="searchresult" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
-    
-    <%= form_tag show_page_path(:urlname => "suche", :lang => @page.language_code), :method => :get do %>
-        <%= text_field_tag "query", params[:query], :class => 'field' %>
-        <%= submit_tag _("search"), :name => nil %>
-    <%- end -%>
-    
-    <%- if !@text_search_results.blank? || !@rtf_search_results.blank? -%>
-    
-    <h2>
-        <%= t('alchemy.search.result_heading', :query => h(params[:query]), :count => @rtf_search_results.length + @text_search_results.length) %>
-    </h2>
-    
-    <%- all_results = (@text_search_results + @rtf_search_results).sort{|y, x| x.ferret_score <=> y.ferret_score} -%>
-    
-    <div class="search_results">
-        <ol>
-            <%- all_results.each do |result| -%>
-            <%- element = Content.find_by_essence_id_and_essence_type(result.id, result.class.to_s).element -%>
-            <%- page = element.nil? ? nil : element.page -%>
-            <li>
-                <%= _('Excerpt') %>:
-                <%= raw result.highlight(params[:query], {
-                    :field => (result.class == EssenceRichtext ? :stripped_body : :body),
-                    :num_excerpts => 1,
-                    :pre_tag => "<strong>",
-                    :post_tag => "</strong>"
-                }) %><br/>
-                <%- unless page.nil? -%>
-                <span class="search_result_site"><%= _('Page') %>: </span><%= link_to page.urlname, show_page_path(:urlname => page.urlname, :lang => page.language) %>
-                <%- end -%>
-            </li>
-            <%- end -%>
-        </ol>
-    </div>
-    
-    <%- elsif !params[:query].blank? -%>
-    
-    <h2><%= t('alchemy.search.no_results') %></h2>
-    
-    <%- end -%>
+	
+	<%= form_tag show_page_path(:urlname => "suche", :lang => @page.language_code), :method => :get do %>
+		<%= text_field_tag "query", params[:query], :class => 'field' %>
+		<%= submit_tag _("search"), :name => nil %>
+	<%- end -%>
+	
+	<%- if !@search_results.blank? -%>
+	
+	<h2>
+		<%= t('alchemy.search.result_heading') % { :query => h(params[:query]), :count => @search_results.count } %>
+	</h2>
+	
+	<div class="search_results">
+		<ul>
+		<%- @search_results.each do |result| -%>
+			<%- element = Content.find_by_essence_id_and_essence_type(result.id, result.class.to_s).element -%>
+			<%- page = element.nil? ? nil : element.page -%>
+			<li>
+				<%- unless page.nil? -%>
+				<h3>
+					<span class="search_result_site"><%= _('Page') %>:</span>
+					<%- if multi_language? -%>
+					<%= link_to page.name, show_page_path(:urlname => page.urlname, :lang => page.language_code) %>
+					<span class="search_result_language">(<%= page.language_code.upcase %>)</span>
+					<%- else -%>
+					<%= link_to page.name, show_page_path(:urlname => page.urlname) %>
+					<%- end -%>
+				</h3>
+				<%- end -%>
+				<h4><%= _('Excerpt') %>:</h4>
+				<%- result.highlight(
+					"*#{params[:query]}*", {
+						:field => (result.class == EssenceRichtext ? :stripped_body : :body)
+					}
+				).each do |highlight| -%>
+				<p><%= sanitize highlight %></p>
+				<%- end -%>
+			</li>
+		<%- end -%>
+		</ul>
+	</div>
+	
+	<%- elsif !params[:query].blank? -%>
+	
+	<h2><%= t('alchemy.search.no_results') %></h2>
+	
+	<%- end -%>
 </div>

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

@@ -1 +1 @@
-<%= content.essence.source %>
+<%= raw content.essence.source %>

data/app/views/pages/show.rss.builder

@@ -1,27 +1,22 @@
-xml.instruct! :xml, :version => "1.0" 
+xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title @page.title
-    xml.description @page.meta_description
-    if multi_language?
-      xml.link show_page_url(:urlname => @page.urlname, :lang => session[:language_id])
-    else
-      xml.link show_page_url(:urlname => @page.urlname)
-    end
-    
-    for element in @page.elements.find_all_by_name('news')
-      xml.item do
-        xml.title render_essence_view_by_name(element, 'headline')
-        xml.description render_essence_view_by_name(element, 'text')
-        xml.pubDate render_essence_view_by_name(element, 'date', :date_format => :rfc822)
-        if multi_language?
-          xml.link show_page_url(:urlname => element.page.urlname, :anchor => element_dom_id(element), :lang => session[:language_id])
-          xml.guid show_page_url(:urlname => element.page.urlname, :anchor => element_dom_id(element), :lang => session[:language_id])
-        else
-          xml.link show_page_url(:urlname => element.page.urlname, :anchor => element_dom_id(element))
-          xml.guid show_page_url(:urlname => element.page.urlname, :anchor => element_dom_id(element))
-        end
-      end
-    end
-  end
+
+	xml.channel do
+
+		xml.title @page.title
+		xml.description @page.meta_description
+		xml.link show_page_url(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+
+		@page.feed_elements.each do |element|
+			xml.item do
+				xml.title element.content_for_rss_title.ingredient
+				xml.description element.content_for_rss_description.ingredient
+				xml.pubDate render_essence_view_by_name(element, 'date', :date_format => :rfc822)
+				xml.link show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
+				xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
+			end
+		end
+
+	end
+
 end