alchemy_cms 2.1.12 → 2.2.rc1

data/app/views/alchemy/admin/pictures/_picture.html.erb

@@ -1,34 +1,34 @@
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
-	<%- permitted_to?(:destroy, :alchemy_admin_pictures) do -%>
-	<span class="picture_tool_delete">
-		<%= link_to_confirmation_window(
-			"",
-			t("confirm_to_delete_image_from_server"),
-			alchemy.admin_picture_path(
-				:id => picture,
-				:query => params[:query],
-				:page => params[:page],
-				:per_page => params[:per_page]
-			),
-			{
-				:title => t('Delete image')
-			}
-		) -%>
-	</span>
-	<%- end -%>
-	<div class="image_spinner spinner">
-		<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-	</div>
-	<%= link_to_function(
-		image_tag(
-			alchemy.thumbnail_path(:id => picture, :size => @size),
-			:alt => picture.name,
-			:title => t('zoom_image'),
-			:onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
-			:style => "display: none;"
-		),
-		"Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
-		:class => 'thumbnail_background'
-	) %>
-	<span class="picture_name<%= ' rename' if permitted_to?(:edit, :alchemy_admin_pictures) -%>" title="<%= permitted_to?(:edit, :alchemy_admin_pictures) ? picture.name + ' (' + t('Click to rename') + ')' : picture.name %>" id="image_picture_<%= picture.id %>_name"><%= picture.name %></span>
+  <%- permitted_to?(:destroy, :alchemy_admin_pictures) do -%>
+  <span class="picture_tool_delete">
+    <%= link_to_confirmation_window(
+      "",
+      t("confirm_to_delete_image_from_server"),
+      alchemy.admin_picture_path(
+        :id => picture,
+        :query => params[:query],
+        :page => params[:page],
+        :per_page => params[:per_page]
+      ),
+      {
+        :title => t('Delete image')
+      }
+    ) -%>
+  </span>
+  <%- end -%>
+  <div class="image_spinner spinner">
+    <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
+  </div>
+  <%= link_to_function(
+    image_tag(
+      alchemy.thumbnail_path(:id => picture, :size => @size),
+      :alt => picture.name,
+      :title => t('zoom_image'),
+      :onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
+      :style => "display: none;"
+    ),
+    "Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+    :class => 'thumbnail_background'
+  ) %>
+  <span class="picture_name<%= ' rename' if permitted_to?(:edit, :alchemy_admin_pictures) -%>" title="<%= permitted_to?(:edit, :alchemy_admin_pictures) ? picture.name + ' (' + t('Click to rename') + ')' : picture.name %>" id="image_picture_<%= picture.id %>_name"><%= picture.name %></span>
 </div>

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -1,31 +1,31 @@
 <div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
 <%- unless params[:image_assign_url].blank? -%>
-	<%- action_url = params[:image_assign_url] + "?picture_id=#{picture_to_assign.id}" -%>
-	<%- action_method = params[:image_assign_method] -%>
+  <%- action_url = params[:image_assign_url] + "?picture_id=#{picture_to_assign.id}" -%>
+  <%- action_method = params[:image_assign_method] -%>
 <%- else -%>
-	<%- action_url = create_or_assign_url(picture_to_assign, @options) -%>
-	<%- action_method = @content.blank? ? 'post' : 'put' -%>
+  <%- action_url = create_or_assign_url(picture_to_assign, @options) -%>
+  <%- action_method = @content.blank? ? 'post' : 'put' -%>
 <%- end -%>
-	<div class="image_spinner spinner">
-		<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-	</div>
-	<%= link_to(
-		image_tag(
-			alchemy.thumbnail_path(
-				:id => picture_to_assign,
-				:size => size
-			),
-			:alt => picture_to_assign.name,
-			:onload => "Alchemy.fadeImage(this, '#picture_to_assign_#{picture_to_assign.id} .image_spinner');",
-			:style => "display: none;"
-		),
-		action_url,
-		:remote => true,
-		:method => action_method,
-		:title => t("assign_image"),
-		:class => 'thumbnail_background'
-	) %>
-	<div class="picture_name" title="<%= picture_to_assign.name %>">
-		<%= picture_to_assign.name.empty? ? "&nbsp;" : picture_to_assign.name %>
-	</div>
+  <div class="image_spinner spinner">
+    <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
+  </div>
+  <%= link_to(
+    image_tag(
+      alchemy.thumbnail_path(
+        :id => picture_to_assign,
+        :size => size
+      ),
+      :alt => picture_to_assign.name,
+      :onload => "Alchemy.fadeImage(this, '#picture_to_assign_#{picture_to_assign.id} .image_spinner');",
+      :style => "display: none;"
+    ),
+    action_url,
+    :remote => true,
+    :method => action_method,
+    :title => t("assign_image"),
+    :class => 'thumbnail_background'
+  ) %>
+  <div class="picture_name" title="<%= picture_to_assign.name %>">
+    <%= picture_to_assign.name.empty? ? "&nbsp;" : picture_to_assign.name %>
+  </div>
 </div>

data/app/views/alchemy/admin/pictures/_pictures_list.html.erb

@@ -1,16 +1,16 @@
 <%- if @pictures.blank? && params[:query].nil? -%>
 <div class="info">
-	<%= render_icon('info') %>
-	<%= t("no_images_in_archive") %>
+  <%= render_icon('info') %>
+  <%= t("no_images_in_archive") %>
 </div>
 <%- elsif @pictures.blank? -%>
 <div class="info">
-	<%= render_icon('info') %>
-	<%= t("no_search_results") %>
+  <%= render_icon('info') %>
+  <%= t("no_search_results") %>
 </div>
 <%- else  -%>
 <div id="pictures">
-	<%= render :partial => 'picture', :collection => @pictures %>
-	<%= paginate @pictures %>
+  <%= render :partial => 'picture', :collection => @pictures %>
+  <%= paginate @pictures %>
 </div>
 <%- end -%>

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

@@ -1,12 +1,12 @@
 (function($) {
 <%- if @while_assigning -%>
-	$('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) -%>');
+  $('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) -%>');
 <%- else -%>
-	$('#picture_archive').html('<%= escape_javascript(render(:partial => "pictures_list")) -%>');
-	Alchemy.inPlaceEditor({
-		save_label: "<%= t('save') -%>",
-		cancel_label: "<%= t('cancel') -%>"
-	});
+  $('#picture_archive').html('<%= escape_javascript(render(:partial => "pictures_list")) -%>');
+  Alchemy.inPlaceEditor({
+    save_label: "<%= t('save') -%>",
+    cancel_label: "<%= t('cancel') -%>"
+  });
 <%- end -%>
-	Alchemy.growl('<%= @message -%>');
+  Alchemy.growl('<%= @message -%>');
 })(jQuery);

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

@@ -1,83 +1,83 @@
 <%- content_for(:toolbar) do -%>
 <div id="toolbar_buttons">
-	<%= toolbar_button(
-		:icon => 'upload',
-		:label => t('upload_image'),
-		:url => alchemy.new_admin_picture_path(:size => @size),
-		:overlay_options => {
-			:title => t('upload_image'),
-			:size => '540x550'
-		},
-		:class => 'icon_button',
-		:title => t('upload_image'),
-		:if_permitted_to => [:new, :alchemy_admin_pictures]
-	) %>
-	<div class="toolbar_spacer"></div>
-	<div class="button_with_label">
-		<%= link_to(
-			render_icon('zoom-out'),
-			alchemy.admin_pictures_path({
-				:size => "small",
-				:query => params[:query]
-			}),
-			:title => t("small_thumbnails"),
-			:class => "icon_button please_wait"
-		) %>
-		<%= link_to(
-			render_icon('zoom-equal'),
-			alchemy.admin_pictures_path({
-				:size => "medium",
-				:query => params[:query]
-			}),
-			:title => t("medium_thumbnails"),
-			:class => "icon_button please_wait"
-		) %>
-		<%= link_to(
-			render_icon('zoom-in'),
-			alchemy.admin_pictures_path({
-				:size => "large",
-				:query => params[:query]
-			}),
-			:title => t("big_thumbnails"),
-			:class => "icon_button please_wait"
-		) %>
-		<label><%= t('Image size') %></label>
-		<%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
-	</div>
+  <%= toolbar_button(
+    :icon => 'upload',
+    :label => t('upload_image'),
+    :url => alchemy.new_admin_picture_path(:size => @size),
+    :overlay_options => {
+      :title => t('upload_image'),
+      :size => '540x590'
+    },
+    :class => 'icon_button',
+    :title => t('upload_image'),
+    :if_permitted_to => [:new, :alchemy_admin_pictures]
+  ) %>
+  <div class="toolbar_spacer"></div>
+  <div class="button_with_label">
+    <%= link_to(
+      render_icon('zoom-out'),
+      alchemy.admin_pictures_path({
+        :size => "small",
+        :query => params[:query]
+      }),
+      :title => t("small_thumbnails"),
+      :class => "icon_button please_wait"
+    ) %>
+    <%= link_to(
+      render_icon('zoom-equal'),
+      alchemy.admin_pictures_path({
+        :size => "medium",
+        :query => params[:query]
+      }),
+      :title => t("medium_thumbnails"),
+      :class => "icon_button please_wait"
+    ) %>
+    <%= link_to(
+      render_icon('zoom-in'),
+      alchemy.admin_pictures_path({
+        :size => "large",
+        :query => params[:query]
+      }),
+      :title => t("big_thumbnails"),
+      :class => "icon_button please_wait"
+    ) %>
+    <label><%= t('Image size') %></label>
+    <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+  </div>
 
-	<%- permitted_to?(:flush, :alchemy_admin_pictures) do -%>
-	<div class="toolbar_spacer"></div>
-	<%= toolbar_button(
-		:icon => 'flush',
-		:url => alchemy.flush_admin_pictures_path,
-		:overlay => false,
-		:link_options => {
-			:remote => true,
-			:method => :post
-		},
-		:label => t('Flush picture cache'),
-		:class => 'icon_button please_wait',
-		:title => t('Flush picture cache'),
-		:skip_permission_check => true
-	) %>
-	<%- end -%>
+  <%- permitted_to?(:flush, :alchemy_admin_pictures) do -%>
+  <div class="toolbar_spacer"></div>
+  <%= toolbar_button(
+    :icon => 'flush',
+    :url => alchemy.flush_admin_pictures_path,
+    :overlay => false,
+    :link_options => {
+      :remote => true,
+      :method => :post
+    },
+    :label => t('Flush picture cache'),
+    :class => 'icon_button please_wait',
+    :title => t('Flush picture cache'),
+    :skip_permission_check => true
+  ) %>
+  <%- end -%>
 </div>
 <%= render :partial => 'alchemy/admin/partials/search_form' %>
 <%- end -%>
 
 <div id="picture_archive">
-	<%= render :partial => 'pictures_list' %>
+  <%= render :partial => 'pictures_list' %>
 </div>
 
 <%- content_for :javascripts do -%>
 <script type="text/javascript" charset="utf-8">
 
-	jQuery(document).ready(function($) {
-		Alchemy.inPlaceEditor({
-			save_label: "<%= t('save') %>",
-			cancel_label: "<%= t('cancel') %>"
-		});
-	});
+  jQuery(document).ready(function($) {
+    Alchemy.inPlaceEditor({
+      save_label: "<%= t('save') %>",
+      cancel_label: "<%= t('cancel') %>"
+    });
+  });
 
 </script>
 <%- end -%>

data/app/views/alchemy/admin/pictures/show_in_window.html.erb

@@ -1,6 +1,7 @@
 <%= image_tag(
-	alchemy.zoom_picture_path(
-		:id => @picture.id,
-		:name => @picture.urlname
-	)
+  alchemy.zoom_picture_path(
+    :id => @picture.id,
+    :name => @picture.urlname,
+    :format => (Alchemy::Config.get(:image_output_format) or 'png')
+  )
 ) %>

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

@@ -1,20 +1,26 @@
-<%= form_for [resource_url_scope, :admin, resource_instance_variable], :remote => true do |f| %>
-	<div id="errors" style="display: none"></div>
-	<table>
-		<%- resource_attributes.each do |attribute| -%>
-		<tr>
-			<td class="label"><%= f.send :label, attribute[:name] %></td>
-			<%- if attribute[:type] == :boolean -%>
-			<td class="checkbox"><%= f.send :check_box, attribute[:name] -%></td>
-			<%- else -%>
-			<td class="input"><%= f.send :text_field, attribute[:name], :class => 'thin_border long' -%></td>
-			<%- end -%>
-		</tr>
-		<%- end -%>
-		<tr>
-			<td class="submit" colspan="2">
-				<%= f.button t('save'), :class => 'button' %>
-			</td>
-		</tr>
-	</table>
+<%= form_for resource_instance_variable, :url => resource_path(resource_instance_variable), :remote => true do |f| %>
+  <div id="errors" style="display: none"></div>
+  <table>
+    <%- resource_handler.attributes.each do |attribute| -%>
+    <tr>
+      <%- if attribute[:type] == :boolean -%>
+      <td></td>
+      <td class="checkbox">
+        <%= f.send :check_box, attribute[:name] -%>
+        <%= f.send :label, attribute[:name] %>
+      </td>
+      <%- elsif attribute[:type] == :text -%>
+      <td class="input"><%= f.send :text_area, attribute[:name] -%></td>
+      <%- else -%>
+      <td class="label"><%= f.send :label, attribute[:name] %></td>
+      <td class="input"><%= f.send :text_field, attribute[:name], :class => 'thin_border' -%></td>
+      <%- end -%>
+    </tr>
+    <%- end -%>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= f.button t('save'), :class => 'button' %>
+      </td>
+    </tr>
+  </table>
 <% end %>

data/app/views/alchemy/admin/resources/_resource.html.erb

@@ -1,38 +1,39 @@
 <tr class="<%= cycle('even', 'odd') %>">
-	<%- resource_attributes.each do |attribute| -%>
-	<%- if attribute[:type] == :boolean -%>
-	<td class="center">
-		<% attr_value = resource.send(attribute[:name]) %>
-		<%= attr_value.blank? ? '' : render_icon(attr_value) -%>
-	</td>
-	<%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
-	<td class="right"><%= resource.send(attribute[:name]) -%></td>
-	<%- else -%>
-	<td><%= resource.send(attribute[:name]) -%></td>
-	<%- end -%>
-	<%- end -%>
-	<td class="tools">
-		<%- permitted_to?(:destroy, resources_permission) do -%>
-		<%= link_to_confirmation_window(
-			'',
-			t("Are you sure?"),
-			resource_url_scope.send("admin_#{resource_model_name}_path", resource),
-			:title => t("Delete"),
-			:class => "icon destroy"
-		) -%>
-		<%- end -%>
-		<%- permitted_to?(:edit, resources_permission) do -%>
-		<%= link_to_overlay_window(
-			'',
-			resource_url_scope.send("edit_admin_#{resource_model_name}_path", resource),
-			{
-				:title => t("Edit")
-			},
-			{
-				:class => "icon edit",
-				:title => t("Edit")
-			}
-		) -%>
-		<%- end -%>
-	</td>
+  <%- resource_handler.attributes.each do |attribute| -%>
+  <%- if attribute[:type] == :boolean -%>
+  <td class="center">
+    <% attr_value = resource.send(attribute[:name]) %>
+    <%= attr_value.blank? ? '' : render_icon(attr_value) -%>
+  </td>
+  <%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
+  <td class="right"><%= resource.send(attribute[:name]) -%></td>
+  <%- else -%>
+  <td><%= resource.send(attribute[:name]) -%></td>
+  <%- end -%>
+  <%- end -%>
+  <td class="tools">
+    <%- permitted_to?(:destroy, resource_permission_scope) do -%>
+    <%= link_to_confirmation_window(
+      '',
+      t("Are you sure?"),
+      resource_path(resource),
+      :title => t("Delete"),
+      :class => "icon destroy",
+      :id => "delete_#{resource_handler.model_name}_#{resource.id}"
+    ) -%>
+    <%- end -%>
+    <%- permitted_to?(:edit, resource_permission_scope) do -%>
+    <%= link_to_overlay_window(
+      '',
+      edit_resource_path(resource),
+      {
+        :title => t("Edit")
+      },
+      {
+        :class => "icon edit",
+        :title => t("Edit")
+      }
+    ) -%>
+    <%- end -%>
+  </td>
 </tr>