alchemy_cms 2.1.4 → 2.1.5

data/app/models/alchemy/user_session.rb

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

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

@@ -1,6 +1,6 @@
 (function($) {
 	
-	$('<%= @content_dom_id %>').remove();
+	$('#<%= content_dom_id(@content_dup) %>').remove();
 	Alchemy.growl('<%= escape_javascript(@notice) %>');
 	Alchemy.reloadPreview();
 	

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

@@ -23,6 +23,7 @@
 	Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
 	Alchemy.SelectBox('#element_<%= @element.id -%> select');
 	Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
+	Alchemy.Datepicker('#element_<%= @element.id -%> input[type="date"]');
 
 	<%- if @clipboard.blank? -%>
 		$('#clipboard_button .icon.clipboard').removeClass('full');

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -10,8 +10,6 @@
   $('#element_area .sortable_cell').sortable('refresh');
   Alchemy.ElementEditorSelector.reinit('.element_editor[data-element-id="<%= @element.id -%>"]');
 
-  Alchemy.ButtonObserver('.element_editor[data-element-id="<%= @element.id -%>"] button.button');
-
   <%- if @element.folded -%>
     
     <%- @element.rtf_contents.each do |content| -%>
@@ -32,6 +30,8 @@
     <%- end -%>
     
     Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
+    Alchemy.Datepicker('#element_<%= @element.id -%> input[type="date"]');
+    Alchemy.ButtonObserver('.element_editor[data-element-id="<%= @element.id -%>"] button.button');
   <%- end -%>
   
   <%- end -%>

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

@@ -5,7 +5,7 @@
       <%- @elements.each do |cell, elements| -%>
       <li>
         <a href="#cell_<%= cell.name -%>">
-          <%= cell.name == 'for_other_elements' ? t('other Elements') : t("alchemy.cell_names.#{cell.name}", :default => cell.name.camelcase) -%>
+          <%= cell.name == 'for_other_elements' ? t('other Elements') : t(cell.name, :scope => :cell_names) -%>
         </a>
       </li>
       <%- end -%>

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

@@ -10,23 +10,23 @@
         <%- if @options[:caption_as_textarea] -%>
         <%= f.text_area "caption", :class => 'thin_border' %>
         <%- else -%>
-        <%= f.text_field "caption", :class => 'thin_border long' %>
+        <%= f.text_field "caption", :class => 'thin_border' %>
         <%- end -%>
       </td>
     </tr>
     <tr>
       <td class="label"><%= f.label "title" %></td>
-      <td class="input"><%= f.text_field "title", :class => 'thin_border long' %></td>
+      <td class="input"><%= f.text_field "title", :class => 'thin_border' %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label "alt_tag" %></td>
-      <td class="input"><%= f.text_field "alt_tag", :class => 'thin_border long' %></td>
+      <td class="input"><%= f.text_field "alt_tag", :class => 'thin_border' %></td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
     <%- if @options[:sizes].is_a?(HashWithIndifferentAccess) -%>
     <tr>
       <td class="label"><%= f.label "render_size" %></td>
-      <td class="input">
+      <td class="select">
       <%= f.select(
         "render_size",
         options_for_select(
@@ -46,7 +46,7 @@
     <%- if @options[:image_float_selector] -%>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
-      <td class="input">
+      <td class="select">
         <%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %>
       </td>
     </tr>
@@ -54,7 +54,7 @@
     <%- elsif @options[:css_classes].is_a?(HashWithIndifferentAccess) -%>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
-      <td class="input">
+      <td class="select">
         <%= f.select("css_class", options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class)) %>
       </td>
     </tr>

data/app/views/alchemy/admin/languages/_form.html.erb

@@ -0,0 +1,47 @@
+<%= form_for [resource_url_scope, :admin, resource_instance_variable], :remote => true, :html => {:style => 'width: 403px'} do |f| %>
+	<div id="errors" style="display: none"></div>
+	<table>
+		<tr>
+			<td class="label"><%= f.label :name %></td>
+			<td class="input"><%= f.text_field :name, :class => 'thin_border long' -%></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :language_code %></td>
+			<td class="input"><%= f.text_field :language_code, :class => 'thin_border long', :placeholder => t(:language_code_placeholder) -%></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :country_code %>*</td>
+			<td class="input">
+				<%= f.text_field :country_code, :class => 'thin_border long', :placeholder => t(:country_code_placeholder) -%>
+			</td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :frontpage_name %></td>
+			<td class="input"><%= f.text_field :frontpage_name, :class => 'thin_border long' -%></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :page_layout %></td>
+			<td class="input"><%= f.text_field :page_layout, :class => 'thin_border long' -%></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :public %></td>
+			<td class="checkbox"><%= f.check_box :public -%></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label :default -%></td>
+			<td class="checkbox"><%= f.check_box :default -%></td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<p class="foot_note">
+					* Der Ländercode ist nur notwendig, wenn Sie mehrere Länder mit unterschiedlichen Sprachen versehen wollen.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td class="submit" colspan="2">
+				<%= f.button t('save'), :class => 'button' %>
+			</td>
+		</tr>
+	</table>
+<% end %>

data/app/views/alchemy/admin/languages/_language.html.erb

@@ -0,0 +1,47 @@
+<tr class="<%= cycle('even', 'odd') %>">
+	<td>
+		<%= language.name %>
+	</td>
+	<td>
+		<%= language.language_code %>
+	</td>
+	<td>
+		<%= language.country_code %>
+	</td>
+	<td>
+		<%= language.frontpage_name %>
+	</td>
+	<td>
+		<%= language.page_layout %>
+	</td>
+	<td class="center">
+		<%= language.public? ? render_icon('true') : '' %>
+	</td>
+	<td class="center">
+		<%= language.default? ? render_icon('true') : '' %>
+	</td>
+	<td class="tools">
+		<%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
+		<%= link_to_confirmation_window(
+			'',
+			t("Are you sure?"),
+			alchemy.admin_language_path(language),
+			:title => t("Delete"),
+			:class => "icon destroy"
+		) -%>
+		<%- end -%>
+		<%- permitted_to?(:edit, :alchemy_admin_languages) do -%>
+		<%= link_to_overlay_window(
+			'',
+			alchemy.edit_admin_language_path(language),
+			{
+				:title => t("Edit")
+			},
+			{
+				:class => "icon edit",
+				:title => t("Edit")
+			}
+		) -%>
+		<%- end -%>
+	</td>
+</tr>

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

@@ -0,0 +1,33 @@
+<%- if @languages.any? -%>
+<table class="list" id="languages_list">
+	<tr>
+		<th>
+			<%= Alchemy::Language.human_attribute_name(:name) %>
+		</th>
+		<th>
+			<%= Alchemy::Language.human_attribute_name(:language_code) %>
+		</th>
+		<th>
+			<%= Alchemy::Language.human_attribute_name(:country_code) %>
+		</th>
+		<th>
+			<%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
+		</th>
+		<th>
+			<%= Alchemy::Language.human_attribute_name(:page_layout) %>
+		</th>
+		<th class="center">
+			<%= Alchemy::Language.human_attribute_name(:public) %>
+		</th>
+		<th class="center">
+			<%= Alchemy::Language.human_attribute_name(:default) %>
+		</th>
+		<th class="tools"></th>
+	</tr>
+	<%= render_resources %>
+</table>
+<%- elsif params[:query] -%>
+<p><%= t('Nothing found') %></p>
+<%- end -%>
+
+<%= render 'alchemy/admin/partials/pagination_links', :items => @languages, :scope => alchemy %>

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

@@ -1,3 +1,4 @@
+<% if options[:crop].to_s == 'true' && content.ingredient %>
 <%= link_to_overlay_window(
   render_icon('crop'),
   alchemy.crop_admin_essence_picture_path(content.essence, :options => options),
@@ -6,10 +7,12 @@
     :title => t('Edit Picturemask')
   },
   {
-    :class => necessary_options_for_cropping_provided?(options) && content.ingredient ? nil : 'disabled',
     :title => t('Edit Picturemask')
   }
 ) %>
+<%- else -%>
+<a href="#" class="disabled"><%= render_icon('crop') %></a>
+<%- end -%>
 
 <%= link_to_overlay_window(
   render_icon('swap_picture'),

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

@@ -14,9 +14,7 @@
 		),
 		{
 			:alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
-			:title => (content.essence.title.blank? ? nil : content.essence.title),
-			:id => dom_id(content.essence.picture),
-			:style => (options[:crop] && !options[:image_size].blank?) || (!options[:crop] && options[:image_size].blank?) ? "width: #{options[:image_size].blank? ? content.essence.picture.image_width : options[:image_size].split('x')[0]}px; height: #{options[:image_size].blank? ? content.essence.picture.image_height : options[:image_size].split('x')[1]}px" : nil
+			:title => (content.essence.title.blank? ? nil : content.essence.title)
 		}.merge(html_options)
 	) -%>
 

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

@@ -49,7 +49,7 @@
     <%= link_to_confirmation_window(
       render_icon('delete-small'),
       t('Do you really want to delete this content?'),
-      alchemy.content_path(content),
+      alchemy.admin_content_path(content),
       :class => 'icon_button small',
       :title => t('Remove this content')
     ) if content.settings[:deletable] %>

data/config/locales/alchemy.de.yml

@@ -341,6 +341,7 @@ de:
     copy_element: "Element kopieren"
     copy_page: "Seite kopieren"
     copy_language_tree_heading: "Einen Sprachbaum kopieren"
+    country_code_placeholder: 'z.B. at (optional)'
     create: "erstellen"
     "Create language": "Eine neue Sprache erstellen"
     create_language_tree_heading: "Einen leeren Sprachbaum erstellen"
@@ -397,6 +398,7 @@ de:
     "item removed from clipboard": "%{name} wurde aus der Zwischenablage entfernt."
     javascript_disabled_headline: "Javascript ist deaktiviert!"
     javascript_disabled_text: "Alchemy funktioniert nur einwandfrei mit aktiviertem Javascript. Bitte aktivieren Sie es in Ihrem Browser."
+    language_code_placeholder: 'z.B. de'
     language_does_not_exist: "Dieser Sprachbaum existiert noch nicht"
     language_pages_copied: "Der Sprachbaum wurde kopiert"
     left: "links"
@@ -711,7 +713,8 @@ de:
         picture_id: Bild
       
       alchemy/language:
-        code: "Sprachkürzel"
+        country_code: "Länderkürzel"
+        language_code: "Sprachkürzel"
         default: "Standardsprache"
         frontpage_name: "Name der Startseite"
         name: "Name"
@@ -762,26 +765,26 @@ de:
         body: ""
       
       messages:
-        inclusion: "%{attribute} ist kein gültiger Wert"
-        exclusion: "%{attribute} ist nicht verfügbar"
-        invalid: "%{attribute} ist nicht gültig"
+        inclusion: "ist kein gültiger Wert"
+        exclusion: "ist nicht verfügbar"
+        invalid: "ist nicht gültig"
         record_invalid: 'Validierung von %{errors} ist fehlgeschlagen'
-        confirmation: "%{attribute} stimmt nicht mit der Bestätigung überein"
-        accepted: "%{attribute} muss akzeptiert werden"
-        empty: "%{attribute} muss ausgefüllt werden"
-        blank: "%{attribute} muss ausgefüllt werden"
-        too_long: "%{attribute} ist zu lang (nicht mehr als %{count} Zeichen)"
-        too_short: "%{attribute} ist zu kurz (nicht weniger als %{count} Zeichen)"
-        wrong_length: "%{attribute} hat die falsche Länge (muss genau %{count} Zeichen haben)"
-        taken: "%{attribute} ist bereits vergeben"
-        not_a_number: "%{attribute} ist keine Zahl"
-        greater_than: "%{attribute} muss größer als %{count} sein"
-        greater_than_or_equal_to: "%{attribute} muss größer oder gleich %{count} sein"
-        equal_to: "%{attribute} muss genau %{count} sein"
-        less_than: "%{attribute} muss kleiner als %{count} sein"
-        less_than_or_equal_to: "%{attribute} muss kleiner oder gleich %{count} sein"
-        odd: "%{attribute} muss ungerade sein"
-        even: "%{attribute} muss gerade sein"
+        confirmation: "stimmt nicht mit der Bestätigung überein"
+        accepted: "muss akzeptiert werden"
+        empty: "muss ausgefüllt werden"
+        blank: "muss ausgefüllt werden"
+        too_long: "ist zu lang (nicht mehr als %{count} Zeichen)"
+        too_short: "ist zu kurz (nicht weniger als %{count} Zeichen)"
+        wrong_length: "hat die falsche Länge (muss genau %{count} Zeichen haben)"
+        taken: "ist bereits vergeben"
+        not_a_number: "ist keine Zahl"
+        greater_than: "muss größer als %{count} sein"
+        greater_than_or_equal_to: "muss größer oder gleich %{count} sein"
+        equal_to: "muss genau %{count} sein"
+        less_than: "muss kleiner als %{count} sein"
+        less_than_or_equal_to: "muss kleiner oder gleich %{count} sein"
+        odd: "muss ungerade sein"
+        even: "muss gerade sein"
       
       models:
         alchemy/content:
@@ -790,8 +793,9 @@ de:
               validation_failed: 'Validierung fehlgeschlagen.'
         alchemy/language:
           attributes:
-            code:
-              invalid: '^Sprachkürzel ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
+            language_code:
+              invalid: 'ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
+              taken: 'ist für dieses Länderkürzel bereits vergeben.'
   
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/locales/alchemy.en.yml

@@ -199,6 +199,7 @@ en:
     copy_element: "Copy this element"
     copy_language_tree_heading: "Copy page tree"
     copy_page: "Copy page"
+    country_code_placeholder: 'i.e. us (optional)'
     "Create language": "Create a new language"
     create_language_tree_heading: "Create empty language tree"
     create_page: "Create a new subpage"
@@ -255,6 +256,7 @@ en:
     "item removed from clipboard": "Removed %{name} from clipboard"
     javascript_disabled_headline: "Javascript is disabled!"
     javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
+    language_code_placeholder: 'i.e. en'
     language_does_not_exist: "This language tree does not exist"
     language_pages_copied: "Language tree succesfully copied."
     link_image: "Link this image."

data/config/routes.rb

@@ -139,12 +139,12 @@ Alchemy::Engine.routes.draw do
 	end
 
 	match '/:lang' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}/},
+		:constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
 		:as => :show_language_root
 
 	# The page show action has to be last route
 	match '(/:lang)(/:level1(/:level2(/:level3)))/:urlname(.:format)' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}/},
+		:constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
 		:as => :show_page
 
 end

data/db/migrate/20120216135355_add_country_code_to_languages.rb

@@ -0,0 +1,9 @@
+class AddCountryCodeToLanguages < ActiveRecord::Migration
+  def change
+    add_column :alchemy_languages, :country_code, :string
+    rename_column :alchemy_languages, :code, :language_code
+    remove_index :alchemy_languages, :name => :index_languages_on_code
+    add_index :alchemy_languages, :language_code
+    add_index :alchemy_languages, [:language_code, :country_code]
+  end
+end

data/lib/alchemy/i18n.rb

@@ -1,28 +1,35 @@
 module Alchemy
 	class I18n
 
-		## Thanks Typus for this I18n hack!
+		# A I18n Proxy for Alchemy translations
 		# 
 		# Instead of having to translate strings and defining a default value:
-		#
-		#     AlchemyAlchemy::I18n.t("Hello World!", :default => 'Hello World!')
-		#
+		# 
+		#     Alchemy::I18n.t("Hello World!", :default => 'Hello World!')
+		# 
 		# We define this method to define the value only once:
-		#
-		#     AlchemyAlchemy::I18n.t("Hello World!")
-		#
+		# 
+		#     Alchemy::I18n.t("Hello World!")
+		# 
 		# Note that interpolation still works:
-		#
-		#     AlchemyAlchemy::I18n.t("Hello %{world}!", :world => @world)
-		#
-		# Notes:
-		# -----
 		# 
-		# Already scoped to alchemy namespace!
+		#     Alchemy::I18n.t("Hello %{world}!", :world => @world)
+		# 
+		# === Notes
+		# 
+		# All translations are scoped into the +alchemy+ namespace.
+		# Even scopes are scoped into the +alchemy+ namespace.
+		# 
+		# So a call for t('hello', :scope => :world) has to be translated like this:
+		# 
+		#   de:
+		#     alchemy:
+		#       world:
+		#         hello: Hallo
 		# 
 		def self.t(msg, *args)
 			options = args.extract_options!
-			options[:default] = options[:default] ? options[:default] : msg
+			options[:default] = options[:default] ? options[:default] : msg.to_s.humanize
 			scope = ['alchemy']
 			case options[:scope].class.name
 				when "Array"