alchemy_cms 2.0.rc2 → 2.0.rc3

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

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

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

@@ -1,8 +1,6 @@
 (function($) {
 
-<%- case @content.essence_type -%>
-
-<%- when "EssencePicture" -%>
+<%- if @content.essence_type == "EssencePicture" -%>
 
   $('#add_content_<%= @element.id -%>').before('<%= escape_javascript(
     render(
@@ -19,27 +17,31 @@
   $('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
   <%- end -%>
 
-  <%- if !@options[:maximum_amount_of_images].blank? && (@contents_of_this_type.length >= @options[:maximum_amount_of_images].to_i) -%>
+  <%- if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
   $("#add_content_<%= @element.id -%>").remove();
   <%- end -%>
 
   Alchemy.reloadPreview();
   Alchemy.closeCurrentWindow();
   
-<%- when "EssenceText" -%>
+<%- elsif @content.essence_type ==  "EssenceText" -%>
 
   <%- locals = {
     :content => @content,
     :options => {:as => 'text_field'}.merge(@options.nil? ? {} : @options)
   } -%>
+
   <%- if params[:was_missing] -%>
+
   $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
     render(
       :partial => "essences/essence_text_editor",
       :locals => locals
     )
   ) -%>');
+
   <%- else -%>
+
   $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
     render(
       :partial => "essences/essence_text_editor",
@@ -48,22 +50,27 @@
   ) -%>');
   Alchemy.reloadPreview();
   Alchemy.closeCurrentWindow();
+
   <%- end -%>
 
-<%- when "EssenceRichtext" -%>
+<%- elsif @content.essence_type ==  "EssenceRichtext" -%>
 
   <%- locals = {
     :content => @content,
     :options => (@options.nil? ? {} : @options)
   } -%>
+
   <%- if params[:was_missing] -%>
+
   $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
     render(
       :partial => "essences/essence_richtext_editor",
       :locals => locals
     )
-  ) -%>')
+  ) -%>');
+
   <%- else -%>
+
   $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
     render(
       :partial => "essences/essence_richtext_editor",
@@ -71,7 +78,9 @@
     )
   ) -%>');
   Alchemy.closeCurrentWindow();
+
   <%- end -%>
+
   TinymceHammer.addEditor('contents_content_<%= @content.id -%>_body');
 
 <%- else -%>

data/app/views/admin/elements/_add_content.html.erb

@@ -1,9 +1,7 @@
 <div class="add_content" id="add_content_<%= element.id %>">
 	<%= link_to_overlay_window(
 		render_icon('assign'),
-		url_for(
-			:controller => 'pictures',
-			:action => 'archive_overlay',
+		admin_pictures_path(
 			:element_id => element,
 			:options => options
 		),

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

@@ -2,12 +2,12 @@
   <%- if @content.essence_type == "EssenceFile" -%>
   <table>
     <tr>
-      <td><%= f.label "title", _("title") %></td>
+      <td class="label long"><%= f.label "title", _("title") %></td>
       <td><%= f.text_field "title", :class => 'thin_border long' %></td>
     </tr>
     <tr>
       <td><%= f.label "css_class", _("align_in_text") %></td>
-      <td><%= f.select "css_class", [[_("left"), "left"], [_("right"), "right"], [_("above"), "no_float"]] %></td>
+      <td><%= f.select "css_class", [[_("Layout default"), ""], [_("above"), "no_float"], [_("left"), "left"], [_("right"), "right"]] %></td>
     </tr>
     <tr>
       <td colspan="2" style="text-align:right">
@@ -18,7 +18,7 @@
   <%- elsif @content.essence_type == "EssenceFlash" -%>
   <table>
     <tr>
-      <td><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width", _("width") %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>
@@ -38,7 +38,7 @@
   <%- elsif @content.essence_type == "EssenceVideo" -%>
   <table>
     <tr>
-      <td><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width", _("width") %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>
@@ -66,7 +66,7 @@
   <%- elsif @content.essence_type == "EssenceAudio" -%>
   <table>
     <tr>
-      <td><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width", _("width") %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>

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

@@ -1,8 +1,9 @@
 (function($) {
-  
+
   $('#essence_picture_<%= @content_id -%>').remove();
   Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
-  <%- if !@options[:maximum_amount_of_images].blank? && (@essence_pictures.length == @options[:maximum_amount_of_images].to_i) -%>
+
+  <%- if !max_image_count.blank? && (@essence_pictures.length == max_image_count) -%>
   $('#element_<%= @element.id -%>_contents').append('<%= escape_javascript(
     render(
       :partial => "admin/elements/add_content",
@@ -12,6 +13,8 @@
       }
     )
   ) -%>');
+	<%- end -%>
+
   Alchemy.reloadPreview();
-  
+
 })(jQuery);

data/app/views/admin/pages/edit.html.erb

@@ -14,7 +14,7 @@
 		  	    <%= truncate page.name, :length => 15 %>
 		    </span>
 			  <% end %>
-			  <%= form_for(unlock_admin_page_path(page), :remote => true) do %>
+			  <%= form_tag(unlock_admin_page_path(page), :remote => true) do %>
 			  	  <button class="icon_button small" title="<%= _('explain_unlocking') %>">
 			  		    <%= render_icon('close small') %>
 			  	  </button>

data/app/views/admin/partials/_remote_search_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag(
 	url_for({
-		:action => (action || 'index'),
+		:action => 'index',
 		:options => @options,
 		:size => @size
 	}),
@@ -20,11 +20,12 @@
 		<%= link_to(
 			"",
 			url_for({
-				:action => action,
+				:action => 'index',
 				:element_id => @element.blank? ? "" : @element.id,
 				:content_id => @content.blank? ? "" : @content.id,
 				:options => @options,
-				:size => @size
+				:size => @size,
+				:overlay => true
 			}),
 			:remote => true,
 			:class => "search_field_clear",

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

@@ -56,8 +56,6 @@
 <div id="divStatus" style="display: none"></div>
 <div id="uploadProgressContainer"></div>
 
-<%- session_key = ActionController::Base.session[:key] -%>
-
 <%- post_params = {
 	:query => params[:query] || '',
 	:page => 1,
@@ -67,7 +65,7 @@
 	:element_id => @element.blank? ? nil : @element.id,
 	:size => @size,
 	:options => @options.to_param
-}.delete_if{|k,v|v.nil?}.to_json -%>
+}.delete_if { |k,v| v.nil? }.to_json -%>
 
 <script type='text/javascript'>
 	try {

data/app/views/admin/pictures/_archive_overlay.html.erb

@@ -0,0 +1,18 @@
+<div id="alchemy_window_body">
+	<div id="overlay_toolbar">
+		<%= render :partial => 'filter_and_size_bar' %>
+	</div>
+	<div id="assign_image_list" class="with_padding">
+	<%- if @pictures.empty? -%>
+		<p><%= _("no_images_in_archive") %></p>
+	<%- else -%>
+		<%= render(
+			:partial => 'admin/partials/remote_pagination_links',
+			:locals => {
+				:items => @pictures
+			}
+		) %>
+		<%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
+	<%- end -%>
+	</div>
+</div>

data/app/views/admin/pictures/_filter_and_size_bar.html.erb

@@ -2,8 +2,7 @@
 	<div class="button_with_label">
 		<%= link_to(
 			render_icon('zoom-out'),
-			url_for({
-				:action => "archive_overlay",
+			admin_pictures_path({
 				:size => "small",
 				:content_id => @content,
 				:element_id => @element,
@@ -17,8 +16,7 @@
 		) %>
 		<%= link_to(
 			render_icon('zoom-equal'),
-			url_for({
-				:action => "archive_overlay",
+			admin_pictures_path({
 				:size => "medium",
 				:content_id => @content,
 				:element_id => @element,
@@ -32,8 +30,7 @@
 		) %>
 		<%= link_to(
 			render_icon('zoom-in'),
-			url_for({
-				:action => "archive_overlay",
+			admin_pictures_path({
 				:size => "large",
 				:content_id => @content,
 				:element_id => @element,
@@ -52,10 +49,7 @@
 	<div class="button_with_label">
 	<%= link_to_overlay_window(
 		render_icon('upload'),
-		url_for(
-			:controller => 'admin/pictures',
-			:action => 'new',
-			:while_assigning => true,
+		new_admin_picture_path(
 			:element_id => @element.blank? ? nil : @element.id,
 			:content_id => @content.blank? ? nil : @content.id,
 			:swap => @swap,
@@ -65,7 +59,7 @@
 			:options => @options
 		),
 		{
-			:size => "355x320",
+			:size => "540x480",
 			:title => _('upload_image')
 		},
 		{
@@ -75,10 +69,5 @@
 	) %><br />
 	<label><%= _('upload_image') %></label>
 	</div>
-	<%= render(
-		:partial => 'admin/partials/remote_search_form',
-		:locals => {
-			:action => 'archive_overlay'
-		}
-	) %>
+	<%= render(:partial => 'admin/partials/remote_search_form') %>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="picture_detail" id="picture_<%= picture.id %>" name="<%= picture.name %>">
+<div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
 	<%- permitted_to?(:destroy, :admin_pictures) do -%>
 	<span class="picture_tool_delete">
 		<%= link_to_confirmation_window(
@@ -16,21 +16,19 @@
 		) -%>
 	</span>
 	<%- end -%>
-	<div class="picture_image">
-		<div class="image_spinner spinner">
-			<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-		</div>
-		<%= link_to_function(
-			image_tag(
-				thumbnail_path(:id => picture, :size => "111x93"),
-				:alt => picture.name,
-				:title => _('zoom_image'),
-				:onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
-				:style => "display: none;"
-			),
-			"Alchemy.zoomImage('/admin/pictures/#{picture.id}/show_in_window', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
-			:class => 'thumbnail_background'
-		) %>
+	<div class="image_spinner spinner">
+		<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
 	</div>
+	<%= link_to_function(
+		image_tag(
+			thumbnail_path(:id => picture, :size => @size),
+			:alt => picture.name,
+			:title => _('zoom_image'),
+			:onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
+			:style => "display: none;"
+		),
+		"Alchemy.zoomImage('/admin/pictures/#{picture.id}/show_in_window', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+		:class => 'thumbnail_background'
+	) %>
 	<span class="picture_name<%= ' rename' if permitted_to?(:edit, :admin_pictures) -%>" title="<%= permitted_to?(:edit, :admin_pictures) ? picture.name + ' (' + _('Click to rename') + ')' : picture.name %>" id="image_<%= dom_id(picture) %>_name"><%= picture.name %></span>
 </div>

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

@@ -1,33 +1,31 @@
-<div class="assign_image_list_detail <%= size.blank? ? 'small' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
-	<div class="assign_image_list_image">
-	<%- unless params[:image_assign_url].blank? -%>
-		<%- 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' -%>
-	<%- end -%>
-		<div class="image_spinner spinner">
-			<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-		</div>
-		<%= link_to(
-			image_tag(
-				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 => _("assign_image"),
-			:class => 'thumbnail_background'
-		) %>
+<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] -%>
+<%- else -%>
+	<%- 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>
-	<div class="picture_to_assign_name" title="<%= picture_to_assign.name %>">
+	<%= link_to(
+		image_tag(
+			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 => _("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/admin/pictures/create.js.erb

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

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

@@ -6,7 +6,7 @@
 		<div class="button_with_label">
 			<%= link_to_overlay_window(
 				content_tag('span', '', :class => 'icon upload'),
-				new_admin_picture_path,
+				new_admin_picture_path(:size => @size),
 				{
 					:title => _('upload_image'),
 					:size => '540x480'
@@ -17,7 +17,41 @@
 			<label><%= _('upload_image') %></label>
 		</div>
 		<%- end -%>
+		<div class="toolbar_spacer"></div>		
+		<div class="button_with_label">
+			<%= link_to(
+				render_icon('zoom-out'),
+				admin_pictures_path({
+					:size => "small",
+					:query => params[:query]
+				}),
+				:title => _("small_thumbnails"),
+				:class => "icon_button"
+			) %>
+			<%= link_to(
+				render_icon('zoom-equal'),
+				admin_pictures_path({
+					:size => "medium",
+					:query => params[:query]
+				}),
+				:title => _("medium_thumbnails"),
+				:class => "icon_button"
+			) %>
+			<%= link_to(
+				render_icon('zoom-in'),
+				admin_pictures_path({
+					:size => "large",
+					:query => params[:query]
+				}),
+				:title => _("big_thumbnails"),
+				:class => "icon_button"
+			) %><br />
+			<label class="sup"><%= _('Image size') %></label>
+			<%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+		</div>
+
 		<%- permitted_to?(:flush, :admin_pictures) do -%>
+		<div class="toolbar_spacer"></div>		
 		<div class="button_with_label">
 			<%= link_to(
 				content_tag('span', '', :class => 'icon flush'),
@@ -32,10 +66,6 @@
 		</div>
 		<%- end -%>
 	</div>
-	<div class="toolbar_spacer"></div>
-	<div id="toolbar_links">
-		<%= render :partial => 'admin/partials/per_page_links', :locals => {:label => _('images'), :values => ['32', '64', 'all']} %>
-	</div>
 	<%= render :partial => 'admin/partials/search_form' %>
 </div>
 <%- end -%>