alchemy_cms 2.1.2 → 2.1.3

data/app/assets/javascripts/alchemy/alchemy.base.js

@@ -229,7 +229,9 @@ if (typeof(Alchemy) === 'undefined') {
 			var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
 			if (results)
 				return results[1] || 0;
-		}
+		},
+
+		locale : 'en'
 
 	});
 	

data/app/assets/javascripts/alchemy/alchemy.datepicker.js

@@ -0,0 +1,40 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	$.extend(Alchemy, {
+
+		Datepicker: function (selector) {
+			var datepicker_options = {
+				dateFormat: 'yy-mm-dd',
+				changeMonth: true,
+				changeYear: true,
+				showWeek: true,
+				showButtonPanel: true,
+				showOtherMonths: true
+			};
+			if (typeof(selector) === 'undefined') {
+				var selector = 'input[type="date"], input.date'
+			}
+			if (Alchemy.locale === 'de') {
+				$.extend(datepicker_options, {
+					dateFormat: 'dd.mm.yy',
+					dayNames: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+					dayNamesMin: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+					monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+					monthNamesShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+					closeText: 'Ok',
+					currentText: 'Heute',
+					weekHeader: 'KW',
+					nextText: 'nächster',
+					prevText: 'vorheriger'
+				});
+			}
+			$(selector).datepicker(datepicker_options);
+		}
+
+	});
+
+})(jQuery);

data/app/assets/javascripts/alchemy/alchemy.elements_window.js

@@ -37,6 +37,7 @@ if (typeof(Alchemy) === 'undefined') {
 						success: function(data, textStatus, XMLHttpRequest) {
 							$dialog.html(data);
 							Alchemy.ButtonObserver('#alchemyElementWindow .button');
+							Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
 							callback.call();
 						},
 						error: function(XMLHttpRequest, textStatus, errorThrown) {

data/app/assets/javascripts/alchemy/alchemy.js

@@ -9,6 +9,7 @@
 //= require alchemy/alchemy.routes
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.buttons
+//= require alchemy/alchemy.datepicker
 //= require alchemy/alchemy.dirty
 //= require alchemy/alchemy.dragndrop
 //= require alchemy/alchemy.element_editor_selector

data/app/assets/javascripts/alchemy/alchemy.windows.js

@@ -163,10 +163,14 @@ if (typeof(Alchemy) === 'undefined') {
 								});
 							}
 							Alchemy.SelectBox('#alchemyOverlay select');
+							Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
 							Alchemy.ButtonObserver('#alchemyOverlay .button');
 						},
 						error: function(XMLHttpRequest, textStatus, errorThrown) {
 							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
+						},
+						complete: function(jqXHR, textStatus) {
+							Alchemy.enableButton('.button');
 						}
 					});
 				},

data/app/assets/stylesheets/alchemy/buttons.css.scss

@@ -60,10 +60,8 @@ input.button {
 }
 
 button.button {
-	line-height: 19px;
-	padding: 2px 8px 2px 8px;
-	height: 25px;
-	font-size: 11px;
+	line-height: 21px;
+	padding: 0px 8px;
 }
 
 .button img {

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

@@ -184,7 +184,7 @@
 	color: $text-color;;
 	text-decoration: none;
 	text-shadow: none;
-	background-color: #e5e5e5;
+	background-color: $button-hover-bg-color;
 }
 
 #alchemy .ui-state-active.stNav.stNext {
@@ -223,18 +223,18 @@
 ----------------------------------*/
 
 #alchemy .ui-state-highlight, #alchemy .ui-widget-content .ui-state-highlight, #alchemy .ui-widget-header .ui-state-highlight {
-	border: 1px solid #f9dd34;
-	background: #ffef8f image-url('alchemy/ui-bg_highlight-soft_25_ffef8f_1x100.png') 50% top repeat-x;
-	color: #363636;
+	border: 1px solid $dark-gray;
+	background: $light-blue;
+	color: $text-color;
 }
 
 #alchemy .ui-state-highlight a, #alchemy .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a {
-	color: #363636;
+	color: $text-color;
 }
 
 #alchemy .ui-state-error, #alchemy .ui-widget-content .ui-state-error, #alchemy .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a;
-	background: #cd0a0a image-url('alchemy/ui-bg_flat_15_cd0a0a_40x100.png') 50% 50% repeat-x;
+	background: #cd0a0a;
 	color: #ffffff;
 }
 
@@ -247,13 +247,13 @@
 }
 
 #alchemy .ui-priority-primary, #alchemy .ui-widget-content .ui-priority-primary, #alchemy .ui-widget-header .ui-priority-primary {
-	font-weight: bold;
+	font-weight: normal;
+	background-position: 50% -73px;
 }
 
 #alchemy .ui-priority-secondary, #alchemy .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter: Alpha(Opacity=70);
 	font-weight: normal;
+	background-position: 50% -73px;
 }
 
 #alchemy .ui-state-disabled, #alchemy .ui-widget-content .ui-state-disabled, #alchemy .ui-widget-header .ui-state-disabled {
@@ -294,11 +294,11 @@
 }
 
 #alchemy .ui-state-highlight .ui-icon {
-	background-image: image-url('alchemy/ui-icons_2e83ff_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 #alchemy .ui-state-error .ui-icon, #alchemy .ui-state-error-text .ui-icon {
-	background-image: image-url('alchemy/ui-icons_ffffff_256x240.png');
+	background-image: image-url('alchemy/ui-icons_666666_256x240.png');
 }
 
 /* positioning */
@@ -1758,40 +1758,43 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-datepicker {
 	width: 17em;
-	padding: .2em .2em 0;
+	padding: $default-padding;
 	display: none;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-header {
 	position: relative;
-	padding: .2em 0;
+	padding: $default-padding;
+	margin: -$default-padding;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-prev, #alchemy .ui-datepicker .ui-datepicker-next {
 	position: absolute;
-	top: 2px;
+	top: $default-padding;
 	width: 1.8em;
 	height: 1.8em;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-prev-hover, #alchemy .ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
+	top: $default-padding;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-prev {
-	left: 2px;
+	left: $default-padding;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-next {
-	right: 2px;
+	right: $default-padding;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
+	top: $default-padding - 1;
+	left: $default-padding - 1;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
+	top: $default-padding - 1;
+	right: $default-padding - 1;
 }
 
 #alchemy .ui-datepicker .ui-datepicker-prev span, #alchemy .ui-datepicker .ui-datepicker-next span {
@@ -1825,7 +1828,7 @@ button.ui-button::-moz-focus-inner {
 
 #alchemy .ui-datepicker table {
 	width: 100%;
-	font-size: .9em;
+	font-size: 1em;
 	border-collapse: collapse;
 	margin: 0 0 .4em;
 }
@@ -1842,6 +1845,14 @@ button.ui-button::-moz-focus-inner {
 	padding: 1px;
 }
 
+#alchemy .ui-datepicker td.ui-datepicker-week-col {
+	padding-left: $default-padding;
+}
+
+#alchemy .ui-datepicker td.ui-datepicker-current-day {
+	background-color: $dark-gray;
+}
+
 #alchemy .ui-datepicker td span, #alchemy .ui-datepicker td a {
 	display: block;
 	padding: .2em;

data/app/assets/stylesheets/alchemy/sitemap.css.scss

@@ -283,3 +283,12 @@ a.folder_link {
 	margin-top: 3px;
 	margin-left: 2px;
 }
+
+#create_language_tree_form {
+	width: 360px;
+
+	&.ui-dialog-content div.info {
+		margin: 2*$default-padding;
+		margin-bottom: 0;
+	}
+}

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

@@ -54,11 +54,10 @@ module Alchemy
 				@content = Content.find(params[:id])
 				@picture = Picture.find(params[:picture_id])
 				@content.essence.picture = @picture
-				@options = params[:options]
-				# If options params come from Flash uploader then we have to parse them as hash.
+				@options = params[:options] || {}
 				@element = @content.element
-				contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
-				@dragable = contents_of_this_type.length > 1
+				@dragable = @options[:grouped]
+				# 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

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

@@ -16,7 +16,12 @@ module Alchemy
 				@locked_pages = Page.all_locked_by(current_user)
 				@languages = Language.all
 				if !@page_root
-					@language = @languages.find { |language| language.id == session[:language_id] }
+					if @languages.length == 1
+						@language = @languages.first
+						store_language_in_session(@language)
+					else
+						@language = @languages.find { |language| language.id == session[:language_id] }
+					end
 					@languages_with_page_tree = Language.all_for_created_language_trees if @language
 				end
 			end

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

@@ -23,8 +23,9 @@ module Alchemy
 
 			def index
 				if !params[:query].blank?
+				    search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
 					items = resource_model.where(searchable_resource_attributes.map { |attribute|
-						"`#{namespaced_resources_name}`.`#{attribute[:name]}` LIKE '%#{params[:query]}%'"
+					  "`#{namespaced_resources_name}`.`#{attribute[:name]}` LIKE #{search_terms}"
 					}.join(" OR "))
 				else
 					items = resource_model

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

@@ -430,6 +430,24 @@ module Alchemy
 				end
 			end
 
+			# Renders a textfield ready to display a datepicker
+			# 
+			# Uses a HTML5 +input type="date"+ field.
+			# 
+			# Pass a type as third option to override that. But old browsers hand this as text field anyway. So there is no need to override that.
+			# 
+			# === Example
+			# 
+			#   <%= alchemy_datepicker(@person, :birthday) %>
+			# 
+			def alchemy_datepicker(object, method, html_options={})
+				text_field(object.class.name.underscore.to_sym, method.to_sym, {
+					:type => 'date',
+					:class => 'thin_border date',
+					:value => object.send(method.to_sym).nil? ? nil : l(object.send(method.to_sym), :format => :datepicker)
+				}.merge(html_options))
+			end
+
 		end
 	end
 end

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

@@ -35,16 +35,16 @@ module Alchemy
 			# Renders a link to show the new content overlay
 			def render_new_content_link(element)
 				link_to_overlay_window(
-					t('add new content'),
+					render_icon('create') + t('add new content'),
 					alchemy.new_admin_element_content_path(element),
 					{
-						:size => '305x40',
+						:size => '335x70',
 						:title => t('Select an content'),
 						:overflow => true
 					},
 					{
 						:id => "add_content_for_element_#{element.id}",
-						:class => 'button new_content_link'
+						:class => 'small button with_icon new_content_link'
 					}
 				)
 			end

data/app/models/alchemy/page.rb

@@ -377,7 +377,7 @@ module Alchemy
 				:locked => false,
 				:locked_by => nil
 			)
-			page = self.new(attributes.except(["id", "updated_at", "created_at", "created_id", "updater_id"]))
+			page = self.new(attributes.except(:id, :updated_at, :created_at, :created_id, :updater_id, :lft, :rgt, :depth))
 			if page.save
 				# copy the page´s cells
 				source.cells.each do |cell|

data/app/models/alchemy/picture.rb

@@ -48,7 +48,7 @@ module Alchemy
 		end
 
 		def humanized_name
-			(image_filename.downcase.gsub(/\.#{Regexp.quote(suffix)}$/, '')).humanize
+			(image_filename.to_s.downcase.gsub(/\.#{Regexp.quote(suffix)}$/, '')).humanize
 		end
 
 		# Returning true if picture's width is greater than it's height

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

@@ -4,11 +4,11 @@
 	<table>
 		<tr>
 			<td>
-				<%= f.select 'name', @contents.map { |a| [t("alchemy.content_names.#{a['name']}"), a['name']] }, :style => 'width: 200px' %>
+				<%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] } %>
 				<%= hidden_field_tag('options', @options) %>
 			</td>
-			<td>
-				&nbsp;<%= f.button t('save'), :class => 'button' %>
+			<td class="submit">
+				<%= f.button t('save'), :class => 'button' %>
 			</td>
 		</tr>
 	</table>

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

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

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

@@ -1,41 +1,52 @@
-<div class="info">
-	<%= render_icon('info') %>
-	<%= t("language_does_not_exist") %>
-</div>
+<div id="create_language_tree_form" style="display: none">
+	<div class="info">
+		<%= render_icon('info') %>
+		<%= t("language_does_not_exist") %>
+	</div>
 <%- if @language -%>
-<%- if @languages_with_page_tree.size >= 1 -%>
-	<p><%= t("want_to_make_copy_of_existing_language") %></p>
-	<%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
-		<table style="width: 135px;">
-			<tr>
-				<td>
-					<%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "medium_long") %>
-					<%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
-				</td>
-				<td>
-					<%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
-					<%= submit_tag t("copy"), :class => 'button' %>
-				</td>
-			</tr>
-		</table>
+
+	<%- if @languages_with_page_tree.size >= 1 -%>
+		<%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
+			<h2><%= t('copy_language_tree_heading') %></h2>
+			<p><%= t("want_to_make_copy_of_existing_language") %></p>
+			<table>
+				<tr>
+					<td class="label"><%= label_tag('languages[old_lang_id]', t('Language tree')) %></td>
+					<td class="select">
+						<%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "medium_long") %>
+						<%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
+					</td>
+				</tr>
+				<tr>
+					<td class="submit" colspan="2">
+						<%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
+						<%= submit_tag t("copy"), :class => 'button' %>
+					</td>
+				</tr>
+			</table>
+		<% end %>
+	<%- end -%>
+
+	<%- if params[:action] == "index" -%>
+	
+	<%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
+		<h2><%= t('create_language_tree_heading') %></h2>
+		<p><%= t("want_to_create_new_language") %></p>
+		<%= form.hidden_field :name, :value => @language.frontpage_name %>
+		<%= form.hidden_field :language_id, :value => @language.id %>
+		<%= form.hidden_field :language_code, :value => @language.code %>
+		<%= form.hidden_field :page_layout, :value => @language.page_layout %>
+		<%= form.hidden_field :language_root, :value => true %>
+		<%= form.hidden_field :parent_id, :value => Alchemy::Page.rootpage.id %>
+		<%= form.button t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
 	<% end %>
-<%- end -%>
-<%- if params[:action] == "index" -%>
-<%- if @languages_with_page_tree.size >= 1 -%>
-<p>
-	<%= t("want_to_create_new_language") %>
-</p>
-<%- end -%>
-<%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
-	<%= form.hidden_field :name, :value => @language.frontpage_name %>
-	<%= form.hidden_field :language_id, :value => @language.id %>
-	<%= form.hidden_field :language_code, :value => @language.code %>
-	<%= form.hidden_field :page_layout, :value => @language.page_layout %>
-	<%= form.hidden_field :language_root, :value => true %>
-	<%= form.hidden_field :parent_id, :value => Alchemy::Page.rootpage.id %>
-	<%= form.submit t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
-<% end %>
-<%- end -%>
+
+	<%- end -%>
+
 <%- else -%>
-<p><%= t("Actually this language does not exist. Please create this language first.") %></p>
+
+	<p><%= t("Actually this language does not exist. Please create this language first.") %></p>
+
 <%- end -%>
+
+</div>

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

@@ -87,5 +87,14 @@
 <%- else -%>
 
 <%= render :partial => 'create_language_form' %>
-
+<% content_for(:javascripts) do %>
+<script type="text/javascript">
+	jQuery(document).ready(function($) {
+		$('#create_language_tree_form').dialog({modal: true, width: 360, close: function() {
+			$(this).appendTo('#archive_all').show().removeClass().removeAttr('style');
+		}});
+	});
+</script>
 <%- end -%>
+
+<% end -%>

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

@@ -1 +1 @@
-<%= render_picture_editor(element, :maximum_amount_of_images => 1, :image_size => '900x300', :crop => true) %>
+<%= render_essence_editor_by_name(element, 'image', :image_size => '900x300', :crop => true) %>

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

@@ -1,3 +1,3 @@
 <%= render_essence_editor_by_name(element, 'headline') %>
-<%= render_picture_editor(element, :image_float_selector => true, :maximum_amount_of_images => 1, :image_size => "450x300", :crop => true) %>
+<%= render_essence_editor_by_name(element, 'image', :image_float_selector => true, :image_size => "450x300", :crop => true) %>
 <%= render_essence_editor_by_name(element, 'text') %>

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

@@ -1,12 +1,13 @@
 <div class="content_editor" id="<%= content_dom_id(content) %>">
 	<label><%= render_content_name(content) %></label>
-	<%= datetime_select(
-		"contents[content_#{content.id}]",
-		:date,
-		:default => content.ingredient || Date.today,
-		:start_year => options[:start_year],
-		:end_year => options[:end_year],
-		:discard_minute => (options[:show_time] ? false : true),
-		:discard_hour => (options[:show_time] ? false : true)
+	<%= alchemy_datepicker(
+		content.essence, :date, {
+			:name => content.form_field_name,
+			:id => content.form_field_id,
+			:style => 'width: 140px'
+		}
 	) %>
+	<label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">
+		<span class="ui-icon ui-icon-calendar"></span>
+	</label>
 </div>

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

@@ -1,4 +1,4 @@
-<div id="<%= content_dom_id(content) %>" class="<%= options[:dragable] ? 'essence_picture_editor dragable_picture' : "essence_picture_editor#{options[:grouped] ? nil : ' content_editor'}" %>">
+<div id="<%= content_dom_id(content) %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
 	<% unless options[:grouped] %>
 	<label><%= render_content_name(content) %></label>
 	<% end %>

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

@@ -57,15 +57,17 @@
 		<%= yield(:javascripts) %>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
+				Alchemy.locale = '<%= ::I18n.locale %>';
 				Alchemy.resizeFrame();
 				Alchemy.Tooltips();
 				if (typeof(jQuery().sb) === 'function') {
 					Alchemy.SelectBox('body#alchemy select');
 				}
+				Alchemy.Datepicker();
 				if ($('#flash_notices').length > 0) {
 					Alchemy.Growler.fade();
 				}
-				$('#toolbar a.please_wait, #toolbar form .button, #toolbar form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').click(function() {
+				$('a.please_wait, form .button, form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').click(function() {
 					Alchemy.pleaseWaitOverlay();
 				});
 			});

data/config/alchemy/page_layouts.yml

@@ -30,7 +30,7 @@
 # 
 - name: intro
   unique: true
-  elements: [article, claim, header, bild, bild_text, text, intro, headline, image_mosaic, intro_image_text]
+  elements: [header, intro_image_text]
   autogenerate: [header, intro_image_text]
 
 - name: standard

data/config/locales/alchemy.de.yml

@@ -59,7 +59,7 @@ de:
       text: 'Text'
       date: 'Datum'
       body: 'Inhalt'
-      image: 'Bild(er)'
+      image: 'Bild'
       mail_from: 'Absender (E-Mail)'
       mail_to: 'Empfänger (E-Mail)'
       caption: "Bildunterschrift"
@@ -309,7 +309,7 @@ de:
     "Your trash is empty": "Der Papierkorb ist leer"
     above: "darüber"
     add: "hinzufügen"
-    "add new content": "+ einen Inhalt hinzufügen"
+    "add new content": "Element hinzufügen"
     add_image_to_element: "Bild hinzufügen"
     align_in_text: "Im Text anordnen"
     all: "alle"
@@ -340,8 +340,10 @@ de:
     copy: "kopieren"
     copy_element: "Element kopieren"
     copy_page: "Seite kopieren"
+    copy_language_tree_heading: "Einen Sprachbaum kopieren"
     create: "erstellen"
     "Create language": "Eine neue Sprache erstellen"
+    create_language_tree_heading: "Einen leeren Sprachbaum erstellen"
     create_page: "Eine Unterseite anlegen"
     create_user: "Einen Benutzer anlegen"
     created_at: "Erstellt am"
@@ -510,7 +512,7 @@ de:
     urlname_to_short: "Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
     username: "Benutzername"
     visible: "sichtbar"
-    want_to_create_new_language: "Oder wollen Sie einen neuen leeren Sprachbaum erstellen?"
+    want_to_create_new_language: "Wollen Sie einen neuen leeren Sprachbaum erstellen?"
     want_to_make_copy_of_existing_language: "Wollen Sie eine Kopie eines vorhanden Sprachbaums machen?"
     "We need at least one default.": "Es muss eine Standardsprache geben."
     welcome_please_identify_notice: "Willkommen! Bitte identifizieren Sie sich."
@@ -544,6 +546,7 @@ de:
   date:
     formats:
       default: "%d.%m.%Y"
+      datepicker: "%d.%m.%Y"
       short: "%e. %b"
       long: "%e. %B %Y"
       only_day: "%e"
@@ -561,6 +564,7 @@ de:
       short: "%d. %B, %H:%Mh"
       long: "%A, %d. %B %Y um %H:%M Uhr"
       date: "%d.%m.%Y"
+      datepicker: "%d.%m.%Y"
       time: "%H:%M"
     am: "vormittags"
     pm: "nachmittags"
@@ -785,7 +789,7 @@ de:
         alchemy/language:
           attributes:
             code:
-              invalid: 'ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
+              invalid: '^Sprachkürzel ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
   
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/locales/alchemy.en.yml

@@ -57,7 +57,7 @@ en:
       text: 'Text'
       date: 'Date'
       body: 'Content'
-      image: 'Image(s)'
+      image: 'Image'
       mail_from: 'Sender (E-Mail)'
       mail_to: 'Receiver (E-Mail)'
       caption: "Caption"
@@ -197,8 +197,10 @@ en:
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
     copy_element: "Copy this element"
+    copy_language_tree_heading: "Copy page tree"
     copy_page: "Copy page"
     "Create language": "Create a new language"
+    create_language_tree_heading: "Create empty language tree"
     create_page: "Create a new subpage"
     create_user: "Create a new user"
     created_at: "Created at"
@@ -352,7 +354,7 @@ en:
     url_name: "URL-Name"
     urlname_to_short: "The pages urlname is too short (minimum of 3 characters)"
     username: "Username"
-    want_to_create_new_language: "Or do you want to create a new empty language tree?"
+    want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
     welcome_please_identify_notice: "Welcome! Please identify."
     width: "Width"
@@ -374,7 +376,8 @@ en:
       # Use the strftime parameters for formats.
       # When no format has been given, it uses default.
       # You can provide other formats here if you like!
-      default: "%Y-%m-%d" 
+      default: "%Y-%m-%d"
+      datepicker: "%Y-%m-%d"
       short: "%b %d" 
       long: "%B %d, %Y" 
     day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
@@ -393,6 +396,7 @@ en:
       short: "%d %b %H:%M" 
       long: "%B %d, %Y %H:%M" 
       date: "%Y-%m-%d"
+      datepicker: "%Y-%m-%d"
     am: "am" 
     pm: "pm" 
   support:

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.2"
+	VERSION = "2.1.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70295293852440 !ruby/object:Gem::Requirement
+  requirement: &70207620493240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70295293852440
+  version_requirements: *70207620493240
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70295293851260 !ruby/object:Gem::Requirement
+  requirement: &70207620490880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293851260
+  version_requirements: *70207620490880
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70295293848080 !ruby/object:Gem::Requirement
+  requirement: &70207620535420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293848080
+  version_requirements: *70207620535420
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70295293862020 !ruby/object:Gem::Requirement
+  requirement: &70207620534680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70295293862020
+  version_requirements: *70207620534680
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70295293859620 !ruby/object:Gem::Requirement
+  requirement: &70207620533640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70295293859620
+  version_requirements: *70207620533640
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70295293856680 !ruby/object:Gem::Requirement
+  requirement: &70207620532420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293856680
+  version_requirements: *70207620532420
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70295293869400 !ruby/object:Gem::Requirement
+  requirement: &70207620531360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293869400
+  version_requirements: *70207620531360
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70295293867480 !ruby/object:Gem::Requirement
+  requirement: &70207620530160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293867480
+  version_requirements: *70207620530160
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70295293865640 !ruby/object:Gem::Requirement
+  requirement: &70207620529000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70295293865640
+  version_requirements: *70207620529000
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70295293864160 !ruby/object:Gem::Requirement
+  requirement: &70207620558540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295293864160
+  version_requirements: *70207620558540
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70295293863160 !ruby/object:Gem::Requirement
+  requirement: &70207620553520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70295293863160
+  version_requirements: *70207620553520
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70295293876280 !ruby/object:Gem::Requirement
+  requirement: &70207620580400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70295293876280
+  version_requirements: *70207620580400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70295293872400 !ruby/object:Gem::Requirement
+  requirement: &70207620578660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70295293872400
+  version_requirements: *70207620578660
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70295293884580 !ruby/object:Gem::Requirement
+  requirement: &70207620577380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295293884580
+  version_requirements: *70207620577380
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -205,6 +205,7 @@ files:
 - app/assets/images/alchemy/ui-icons_666666_256x240.png
 - app/assets/javascripts/alchemy/alchemy.base.js
 - app/assets/javascripts/alchemy/alchemy.buttons.js
+- app/assets/javascripts/alchemy/alchemy.datepicker.js
 - app/assets/javascripts/alchemy/alchemy.dirty.js
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js
 - app/assets/javascripts/alchemy/alchemy.element_editor_selector.js
@@ -808,7 +809,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3492770316894394278
+      hash: -1495060895852714083
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -817,7 +818,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3492770316894394278
+      hash: -1495060895852714083
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: