alchemy_cms 2.1.5 → 2.1.6

data/app/models/alchemy/message.rb

@@ -45,9 +45,9 @@ module Alchemy
 		end
 		
 		@@config[:validate_fields].each do |field|
-			validates_presence_of field[0], :message => '^' + I18n.t(field[1][:message].to_s, :scope => "contactform.validations")
+			validates_presence_of field[0], :message => '^' + I18n.t(field[1][:message].to_s, :scope => [:contactform, :validations])
 			if field[0].to_s.include?('email')
-				validates_format_of field[0], :with => ::Authlogic::Regex.email, :message => '^' + I18n.t('alchemy.contactform.validations.wrong_email_format'), :if => :email_is_filled
+				validates_format_of field[0], :with => ::Authlogic::Regex.email, :message => '^' + I18n.t(:wrong_email_format, :scope => [:contactform, :validations]), :if => :email_is_filled
 			end
 		end
 		

data/app/models/alchemy/page.rb

@@ -25,7 +25,7 @@ module Alchemy
 		attr_accessor :do_not_validate_language
 
 		before_save :set_url_name, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
-		before_save :set_title, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
+		before_save :set_title, :unless => proc { |page| page.systempage? || page.redirects_to_external? || !page.title.blank? }
 		before_save :set_language_code, :unless => :systempage?
 		before_save :set_restrictions_to_child_pages, :if => proc { |page| !page.systempage? && page.restricted_changed? }
 		before_save :inherit_restricted_status, :if => proc { |page| !page.systempage? && page.parent && page.parent.restricted? }

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

@@ -8,9 +8,10 @@
 	<div id="clipboard_items">
 		<ul>
 			<%- @clipboard_items.each do |item| -%>
-			<li id="clipboard_item_<%= item.id %>">
-				<%= item.class.to_s == 'Element' ? item.display_name_with_preview_text(60) : item.name %>
-				<span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item.class.name.demodulize.underscore, :remarkable_id => item.id), :remote => true, :method => :delete, :title => t('Remove item from clipboard')) %></span>
+			<% item_class = item.class.name.demodulize.underscore %>
+			<li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
+				<%= item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text(60) : item.name %>
+				<span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item_class, :remarkable_id => item.id), :remote => true, :method => :delete, :title => t('Remove item from clipboard')) %></span>
 			</li>
 			<%- end -%>
 		</ul>

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -5,9 +5,9 @@
 <%- if @item.class.to_s == 'Element' -%>
 	$('#element_area').sortable('refresh');
 <%- end -%>
-	Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+	Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- else -%>
-	Alchemy.growl('<%= escape_javascript t("item copied to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>')
+	Alchemy.growl('<%= escape_javascript t("item copied to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>')
 <%- end -%>
 	$('#clipboard_button .icon.clipboard').addClass('full');
 

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

@@ -1,29 +1,44 @@
 (function($) {
 
 <%- 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
+    )
+  ) -%>');
+
+  <% else -%>
 
   $('#add_content_<%= @element.id -%>').before('<%= escape_javascript(
     render(
       :partial => "alchemy/essences/essence_picture_editor",
-      :locals => {
-        :content => @content,
-        :options => @options.symbolize_keys
-      }
+      :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 -%>
+
 <%- elsif @content.essence_type ==  "Alchemy::EssenceText" -%>
 
   <%- locals = {
@@ -87,15 +102,35 @@
 
 <%- else -%>
 
-  $('#add_content_for_element_<%= @element.id -%>').before('<%= escape_javascript(
+  <%- 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_type.underscore}_editor",
-      :locals => {
-        :content => @content,
-        :options => (@options.nil? ? {} : @options.symbolize_keys)
-      }
+      :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 -%>
 

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']] } %>
+				<%= 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/elements/_element.html.erb

@@ -1,4 +1,4 @@
-<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
+<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id -%>" data-element-id="<%= element.id -%>">
   <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
   <%- if !element.folded? -%>
     <%= form_for(

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

@@ -2,7 +2,7 @@
   "element_from_page_#{@page_id}_to_link",
   options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text, "##{m.dom_id}"] }),
   :prompt => t("choose_element_to_link"),
-  :class => "elements_from_page_selector",
+  :class => "elements_from_page_selector alchemy_selectbox",
   :onchange => "jQuery('#page_anchor').val(value)",
   :title => t("choose_element_as_target")
 ) %>

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

@@ -1,5 +1,7 @@
 (function($) {
 
+	var $el;
+
 	<% if @cutted_element_id %>
 		$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
 	<% end %>
@@ -19,11 +21,13 @@
 
 	Alchemy.PreviewWindow.refresh();
 	Alchemy.ElementEditorSelector.init();
-	$('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
-	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"]');
+	
+	$el = $('#element_<%= @element.id -%>');
+	$el.trigger('Alchemy.SelectElementEditor');
+	Alchemy.ElementDirtyObserver($el);
+	Alchemy.SelectBox('select', $el);
+	Alchemy.ButtonObserver('button.button', $el);
+	Alchemy.Datepicker('input[type="date"]', $el);
 
 	<%- if @clipboard.blank? -%>
 		$('#clipboard_button .icon.clipboard').removeClass('full');

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

@@ -1,14 +1,16 @@
 (function($) {
   
+  var $el = $('.element_editor[data-element-id="<%= @element.id %>"]');
+
   <%- if @error -%>
   
   $("#element_<%= @element.id -%>_folder_spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
   
   <%- else -%>
   
-  $('.element_editor[data-element-id="<%= @element.id -%>"]').replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
+  $el = $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
   $('#element_area .sortable_cell').sortable('refresh');
-  Alchemy.ElementEditorSelector.reinit('.element_editor[data-element-id="<%= @element.id -%>"]');
+  Alchemy.ElementEditorSelector.reinit('.element_editor[data-element-id="<%= @element.id %>"]');
 
   <%- if @element.folded -%>
     
@@ -22,16 +24,16 @@
     
   <%- else -%>
     
-    $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
-    Alchemy.SelectBox('#element_<%= @element.id -%> select');
+    $el.trigger('Alchemy.SelectElementEditor');
+    Alchemy.SelectBox('select', $el);
     
     <%- @element.rtf_contents.each do |content| -%>
     Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
     <%- 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');
+    Alchemy.ElementDirtyObserver($el);
+    Alchemy.Datepicker('input[type="date"]', $el);
+    Alchemy.ButtonObserver('button.button', $el);
   <%- end -%>
   
   <%- end -%>

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

@@ -1,13 +1,15 @@
 (function($) {
-  
-  $('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
-  Alchemy.growl('<%= t("Element trashed") -%>');
-  $('#element_area').sortable('refresh');
-  Alchemy.refreshTrashWindow(<%= @page_id -%>);
-  $('#element_trash_button .icon').addClass('full');
-  Alchemy.PreviewWindow.refresh();
-<%- @element.rtf_contents.each do |content| -%>
-  tinymce.get('contents_content_<%= content.id -%>_body').remove();
-<%- end -%>
-  
+	
+	$('#element_<%= @element.id -%>').hide(200, function() {
+		$(this).remove();
+		Alchemy.growl('<%= escape_javascript(t("Element trashed")) -%>');
+		$('#element_area').sortable('refresh');
+		Alchemy.refreshTrashWindow(<%= @page_id -%>);
+		$('#element_trash_button .icon').addClass('full');
+		Alchemy.PreviewWindow.refresh();
+	<%- @element.rtf_contents.each do |content| -%>
+		tinymce.get('contents_content_<%= content.id -%>_body').remove();
+	<%- end -%>
+	});
+	
 })(jQuery);

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

@@ -1,24 +1,27 @@
 (function($) {
+
+  var $el = $('#element_<%= @element.id -%>');
+
 	<%- if @element_validated -%>
 	
-  $('div#element_<%= @element.id -%> div.element_handle span.icon').removeClass('element_<%= @element.public? ? "draft" : "public" -%>').addClass('element_<%= @element.public? ? "public" : "draft" -%>');
-  $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_element_name').text('<%= @element.display_name -%>');
-  $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_quote').text('<%= escape_javascript(@element.preview_text) -%>');
+  $('div.element_handle span.icon', $el).removeClass('element_<%= @element.public? ? "draft" : "public" -%>').addClass('element_<%= @element.public? ? "public" : "draft" -%>');
+  $('.element_heading .preview_text_element_name', $el).text('<%= @element.display_name -%>');
+  $('.element_heading .preview_text_quote', $el).text('<%= escape_javascript(@element.preview_text) -%>');
   $('div.content_editor').removeClass('validation_failed');
   $("#element_<%= @element.id -%>_errors").hide();
-  Alchemy.setElementSaved('#element_<%= @element.id -%>');
+  Alchemy.setElementSaved($el);
   Alchemy.growl('<%= t("element_saved") -%>');
   Alchemy.PreviewWindow.refresh();
 
 	<%- else -%>
 
 	Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
-	$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>") %></li></ul>');
+	$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>").html_safe %></li></ul>');
   $("#element_<%= @element.id %>_errors").show();
   $('div.content_editor').removeClass('validation_failed');
   $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
-  Alchemy.enableButton('#element_<%= @element.id %> button.button');
-
+  Alchemy.enableButton('button.button', $el);
+  
 	<%- end -%>
 
 })(jQuery);

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

@@ -7,7 +7,7 @@
     </tr>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
-      <td class="select"><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %></td>
+      <td class="select"><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]], :class => 'alchemy_selectbox' %></td>
     </tr>
     <tr>
       <td colspan="2" class="submit">

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

@@ -32,7 +32,7 @@
         options_for_select(
           [[t('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
           @essence_picture.render_size
-        )
+        ), :class => 'alchemy_selectbox'
       ) %>
       </td>
     </tr>
@@ -47,7 +47,7 @@
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %>
+        <%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]], :class => 'alchemy_selectbox' %>
       </td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
@@ -55,7 +55,7 @@
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select("css_class", options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class)) %>
+        <%= f.select("css_class", options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class), :class => 'alchemy_selectbox') %>
       </td>
     </tr>
     <%- elsif @options[:css_classes] && !@options[:css_classes].is_a?(HashWithIndifferentAccess) -%>

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

@@ -26,7 +26,7 @@
         <%= select_tag(
           "contactform_mailto",
           options_for_select(configuration(:mailer)[:mail_addresses].map{ |a| [t('alchemy.mailer.mail_addresses.'+a[0]), a[0]] }),
-          :style => "width: 300px"
+          :style => "width: 300px", :class => 'alchemy_selectbox'
         ) %>
       </td>
     </tr>

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

@@ -13,7 +13,7 @@
 				<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") %>
+						<%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "alchemy_selectbox medium_long") %>
 						<%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
 					</td>
 				</tr>

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

@@ -22,7 +22,7 @@
         <label for="link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
+        <%= select_tag 'link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
       </td>
     </tr>
   </table>

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

@@ -11,7 +11,7 @@
         <%= select_tag(
           "public_filename",
           options_for_select(@attachments),
-          :class => "full_width"
+          :class => "alchemy_selectbox full_width"
         ) %>
       </td>
     </tr>
@@ -30,7 +30,7 @@
         <label for="file_link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'file_link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
+        <%= select_tag 'file_link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
       </td>
     </tr>
   </table>

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

@@ -23,7 +23,7 @@
         <label for="internal_link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'internal_link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
+        <%= select_tag 'internal_link_target', options_for_select(@link_target_options), :class => 'alchemy_selectbox link_target medium' %>
       </td>
     </tr>
   </table>

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) %>
+				<%= f.select('page_layout', @page_layouts, :class => 'alchemy_selectbox') %>
 			</td>
 		</tr>
 		<tr>

data/app/views/alchemy/admin/partials/_language_tree_select.html.erb

@@ -3,7 +3,7 @@
 		'language', 
 		options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
 		:id => 'language_tree_select',
-		:class => 'short'
+		:class => 'alchemy_selectbox short'
 	) %>
 	<label><%= t("Language tree") %></label>
 </div>

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

@@ -15,9 +15,9 @@
 			<%= t('Please wait. Flash® is loading...') %>
 		</p>
 	</div>
-	<button class="button" onclick="swfu.cancelQueue(); return false" style="display: none">
+	<a href="#" class="button no-spinner" onclick="swfu.cancelQueue(); return false" style="display: none">
 		<%= t("swfupload.cancel_uploads") %>
-	</button>
+	</a>
 </div>
 <%- if file_types.first == '*' -%>
 <p><%= t('You may upload any file') %></p>

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

@@ -1 +1 @@
-window.location.replace('<%= url_for({:action => :index}) %>');
+window.location.replace('<%= resource_url_scope.url_for({:action => :index}) %>');

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

@@ -1,7 +1,7 @@
 <table>
 	<tr>
 		<td class="label"><%= f.label 'gender' %></td>
-		<td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')} -%></td>
+		<td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, :class => 'alchemy_selectbox' -%></td>
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'firstname' %></td>
@@ -21,7 +21,7 @@
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'language' %></td>
-		<td class="select"><%= f.select 'language', translations_for_select %></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) %></td>
+		<td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), :class => 'alchemy_selectbox' %></td>
 	</tr>
 	<%- else -%>
 	<%= f.hidden_field :role %>