alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,36 +1,36 @@
 (function($) {
 
-	var $el;
-
-	<% if @cutted_element_id %>
-		$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
-	<% end %>
-
-	<%- if @page.can_have_cells? -%>
-		Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
-	<%- end -%>
-
-	$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
-	$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
-	Alchemy.growl('<%= t("successfully_added_element") -%>');
-	Alchemy.closeCurrentWindow();
-
-	<%- @element.rtf_contents.each do |content| -%>
-		Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
-	<%- end -%>
-
-	Alchemy.PreviewWindow.refresh();
-	Alchemy.ElementEditorSelector.init();
-	
-	$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');
-	<%- end -%>
+  var $el;
+
+  <% if @cutted_element_id %>
+    $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+  <% end %>
+
+  <%- if @page.can_have_cells? -%>
+    Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
+  <%- end -%>
+
+  $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
+  $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
+  Alchemy.growl('<%= t("successfully_added_element") -%>');
+  Alchemy.closeCurrentWindow();
+
+  <%- @element.rtf_contents.each do |content| -%>
+    Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
+  <%- end -%>
+
+  Alchemy.PreviewWindow.refresh();
+  Alchemy.ElementEditorSelector.init();
+
+  $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');
+  <%- end -%>
 
 })(jQuery);

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

@@ -15,14 +15,14 @@
     <% @elements.each do |cell, elements| -%>
     <% if elements.any? -%>
     <div id="cell_<%= cell.name %>" class="sortable_cell <%= cell.name %>_cell" data-cell-id="<%= cell.id %>">
-    	<%= render :partial => 'element', :collection => elements, :locals => {:draggable => true} %>
+      <%= render :partial => 'alchemy/admin/elements/element', :collection => elements, :locals => {:draggable => true} %>
     </div>
     <% end -%>
     <% end -%>
   </div>
   <% else -%>
   <div class="sortable_cell for_other_elements_cell" id="cell_for_other_elements">
-    <%= render :partial => @elements, :locals => {:draggable => true} %>
+    <%= render :partial => 'alchemy/admin/elements/element', :collection => @elements, :locals => {:draggable => true} %>
   </div>
   <% end -%>
 </div>

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

@@ -2,40 +2,40 @@
 <%= render :partial => 'new_element_form' %>
 <%- else -%>
 <div id="overlay_tabs">
-	<ul>
-		<li><a href="#create_element_tab"><%= t('New') %></a></li>
-		<li><a href="#paste_element_tab"><%= t('Paste from clipboard') %></a></li>
-	</ul>
-	<div id="create_element_tab">
-		<%= render :partial => 'new_element_form' %>
-	</div>
-	<div id="paste_element_tab">
-		<%= form_for([:admin, @element], :remote => true, :id => 'paste_element_form') do |f| %>
-			<div id="errors" style="display: none"></div>
-			<table>
-				<tr>
-					<td class="label">
-						<label for="paste_from_clipboard"><%= t("Element") %></label>
-					</td>
-					<td class="select">
-						<%= clipboard_select_tag(@clipboard_items) %>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2" class="submit">
-						<%= f.hidden_field(:page_id) %>
-						<%= f.button t("paste"), :class => 'button' %>
-					</td>
-				</tr>
-			</table>
-		<% end %>
-	</div>
+  <ul>
+    <li><a href="#create_element_tab"><%= t('New') %></a></li>
+    <li><a href="#paste_element_tab"><%= t('Paste from clipboard') %></a></li>
+  </ul>
+  <div id="create_element_tab">
+    <%= render :partial => 'new_element_form' %>
+  </div>
+  <div id="paste_element_tab">
+    <%= form_for([:admin, @element], :remote => true, :id => 'paste_element_form') do |f| %>
+      <div id="errors" style="display: none"></div>
+      <table>
+        <tr>
+          <td class="label">
+            <label for="paste_from_clipboard"><%= t("Element") %></label>
+          </td>
+          <td class="select">
+            <%= clipboard_select_tag(@clipboard_items) %>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2" class="submit">
+            <%= f.hidden_field(:page_id) %>
+            <%= f.button t("paste"), :class => 'button' %>
+          </td>
+        </tr>
+      </table>
+    <% end %>
+  </div>
 </div>
 <script type="text/javascript" charset="utf-8">
 
-	jQuery(function() {
-		jQuery("#overlay_tabs").tabs();
-	});
+  jQuery(function() {
+    jQuery("#overlay_tabs").tabs();
+  });
 
 </script>
 <%- end -%>

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

@@ -1,7 +1,7 @@
 (function($) {
 
-	Alchemy.growl('<%= t("successfully_saved_element_position") -%>');
-	$('#element_area .ajax_folder').show();
-	Alchemy.PreviewWindow.refresh();
+  Alchemy.growl('<%= t("successfully_saved_element_position") -%>');
+  $('#element_area .ajax_folder').show();
+  Alchemy.PreviewWindow.refresh();
 
 })(jQuery);

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

@@ -1,15 +1,15 @@
 (function($) {
-	
-	$('#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 -%>
-	});
-	
+
+  $('#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

@@ -2,8 +2,8 @@
 
   var $el = $('#element_<%= @element.id -%>');
 
-	<%- if @element_validated -%>
-	
+  <%- if @element_validated -%>
+
   $('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) -%>');
@@ -13,15 +13,15 @@
   Alchemy.growl('<%= t("element_saved") -%>');
   Alchemy.PreviewWindow.refresh();
 
-	<%- else -%>
+  <%- else -%>
 
-	Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
-	$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>").html_safe %></li></ul>');
+  Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
+  $('#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('button.button', $el);
   
-	<%- end -%>
+  <%- end -%>
 
 })(jQuery);

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

@@ -1,8 +1,8 @@
 (function($) {
-	
-	$('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "alchemy/essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options})) %>');
-	Alchemy.closeCurrentWindow();
-	Alchemy.reloadPreview();
-	Alchemy.setElementDirty('#element_<%= @content.element.id %>');
-	
+
+  $('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "alchemy/essences/essence_file_editor", :formats => [:html], :locals => {:content => @content, :options => @options})) %>');
+  Alchemy.closeCurrentWindow();
+  Alchemy.reloadPreview();
+  Alchemy.setElementDirty('#element_<%= @content.element.id %>');
+
 })(jQuery);

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

@@ -1,45 +1,45 @@
 <%- if @no_image_notice -%>
 <div class="with_padding">
-	<div class="info">
-		<%= render_icon('info') %>
-		<%= @no_image_notice %>
-	</div>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= @no_image_notice %>
+  </div>
 </div>
 <%- else -%>
 <div id="overlay_toolbar">
-	<%= form_for(@essence_picture, :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options), :id => 'image_cropper_form', :remote => true) do |f| %>
-		<%= f.hidden_field :crop_from %>
-		<%= f.hidden_field :crop_size %>
-		<%= hidden_field_tag 'content_id', @content.id %>
-		<%= f.button t("save"), :class => 'button' %>
-	<% end %>
-	<div class="toolbar_spacer"></div>
-	<div class="button_with_label">
-		<%= link_to_function(
-			render_icon('delete-small'),
-			'Alchemy.ImageCropper.reset()',
-			:class => 'icon_button',
-			:title => t('Reset Imagemask')
-		) %>
-		<label><%= t("Reset Imagemask") %></label>
-	</div>
+  <%= form_for(@essence_picture, :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options), :id => 'image_cropper_form', :remote => true) do |f| %>
+    <%= f.hidden_field :crop_from %>
+    <%= f.hidden_field :crop_size %>
+    <%= hidden_field_tag 'content_id', @content.id %>
+    <%= f.button t("save"), :class => 'button' %>
+  <% end %>
+  <div class="toolbar_spacer"></div>
+  <div class="button_with_label">
+    <%= link_to_function(
+      render_icon('delete-small'),
+      'Alchemy.ImageCropper.reset()',
+      :class => 'icon_button',
+      :title => t('Reset Imagemask')
+    ) %>
+    <label><%= t("Reset Imagemask") %></label>
+  </div>
 </div>
 
 <div id="crop_explain" class="tip">
-	<%= t('explain cropping') %>
+  <%= t('explain cropping') %>
 </div>
 
 <div id="jscropper">
-	<%= image_tag(
-		alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format] ),
-		:id => 'imageToCrop',
-		:onload => "Alchemy.ImageCropper.init(
-			[#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
-			#{@size_x},
-			#{@size_y},
-			[#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
-			#{@ratio}
-		);"
-	) %>
+  <%= image_tag(
+    alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format] ),
+    :id => 'imageToCrop',
+    :onload => "Alchemy.ImageCropper.init(
+      [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
+      #{@size_x},
+      #{@size_y},
+      [#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
+      #{@ratio}
+    );"
+  ) %>
 </div>
 <%- end -%>

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

@@ -13,7 +13,7 @@
       }
     )
   ) -%>');
-	<%- end -%>
+  <%- end -%>
 
   Alchemy.reloadPreview();
 

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

@@ -1,7 +1,7 @@
 <%= form_for(
     @essence_picture,
     :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options),
-		:remote => true
+    :remote => true
 ) do |f| %>
   <table>
     <tr>

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

@@ -1,17 +1,17 @@
 (function($) {
 
-	$('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
-		render(
-			:partial => "alchemy/essences/essence_picture_editor",
-			:locals => {:content => @content, :options => params[:options] || {}}
-		)
-	) -%>');
-	Alchemy.growl('<%= t("Image updated successfully") -%>');
-	Alchemy.ImageCropper.destroy();
-	Alchemy.closeCurrentWindow();
-	Alchemy.reloadPreview();
+  $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
+    render(
+      :partial => "alchemy/essences/essence_picture_editor",
+      :locals => {:content => @content, :options => params[:options] || {}}
+    )
+  ) -%>');
+  Alchemy.growl('<%= t("Image updated successfully") -%>');
+  Alchemy.ImageCropper.destroy();
+  Alchemy.closeCurrentWindow();
+  Alchemy.reloadPreview();
 <%- if @content.element.all_contents_by_type("Alchemy::EssencePicture").count > 1 -%>
-	Alchemy.SortableContents('<%= form_authenticity_token -%>');
+  Alchemy.SortableContents('<%= form_authenticity_token -%>');
 <%- end -%>
 
 })(jQuery);

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

@@ -1,47 +1,53 @@
 <%= form_for [alchemy, :admin, @language], :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">
-					* <%= t(:country_code_foot_note) %>
-				</p>
-			</td>
-		</tr>
-		<tr>
-			<td class="submit" colspan="2">
-				<%= f.button t('save'), :class => 'button' %>
-			</td>
-		</tr>
-	</table>
+  <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' -%></td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label :language_code %></td>
+      <td class="input"><%= f.text_field :language_code, :class => 'thin_border', :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', :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' -%></td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label :page_layout %></td>
+      <td class="input"><%= f.text_field :page_layout, :class => 'thin_border' -%></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td class="checkbox">
+        <%= f.check_box :public -%>
+        <%= f.label :public %>
+      </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td class="checkbox">
+        <%= f.check_box :default -%>
+        <%= f.label :default -%>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <p class="foot_note">
+          * <%= t(:country_code_foot_note) %>
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= f.button t('save'), :class => 'button' %>
+      </td>
+    </tr>
+  </table>
 <% end %>