alchemy_cms 2.1.7 → 2.1.8

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - ree
 branches:
   only:
-    - master
+    - 2.1-stable
 before_script:
   #- "mysql -e 'create database alchemy_cms_test;'"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"

data/README.md

@@ -2,7 +2,7 @@ Alchemy CMS
 ===========
 
 [![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
-![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
+[![Development Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
 
 About
 -----
@@ -102,7 +102,7 @@ Resources
 
 * Homepage: <http://alchemy-cms.com>
 * Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo)
-* Wiki: <http://wiki.alchemy-cms.com>
+* Guidelines: <http://guides.alchemy-cms.com>
 * API Documentation: <http://api.alchemy-cms.com>
 * Issue-Tracker: <http://issues.alchemy-cms.com>
 * Sourcecode: <http://source.alchemy-cms.com>

data/alchemy_cms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 	s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 	s.require_paths = ["lib"]
 
-	s.add_runtime_dependency(%q<rails>, ["~> 3.1.3"])
+	s.add_runtime_dependency(%q<rails>, ["~> 3.1.4"])
 	s.add_runtime_dependency(%q<authlogic>)
 	s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
 	s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
@@ -31,9 +31,8 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
 	s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
 	s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
-	s.add_runtime_dependency('sass-rails', ['~> 3.1.4'])
-	
+	s.add_runtime_dependency(%q<sass-rails>, ['~> 3.1.4'])
+
 	s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
 	s.add_development_dependency(%q<sqlite3>)
-
 end

data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss

@@ -134,6 +134,10 @@
 	color: $text-color;;
 }
 
+#alchemy .ui-widget-content p {
+	overflow: hidden;
+}
+
 #alchemy .ui-widget-header {
 	border: 1px none #afafaf;
 	background: $light-blue;

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

@@ -12,20 +12,27 @@ module Alchemy
 			def create
 				@element = Element.find(params[:content][:element_id])
 				@content = Content.create_from_scratch(@element, params[:content])
-				@options = params[:options]
+				@options = params[:options] || {}
+				@html_options = params[:html_options] || {}
 				# If options params come from Flash uploader then we have to parse them as hash.
 				if @options.is_a?(String)
 					@options = Rack::Utils.parse_query(@options)
 				end
 				if @content.essence_type == "Alchemy::EssencePicture"
+					@element_dom_id = "#add_content_#{@element.id}"
 					@content.essence.picture_id = params[:picture_id]
 					@content.essence.save
 					@contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
 					@dragable = @contents_of_this_type.length > 1
-					@options = @options.merge(
-						:dragable => @dragable
-					) if @options
+					@options = @options.merge(:dragable => @dragable)
+				else
+					@element_dom_id = "#add_content_for_element_#{@element.id}"
 				end
+				@locals = {
+				  :content => @content,
+				  :options => @options.symbolize_keys,
+				  :html_options => @html_options.symbolize_keys
+				}
 			end
 
 			def update

data/app/controllers/alchemy/base_controller.rb

@@ -130,7 +130,14 @@ module Alchemy
 					if request.referer == alchemy.login_url
 						render :file => File.join(Rails.root.to_s, 'public', '422.html'), :status => 422, :layout => false
 					elsif request.xhr?
-						render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
+						respond_to do |format|
+							format.js {
+								render :js => "Alchemy.growl('#{t('You are not authorized')}', 'warning'); Alchemy.enableButton('button.button, a.button, input.button');"
+							}
+							format.html {
+								render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
+							}
+						end
 					else
 						flash[:error] = t('You are not authorized')
 						redirect_to alchemy.admin_dashboard_path

data/app/controllers/alchemy/messages_controller.rb

@@ -1,10 +1,10 @@
 # == Sending Messages:
 # To send Messages via contact forms you can create your form fields in the config.yml
+# 
 # === Example:
 # Make an Element with this options inside your @elements.yml file:
 #
-#   - name: contact
-#     display_name: Kontaktformular
+#   - name: contactform
 #     contents:
 #     - name: mail_to
 #       type: EssenceText
@@ -15,30 +15,27 @@
 #     - name: success_page
 #       type: EssenceText
 #
-# The fields mail_to, mail_from, subject and success_page are recommended.
-# The MessagesController uses them to send your mails. So your customer has full controll of these values inside his contactform @element.
+# The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
+# The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
 # 
-# Then make a page layout for your contact page in the page_layouts.yml file:
+# Then make a page layout for your contact page in the +page_layouts.yml+ file:
 # 
 #   - name: contact
-#     display_name: Kontakt
 #     unique: true
 #     cache: false
-#     @elements: [pageheading, heading, contact, bild, absatz, file_download]
-#     autogenerate: [contact]
+#     elements: [pageheading, heading, contactform]
+#     autogenerate: [contactform]
 #
 # Disabling the page caching is stronlgy recommended!
 #
-# The editor view for your @element should have this layout:
+# The editor view for your element should have this layout:
 # 
-#   <%= render_essence_editor_by_name(@element, 'mail_from') %>
-#   <%= render_essence_editor_by_name(@element, 'mail_to') %>
-#   <%= render_essence_editor_by_name(@element, 'subject') %>
-#   <p>
-#     Folgeseite: <%= page_selector(@element, 'success_page') %>
-#   </p>
+#   <%= render_essence_editor_by_name(element, 'mail_from') %>
+#   <%= render_essence_editor_by_name(element, 'mail_to') %>
+#   <%= render_essence_editor_by_name(element, 'subject') %>
+#   <%= page_selector(element, 'success_page', :page_attribute => :urlname) %>
 # 
-# Please have a look at the alchemy/config/config.yml file for further Message settings.
+# Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
 
 module Alchemy
 	class MessagesController < Alchemy::BaseController

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

@@ -83,18 +83,21 @@ module Alchemy
 			# 
 			#   :only            [Hash]     # Pagelayout names. Only pages with this page_layout will be displayed inside the select.
 			#   :page_attribute  [Symbol]   # The Page attribute which will be stored.
+			#   :global          [Boolean]  # Display only global pages. Default is false.
 			# 
 			def page_selector(element, content_name, options = {}, select_options = {})
 				default_options = {
 					:page_attribute => :id,
+					:global => false,
 					:prompt => t('Choose page')
 				}
 				options = default_options.merge(options)
 				pages = Page.where({
 					:language_id => session[:language_id],
-					:page_layout => options[:only],
-					:public => true
+					:layoutpage => options[:global] == true,
+					:public => options[:global] == false
 				})
+				pages = pages.where({:page_layout => options[:only]}) if options[:only].present?
 				content = element.content_by_name(content_name)
 				options.update(
 					:select_values => pages_for_select(pages, content ? content.essence.body : nil, options[:prompt], options[:page_attribute])

data/app/models/alchemy/message.rb

@@ -1,24 +1,6 @@
 # This is a tableless model only used for validating Contactform Fields.
-# You can specify the fields for your contactform in the config/alchemy/config.yml file in the :mailer options
+# You can specify the fields for your contactform in the +config/alchemy/config.yml+ file in the +:mailer+ options
 # 
-# === Options:
-# 
-# - form_layout_name: A Alchemy::PageLayout name (String). Used to render the contactform on a page with this layout.
-# 
-# === Validating fields:
-# 
-# Pass the field name as symbol and a message_id (will be translated) to :validate_fields:
-# 
-# === Translating the validation messages:
-# 
-# Validationmessages will be send to +Alchemy::I18n.t+ method with the scope +"alchemy.contactform.validations.#{field[1][:message].to_s}"+.
-# So a +name+ field with the validation message_id +blank_name+ will be available for translation in your locale files like:
-# 
-#   de:
-#     contactform:
-#       validations:
-#         blank_name: 'Bitte geben Sie Ihren Namen an'
-#   
 # === Example Contactform Configuration:
 # 
 #   :mailer:

data/app/models/alchemy/user_session.rb

@@ -2,6 +2,8 @@ module Alchemy
 	class UserSession < Authlogic::Session::Base
 		logout_on_timeout(::Rails.env != 'development')
 
+		generalize_credentials_error_messages true
+
 		before_destroy :unlock_pages
 
 		def unlock_pages

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

@@ -1,138 +1,47 @@
 (function($) {
+	<% if params[:was_missing] -%>
 
-<%- if @content.essence_type == "Alchemy::EssencePicture" -%>
-  
-  <%- locals = {
-    :content => @content,
-    :options => @options.nil? ? {} : @options.symbolize_keys
-  } -%>
-  
-  <% if params[:was_missing] -%>
-  
-  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_picture_editor",
-      :locals => locals
-    )
-  ) -%>');
+	$("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
+		render(
+			:partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+			:locals => @locals
+		)
+	) -%>');
 
-  <% else -%>
+	<% else -%>
 
-  $('#add_content_<%= @element.id -%>').before('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_picture_editor",
-      :locals => locals
-    )
-  ) -%>');
-  Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
-  
-  <%- if @contents_of_this_type.length > 1 -%>
-  $('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
-  <%- end -%>
-  
-  <%- if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
-  $("#add_content_<%= @element.id -%>").remove();
-  <%- end -%>
-  
-  Alchemy.reloadPreview();
-  Alchemy.closeCurrentWindow();
-  
-  <% end -%>
+	$("<%= @element_dom_id -%>").before('<%= escape_javascript(
+		render(
+			:partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+			:locals => @locals
+		)
+	) -%>');
 
-<%- elsif @content.essence_type ==  "Alchemy::EssenceText" -%>
+	<% end -%>
 
-  <%- locals = {
-    :content => @content,
-    :options => {:as => 'text_field'}.merge(@options.nil? ? {} : @options.symbolize_keys)
-  } -%>
+	<% case @content.essence_type -%>
+	<% when "Alchemy::EssencePicture" -%>
 
-  <%- if params[:was_missing] -%>
+	<% if @contents_of_this_type.length > 1 -%>
+	$('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
+	<% end -%>
+	<% if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
+	$("#add_content_<%= @element.id -%>").remove();
+	<% end -%>
+	Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
 
-  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_text_editor",
-      :locals => locals
-    )
-  ) -%>');
+	<% when "Alchemy::EssenceDate" -%>
 
-  <%- else -%>
+	Alchemy.Datepicker('#element_<%= @element.id -%> input.date');
 
-  $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_text_editor",
-      :locals => locals
-    )
-  ) -%>');
-  Alchemy.reloadPreview();
-  Alchemy.closeCurrentWindow();
-	
-  <%- end -%>
+	<% when "Alchemy::EssenceRichtext" -%>
 
-	Alchemy.SelectBox("#element_<%= @element.id %> select");
+	Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
 
-<%- elsif @content.essence_type ==  "Alchemy::EssenceRichtext" -%>
+	<% end -%>
 
-  <%- locals = {
-    :content => @content,
-    :options => (@options.nil? ? {} : @options.symbolize_keys)
-  } -%>
-
-  <%- if params[:was_missing] -%>
-
-  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_richtext_editor",
-      :locals => locals
-    )
-  ) -%>');
-
-  <%- else -%>
-
-  $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_richtext_editor",
-      :locals => locals
-    )
-  ) -%>');
-  Alchemy.closeCurrentWindow();
-
-  <%- end -%>
-
-  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
-
-<%- else -%>
-
-  <%- locals = {
-    :content => @content,
-    :options => @options.nil? ? {} : @options.symbolize_keys
-  } -%>
-
-  <%- if params[:was_missing] -%>
-
-  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => locals
-    )
-  ) -%>');
-
-  <%- else -%>
-
-  $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => locals
-    )
-  ) -%>');
-  Alchemy.closeCurrentWindow();
-  
-  <%- end -%>
-  
-  <% if @content.essence_type ==  "Alchemy::EssenceDate" -%>
-  Alchemy.Datepicker('#element_<%= @element.id -%> input.date');
-  <% end -%>
-
-<%- end -%>
-
-  Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
-})(jQuery);
+	Alchemy.reloadPreview();
+	Alchemy.closeCurrentWindow();
+	Alchemy.SelectBox("#element_<%= @element.id %> select.alchemy_selectbox");
+	Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
+})(jQuery);

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

@@ -4,7 +4,7 @@
 	<table>
 		<tr>
 			<td>
-				<%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] }, :class => 'alchemy_selectbox' %>
+				<%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] }, {}, {:class => 'alchemy_selectbox'} %>
 				<%= hidden_field_tag('options', @options) %>
 			</td>
 			<td class="submit">

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

@@ -8,7 +8,7 @@
 				<%= f.label :page_layout %>
 			</td>
 			<td class="select">
-				<%= f.select('page_layout', @page_layouts, :class => 'alchemy_selectbox') %>
+				<%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox' }) %>
 			</td>
 		</tr>
 		<tr>

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

@@ -1,3 +1,5 @@
+<% content_for(:title) { @page.name } -%>
+
 <%- content_for(:subnav_additions) do -%>
 	<label><%= t('Active Pages') %> &raquo;</label>
 	<%- @locked_pages.each do |page| -%>

data/app/views/alchemy/admin/users/_table.html.erb

@@ -21,7 +21,7 @@
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'language' %></td>
-		<td class="select"><%= f.select 'language', translations_for_select, :class => 'alchemy_selectbox' %></td>
+		<td class="select"><%= f.select 'language', translations_for_select, {}, {:class => 'alchemy_selectbox'} %></td>
 	</tr>
 	<tr>
 		<td class="label mandatory"><%= f.label 'password' %></td>
@@ -34,7 +34,7 @@
 	<%- unless action_name == 'signup' -%>
 	<tr>
 		<td class="label"><%= f.label 'role' %></td>
-		<td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), :class => 'alchemy_selectbox' %></td>
+		<td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, {:class => 'alchemy_selectbox'} %></td>
 	</tr>
 	<%- else -%>
 	<%= f.hidden_field :role %>

data/app/views/alchemy/base/error_notice.js.erb

@@ -1,2 +1,2 @@
 Alchemy.growl('<%= escape_javascript(@notice) %>', 'error');
-Alchemy.enableButton('<%= "button.button, a.button, input.button" %>');
+Alchemy.enableButton('button.button, a.button, input.button');

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

@@ -1,7 +1,6 @@
 <%= form_for(@message ||= Alchemy::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">
@@ -29,10 +28,10 @@
 		</tr>
 		<tr>
 			<td class="label">
-				<%= f.label :lastname, (t('contactform.labels.lastname') + '<small>*</small>').html_safe %>
+				<%= f.label :lastname, t('contactform.labels.lastname') + '*' %>
 			</td>
 			<td class="field">
-				<%= f.text_field(:lastname, :class => "field") %>
+				<%= f.text_field(:lastname, :class => "field", :required => true) %>
 			</td>
 		</tr>
 		<tr>
@@ -62,10 +61,10 @@
 		</tr>
 		<tr>
 			<td class="label">
-				<%= f.label :email, (t('contactform.labels.email') + '<small>*</small>').html_safe %>
+				<%= f.label :email, t('contactform.labels.email') + '*' %>
 			</td>
 			<td class="field">
-				<%= f.text_field :email, :class => 'field' %>
+				<%= f.email_field :email, :class => 'field', :required => true %>
 			</td>
 		</tr>
 	</table>

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

@@ -1,6 +1,6 @@
 <%- unless content.essence.picture.nil? -%>
 	<%- img_tag = image_tag(
-		alchemy.show_picture_path(
+		alchemy.show_picture_url(
 			:id => content.essence.picture.id,
 			:name => content.essence.picture.urlname,
 			:size => options[:image_size],

data/app/views/alchemy/messages/contact_form_mail.text.erb

@@ -1,10 +1,12 @@
 <%= @message.message %>
 
 --
+<%= Alchemy::I18n.t(:salutation, :scope => 'contactform.labels') %>: <%= Alchemy::I18n.t(@message.salutation, :scope => 'contactform.labels') %>
+<%= Alchemy::I18n.t(:firstname, :scope => 'contactform.labels') %>: <%= @message.firstname %>
+<%= Alchemy::I18n.t(:lastname, :scope => 'contactform.labels') %>: <%= @message.lastname %>
 
-<%= @message.salutation %>
-<%= @message.firstname %> <%= @message.lastname %>
-<%= @message.address %>
-<%= @message.zip %> <%= @message.city %>
-<%= @message.phone %>
-<%= @message.email %>
+<%= Alchemy::I18n.t(:address, :scope => 'contactform.labels') %>: <%= @message.address %>
+<%= Alchemy::I18n.t(:zip, :scope => 'contactform.labels') %>: <%= @message.zip %> <%= @message.city %>
+
+<%= Alchemy::I18n.t(:phone, :scope => 'contactform.labels') %>: <%= @message.phone %>
+<%= Alchemy::I18n.t(:email, :scope => 'contactform.labels') %>: <%= @message.email %>

data/config/alchemy/config.yml

@@ -74,10 +74,15 @@ default_language:
 # 
 # To send Mails via contact forms you can create your form fields here and set which fields are to be validated.
 # 
+# === Validating fields:
+# 
+# Pass the field name as symbol and a message_id (will be translated) to :validate_fields:
+# 
 # ==== Options:
 # 
-# fields: An Array from Hashes with fieldname as keys and type as values. Types are ActiveRecord column types (i.e. string, text, boolean, etc.).
-# validate_fields: A Hash with fieldname as key and a Hash (with :message as key and a message_id as value) as value
+#   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
+#   fields:                     [Array]  # An Array of fieldnames
+#   validate_fields:            [Hash]   # A Hash with fieldname as key and a Hash (with :message as key and a message_id as value) as value
 # 
 # ==== Translating validation messages:
 # 
@@ -102,7 +107,7 @@ default_language:
     :lastname:
       :message: enter_name
     :email:
-      :message: enter_mail
+      :message: enter_email
 
 # === User roles
 # You can add own user roles. To set permissions for this roles please add an authorization_rules.rb file in your config folder.

data/config/alchemy/elements.yml

@@ -223,6 +223,7 @@
       - presence
   - name: subject
     type: EssenceText
+    take_me_for_preview: true
     validate:
       - presence
   - name: success_page

data/config/locales/alchemy.de.yml

@@ -101,24 +101,24 @@ de:
     contactform:
       labels:
         salutation: 'Anrede'
-        choose: Wählen Sie
+        choose: 'Wählen Sie'
         mr: 'Herr'
         mrs: 'Frau'
         firstname: 'Vorname'
-        lastname: 'Nachname'
-        address: 'Straße/Nr'
-        zip: 'PLZ/Ort'
+        lastname: 'Name'
+        address: 'Straße / Nr.'
+        zip: 'PLZ / Ort'
         phone: 'Telefon'
-        email: 'Email'
+        email: 'E-Mail'
         message: 'Nachricht'
-        send: 'Nachricht absenden!'
-        mandatory_fields: 'Pflichtfelder. Bitte füllen Sie diese Felder aus. Vielen Dank!'
+        send: 'absenden'
+        mandatory_fields: '*Pflichtfelder. Bitte füllen Sie diese Felder aus.'
       # Translations for the contactform validations.
       # Validations are set in the config/alchemy/config.yml mailer section.
       validations:
         enter_name: 'Bitte geben Sie Ihren Namen an'
-        enter_mail: 'Bitte geben Sie Ihre Email an'
-        wrong_email_format: 'Die Email Adresse scheint nicht richtig zu sein.'
+        enter_email: Bitte geben Sie Ihre E-Mail-Adresse an
+        wrong_email_format: 'Die E-Mail-Adresse scheint nicht richtig zu sein.'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Ihre Nachricht wurde erfolgreich übermittelt.'
@@ -807,6 +807,7 @@ de:
     error_messages:
       login_blank: "^Es wurde kein Benutzername angeben."
       login_not_found: "^Dieser Benutzername existiert nicht."
+      general_credentials_error: "Die Kombination aus Benutzername und Passwort ist nicht gültig."
       consecutive_failed_logins_limit_exceeded: "Zu viele Fehlversuche! Dieser Account ist aus Sicherheitsgründen gesperrt worden. Bitte wenden Sie sich an den Administrator."
       email_invalid: "Die Email-Adresse entspricht nicht dem Format einer Email-Adresse."
       password_blank: "^Bitte ein Passwort angegeben."
@@ -827,3 +828,4 @@ de:
         email: Email
         password: Passwort
         remember_me: "eingeloggt bleiben"
+

data/config/locales/alchemy.en.yml

@@ -94,14 +94,14 @@ en:
         phone: 'Telephone'
         email: 'Email'
         message: 'Message'
-        send: 'Send Message'
-        mandatory_fields: 'Mandatory fields.'
+        send: 'Send'
+        mandatory_fields: '*Mandatory fields.'
       # Translations for the contactform validations.
       # Validations are set in the config/alchemy/config.yml mailer section.
       validations:
         enter_name: 'Please enter your name'
-        enter_mail: 'Please enter your email'
-        wrong_email_format: 'Email has wrong format.'
+        enter_email: 'Please enter your email'
+        wrong_email_format: 'Email has wrong format'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Your message was delivered succesfully.'
@@ -599,6 +599,7 @@ en:
     error_messages:
       login_blank: 'can not be blank'
       login_not_found: 'could not be found'
+      general_credentials_error: "User does not exist or invalid password!"
       consecutive_failed_logins_limit_exceeded: 'Consecutive failed logins limit exceeded, account is disabled.'
       email_invalid: 'should look like an email address.'
       password_blank: 'can not be blank'
@@ -618,3 +619,4 @@ en:
         email: Email
         password: Password
         remember_me: 'remember me'
+

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.7"
+	VERSION = "2.1.8"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70105640005620 !ruby/object:Gem::Requirement
+  requirement: &70221202607480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70105640005620
+  version_requirements: *70221202607480
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70105640003460 !ruby/object:Gem::Requirement
+  requirement: &70221202628920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105640003460
+  version_requirements: *70221202628920
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70105640017680 !ruby/object:Gem::Requirement
+  requirement: &70221202627520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105640017680
+  version_requirements: *70221202627520
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70105640015660 !ruby/object:Gem::Requirement
+  requirement: &70221202626220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70105640015660
+  version_requirements: *70221202626220
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70105640014080 !ruby/object:Gem::Requirement
+  requirement: &70221202648140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70105640014080
+  version_requirements: *70221202648140
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70105640011700 !ruby/object:Gem::Requirement
+  requirement: &70221202645940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105640011700
+  version_requirements: *70221202645940
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70105640025480 !ruby/object:Gem::Requirement
+  requirement: &70221202643060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70105640025480
+  version_requirements: *70221202643060
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70105640040680 !ruby/object:Gem::Requirement
+  requirement: &70221202656920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70105640040680
+  version_requirements: *70221202656920
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70105640038140 !ruby/object:Gem::Requirement
+  requirement: &70221202654560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70105640038140
+  version_requirements: *70221202654560
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70105640115700 !ruby/object:Gem::Requirement
+  requirement: &70221202652900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70105640115700
+  version_requirements: *70221202652900
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70105640113820 !ruby/object:Gem::Requirement
+  requirement: &70221202651320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70105640113820
+  version_requirements: *70221202651320
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70105640112380 !ruby/object:Gem::Requirement
+  requirement: &70221202665420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70105640112380
+  version_requirements: *70221202665420
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70105640109380 !ruby/object:Gem::Requirement
+  requirement: &70221202664100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70105640109380
+  version_requirements: *70221202664100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70105640108100 !ruby/object:Gem::Requirement
+  requirement: &70221202662900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +166,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70105640108100
+  version_requirements: *70221202662900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70105640139100 !ruby/object:Gem::Requirement
+  requirement: &70221202659560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,7 +177,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105640139100
+  version_requirements: *70221202659560
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -499,7 +499,6 @@ files:
 - app/views/alchemy/essences/_essence_text_view.html.erb
 - app/views/alchemy/essences/_essence_video_editor.html.erb
 - app/views/alchemy/essences/_essence_video_view.html.erb
-- app/views/alchemy/messages/contact_form_mail.html.erb
 - app/views/alchemy/messages/contact_form_mail.text.erb
 - app/views/alchemy/messages/new.html.erb
 - app/views/alchemy/navigation/_image_link.html.erb
@@ -529,8 +528,6 @@ files:
 - app/views/alchemy/user_sessions/login.html.erb
 - app/views/alchemy/user_sessions/logout.html.erb
 - app/views/alchemy/user_sessions/signup.html.erb
-- app/views/elements/_download_editor.html.erb
-- app/views/elements/_download_view.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_next_page.html.erb
 - app/views/kaminari/_page.html.erb
@@ -819,7 +816,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3662840626315164799
+      hash: 33058783529269066
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -828,7 +825,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3662840626315164799
+      hash: 33058783529269066
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 

data/app/views/alchemy/messages/contact_form_mail.html.erb

@@ -1,14 +0,0 @@
-<pre>
-<%= @message.message %>
-</pre>
-
-<p>
-	<%= @message.salutation %><br>
-	<%= @message.firstname %>&nbsp;<%= @message.lastname %><br>
-	<br>
-	<%= @message.address %><br>
-	<%= @message.zip %>&nbsp;<%= @message.city %><br>
-	<br>
-	<%= @message.phone %><br>
-	<%= @message.email %>
-</p>

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

@@ -1 +0,0 @@
-<%= render_essence_editor_by_name(element, 'file') %>

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

@@ -1,3 +0,0 @@
-<div class="download" <%= element_preview_code(element) -%>>
-	<%= render_essence_view_by_name(element, 'file') %>
-</div>