alchemy_cms 2.1.12 → 2.2.rc1

data/app/sweepers/alchemy/pictures_sweeper.rb

@@ -1,21 +1,21 @@
 module Alchemy
-	class PicturesSweeper < ActionController::Caching::Sweeper
-		observe Alchemy::Picture
+  class PicturesSweeper < ActionController::Caching::Sweeper
+    observe Alchemy::Picture
 
-		def after_update(picture)
-			expire_cache_for(picture)
-		end
+    def after_update(picture)
+      expire_cache_for(picture)
+    end
 
-		def after_destroy(picture)
-			expire_cache_for(picture)
-		end
+    def after_destroy(picture)
+      expire_cache_for(picture)
+    end
 
-	private
+    private
 
-		def expire_cache_for(picture)
-			# Removing all variants of the picture with FileUtils.
-			FileUtils.rm_rf(Rails.root.join('public', Alchemy.mount_point, 'pictures', picture.id.to_s))
-		end
+    def expire_cache_for(picture)
+      # Removing all variants of the picture with FileUtils.
+      FileUtils.rm_rf(Rails.root.join('public', Alchemy.mount_point, 'pictures', picture.id.to_s))
+    end
 
-	end
+  end
 end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -1,25 +1,25 @@
 <div id="alchemy_window_body">
-	<div id="overlay_toolbar">
-		<div class="button_with_label">
-			<%= link_to_overlay_window(
-				content_tag('span', '', :class => 'icon upload'),
-				alchemy.new_admin_attachment_path(
-					:content_id => @content.blank? ? nil : @content.id,
-					:swap => @swap,
-					:options => @options
-				),
-				{
-					:title => t('upload_file'),
-					:size => '540x550'
-				},
-				:title => t('upload_file'),
-				:class => 'icon_button'
-			) %>
-			<label><%= t('upload_file') %></label>
-		</div>
-		<%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
-	</div>
-	<ul id="assign_file_list" class="with_padding">
-		<%= render :partial => 'file_to_assign', :collection => @attachments %>
-	</ul>
+  <div id="overlay_toolbar">
+    <div class="button_with_label">
+      <%= link_to_overlay_window(
+            content_tag('span', '', :class => 'icon upload'),
+            alchemy.new_admin_attachment_path(
+              :content_id => @content.blank? ? nil : @content.id,
+              :swap => @swap,
+              :options => @options
+            ),
+            {
+              :title => t('upload_file'),
+              :size => '540x550'
+            },
+            :title => t('upload_file'),
+            :class => 'icon_button'
+          ) %>
+      <label><%= t('upload_file') %></label>
+    </div>
+    <%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
+  </div>
+  <ul id="assign_file_list" class="with_padding">
+    <%= render :partial => 'file_to_assign', :collection => @attachments %>
+  </ul>
 </div>

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -1,58 +1,58 @@
 <tr class="<%= cycle('even', 'odd') %>">
-	<td class="icon">
-		<%= render_icon attachment.icon_css_class %>
-	</td>
-	<td class="name">
-		<%- if permitted_to?(:show, :attachments) -%>
-		<%= link_to(
-			attachment.name,
-			alchemy.admin_attachment_path(attachment),
-			:target => '_blank',
-			:title => t('View File')
-		) %>
-		<%- else -%>
-		<%= attachment.name %>
-		<%- end -%>
-	</td>
-	<td class="file_name"><%= attachment.filename %></td>
-	<td class="file_type"><%= mime_to_human(attachment.content_type) %></td>
-	<td class="file_size"><%= number_to_human_size(attachment.size) %></td>
-	<td class="date"><%= l(attachment.created_at, :format => :short) %></td>
-	<td class="tools long">
-		<%- permitted_to?(:download, :attachments) do -%>
-		<%= link_to(
-			"",
-			alchemy.download_admin_attachment_path(attachment),
-			:title => t("download_file", :filename => attachment.filename),
-			:class => "icon file_download"
-		) %>
-		<%- end -%>
-		<%- permitted_to?(:destroy, :alchemy_admin_attachments) do -%>
-		<%= link_to_confirmation_window(
-			"",
-			t("confirm_to_delete_file"),
-			alchemy.admin_attachment_path(
-				:id => attachment,
-				:query => params[:query],
-				:page => params[:page],
-				:per_page => params[:per_page]
-			),
-			{
-				:class => 'icon file_delete',
-				:title => t('delete_file')
-			}
-		) -%>
-		<%- end -%>
-		<%- permitted_to?(:edit, :alchemy_admin_attachments) do -%>
-		<%= link_to_overlay_window("",
-			alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
-			{
-				:title => t('rename_file'),
-				:size => '380x100'
-			},
-			:class => 'icon file_edit',
-			:title => t('rename_file')
-		) -%>
-		<%- end -%>
-	</td>
+  <td class="icon">
+    <%= render_icon attachment.icon_css_class %>
+  </td>
+  <td class="name">
+    <%- if permitted_to?(:show, :attachments) -%>
+    <%= link_to(
+      attachment.name,
+      alchemy.admin_attachment_path(attachment),
+      :target => '_blank',
+      :title => t('View File')
+    ) %>
+    <%- else -%>
+    <%= attachment.name %>
+    <%- end -%>
+  </td>
+  <td class="file_name"><%= attachment.filename %></td>
+  <td class="file_type"><%= mime_to_human(attachment.content_type) %></td>
+  <td class="file_size"><%= number_to_human_size(attachment.size) %></td>
+  <td class="date"><%= l(attachment.created_at, :format => :short) %></td>
+  <td class="tools long">
+    <%- permitted_to?(:download, :attachments) do -%>
+    <%= link_to(
+      "",
+      alchemy.download_admin_attachment_path(attachment),
+      :title => t("download_file", :filename => attachment.filename),
+      :class => "icon file_download"
+    ) %>
+    <%- end -%>
+    <%- permitted_to?(:destroy, :alchemy_admin_attachments) do -%>
+    <%= link_to_confirmation_window(
+      "",
+      t("confirm_to_delete_file"),
+      alchemy.admin_attachment_path(
+        :id => attachment,
+        :query => params[:query],
+        :page => params[:page],
+        :per_page => params[:per_page]
+      ),
+      {
+        :class => 'icon file_delete',
+        :title => t('delete_file')
+      }
+    ) -%>
+    <%- end -%>
+    <%- permitted_to?(:edit, :alchemy_admin_attachments) do -%>
+    <%= link_to_overlay_window("",
+      alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
+      {
+        :title => t('rename_file'),
+        :size => '380x100'
+      },
+      :class => 'icon file_edit',
+      :title => t('rename_file')
+    ) -%>
+    <%- end -%>
+  </td>
 </tr>

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -1,20 +1,20 @@
 <%-
-	prefix = "<div class=\"assign_file_file_icon\">"
-	suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.filename}</div>"
+  prefix = "<div class=\"assign_file_file_icon\">"
+  suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.filename}</div>"
 -%>
 <%- img_tag = "#{prefix}#{render_icon(file_to_assign.icon_css_class)}#{suffix}".html_safe -%>
 <li class="assign_file_file <%= cycle('even', 'odd') %>" name="<%= file_to_assign.filename %>">
-	<%= link_to(
-		img_tag,
-		{
-			:controller => :essence_files,
-			:action => :assign,
-			:attachment_id => file_to_assign.id,
-			:id => @content.id,
-			:options => @options
-		},
-		:remote => true,
-		:method => 'put',
-		:title => file_to_assign.filename
-	) %>
+  <%= link_to(
+    img_tag,
+    {
+      :controller => :essence_files,
+      :action => :assign,
+      :attachment_id => file_to_assign.id,
+      :id => @content.id,
+      :options => @options
+    },
+    :remote => true,
+    :method => 'put',
+    :title => file_to_assign.filename
+  ) %>
 </li>

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -1,27 +1,27 @@
 <%- if @attachments.blank? && params[:query].nil? -%>
 <div class="info" id="no_files_notice">
-	<%= render_icon('info') %>
-	<%= t("no_files_in_archive") %>
+  <%= render_icon('info') %>
+  <%= t("no_files_in_archive") %>
 </div>
 <%- elsif @attachments.blank? -%>
 <div class="info">
-	<%= render_icon('info') %>
-	<%= t("no_search_results") %>
+  <%= render_icon('info') %>
+  <%= t("no_search_results") %>
 </div>
 <%- end -%>
 <table id="all_files" class="list">
-	<%- unless @attachments.blank? -%>
-	<tr>
-		<th class="icon"></th>
-		<th class="name"><%= Alchemy::Attachment.human_attribute_name('name') %></th>
-		<th class="file_name"><%= Alchemy::Attachment.human_attribute_name('filename') %></th>
-		<th class="file_type"><%= Alchemy::Attachment.human_attribute_name('content_type') %></th>
-		<th class="file_size"><%= Alchemy::Attachment.human_attribute_name('size') %></th>
-		<th class="date"><%= Alchemy::Attachment.human_attribute_name('created_at') %></th>
-		<th class="tools"></th>
-	</tr>
-	<%- end -%>
-	<%= render(:partial => @attachments) %>
+  <%- unless @attachments.blank? -%>
+  <tr>
+    <th class="icon"></th>
+    <th class="name"><%= Alchemy::Attachment.human_attribute_name('name') %></th>
+    <th class="file_name"><%= Alchemy::Attachment.human_attribute_name('filename') %></th>
+    <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('content_type') %></th>
+    <th class="file_size"><%= Alchemy::Attachment.human_attribute_name('size') %></th>
+    <th class="date"><%= Alchemy::Attachment.human_attribute_name('created_at') %></th>
+    <th class="tools"></th>
+  </tr>
+  <%- end -%>
+  <%= render :partial => 'alchemy/admin/attachments/attachment', :collection => @attachments %>
 </table>
 
 <%= paginate @attachments %>

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

@@ -1,8 +1,8 @@
 (function($) {
 <%- if @while_assigning -%>
-	$('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay.html.erb")) -%>');
+    $('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay", :formats => [:html])) -%>');
 <%- else -%>
   $('#archive_all').html('<%= escape_javascript(render(:partial => "files_list")) %>');
   Alchemy.growl('<%= @message %>');
-<%- end -%>  
+<%- end -%>
 })(jQuery);

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

@@ -1,4 +1,4 @@
 window.location.replace('<%= admin_attachments_url(
-	:per_page => params[:per_page],
-	:page => params[:page],
-	:query => params[:query]) %>');
+  :per_page => params[:per_page],
+  :page => params[:page],
+  :query => params[:query]) %>');

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

@@ -1,12 +1,12 @@
 <%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}) do |f| -%>
-	<table>
-		<tr>
-			<td class="label"><%= f.label 'name', :class => "short" %></td>
-			<td class="input"><%= f.text_field 'name', :class => 'thin_border very_long' %></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td class="submit"><%= f.button t('save'), :class => 'button' %></td>
-		</tr>
-	</table>
+  <table>
+    <tr>
+      <td class="label"><%= f.label 'name', :class => "short" %></td>
+      <td class="input"><%= f.text_field 'name', :class => 'thin_border very_long' %></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td class="submit"><%= f.button t('save'), :class => 'button' %></td>
+    </tr>
+  </table>
 <% end %>

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

@@ -1,18 +1,18 @@
 <%= toolbar(
-	:buttons => [
-		{
-			:icon => 'upload',
-			:url => alchemy.new_admin_attachment_path,
-			:overlay_options => {
-				:title => t('upload_file'),
-				:size => '540x550'
-			},
-			:title => t('upload_file'),
-			:class => 'icon_button',
-			:label => t('upload_file'),
-			:if_permitted_to => [:new, :alchemy_admin_attachments]
-		}
-	]
+  :buttons => [
+    {
+      :icon => 'upload',
+      :url => alchemy.new_admin_attachment_path,
+      :overlay_options => {
+        :title => t('upload_file'),
+        :size => '540x550'
+      },
+      :title => t('upload_file'),
+      :class => 'icon_button',
+      :label => t('upload_file'),
+      :if_permitted_to => [:new, :alchemy_admin_attachments]
+    }
+  ]
 ) %>
 
 <%= render :partial => 'files_list' %>

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

@@ -1,11 +1,11 @@
 <%= form_for([:admin, @attachment], :html => {:multipart => true}) do |f| %>
-	<%= render(
-		:partial => "alchemy/admin/partials/upload_form",
-		:locals => {
-			:file_types => configuration(:uploader)[:allowed_filetypes][:attachments],
-			:file_types_description => t('documents'),
-			:model_name => 'attachment',
-			:item_type => t('files')
-		}
-	) %>
+  <%= render(
+    :partial => "alchemy/admin/partials/upload_form",
+    :locals => {
+      :file_types => configuration(:uploader)[:allowed_filetypes][:attachments],
+      :file_types_description => t('documents'),
+      :model_name => 'attachment',
+      :item_type => t('files')
+    }
+  ) %>
 <% end %>

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

@@ -1,23 +1,23 @@
 <div class="with_padding">
-	<%- if @clipboard_items.blank? -%>
-	<div class="info">
-		<%= render_icon('info') %>
-		<%= t('No items in your clipboard') %>
-	</div>
-	<%- else -%>
-	<div id="clipboard_items">
-		<ul>
-			<%- @clipboard_items.each do |item| -%>
-			<% 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>
-		<p>
-			<%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path, :class => 'button') %>
-		</p>
-	</div>
-	<%- end -%>
+  <%- if @clipboard_items.blank? -%>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t('No items in your clipboard') %>
+  </div>
+  <%- else -%>
+  <div id="clipboard_items">
+    <ul>
+      <%- @clipboard_items.each do |item| -%>
+      <% 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>
+    <p>
+      <%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path, :class => 'button') %>
+    </p>
+  </div>
+  <%- end -%>
 </div>

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

@@ -1,14 +1,14 @@
 (function($) {
 
 <%- if params[:remove] -%>
-	$(".element_editor[data-element-id='<%= @item.id -%>']").remove();
+  $(".element_editor[data-element-id='<%= @item.id -%>']").remove();
 <%- if @item.class.to_s == 'Element' -%>
-	$('#element_area').sortable('refresh');
+  $('#element_area').sortable('refresh');
 <%- end -%>
-	Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::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 == "Alchemy::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');
+  $('#clipboard_button .icon.clipboard').addClass('full');
 
 })(jQuery);

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

@@ -11,7 +11,7 @@
           :name => name
         },
         :was_missing => true,
-				:options => options
+        :options => options
       ),
       :method => 'post',
       :remote => true,