alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,38 +1,38 @@
 <%= form_tag(
-	url_for({
-		:action => 'index',
-		:options => @options,
-		:size => @size
-	}),
-	:remote => true,
-	:method => :get
+  url_for({
+    :action => 'index',
+    :options => @options,
+    :size => @size
+  }),
+  :remote => true,
+  :method => :get
 ) do %>
-	<%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
-	<%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
-	<div class="search_field">
-	<%= render_icon('search') %>
-		<%= text_field_tag(
-			"query",
-			params['query'],
-			:class => 'thin_border',
-			:id => "search_input_field"
-		) %>
-		<%= link_to(
-			"",
-			url_for({
-				:action => 'index',
-				:element_id => @element.blank? ? "" : @element.id,
-				:content_id => @content.blank? ? "" : @content.id,
-				:options => @options,
-				:size => @size,
-				:overlay => true
-			}),
-			:remote => true,
-			:class => "search_field_clear",
-			:id => "search_field_clear",
-			:title => t("click_to_show_all"),
-			:style => (params[:query].nil? ? "display: none" : "display: block")
-		) %>
-	</div>
-	<%= submit_tag t('search'), :name => nil, :class => 'button' %>
+  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
+  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
+  <div class="search_field">
+  <%= render_icon('search') %>
+    <%= text_field_tag(
+      "query",
+      params['query'],
+      :class => 'thin_border',
+      :id => "search_input_field"
+    ) %>
+    <%= link_to(
+      "",
+      url_for({
+        :action => 'index',
+        :element_id => @element.blank? ? "" : @element.id,
+        :content_id => @content.blank? ? "" : @content.id,
+        :options => @options,
+        :size => @size,
+        :overlay => true
+      }),
+      :remote => true,
+      :class => "search_field_clear",
+      :id => "search_field_clear",
+      :title => t("click_to_show_all"),
+      :style => (params[:query].nil? ? "display: none" : "display: block")
+    ) %>
+  </div>
+  <%= submit_tag t('search'), :name => nil, :class => 'button' %>
 <% end %>

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

@@ -1,22 +1,22 @@
 <%- url_scope =
         begin
-          resource_url_scope
+          resource_url_proxy
         rescue NameError
           self
         end -%>
 <%- url ||= url_scope.url_for(:action => 'index') -%>
 <%= form_tag(url, :method => :get) do %>
-	<div class="search_field">
-		<%= render_icon('search') %>
-		<%= text_field_tag("query", params['query'], :class => 'thin_border', :id => "search_input_field") %>
-		<%= link_to(
-				"",
-				url,
-				:class => "search_field_clear",
-				:id => "search_field_clear",
-				:title => t("click_to_show_all"),
-				:style => (params[:query].nil? ? "display: none" : "display: block")
-			) %>
-	</div>
-	<label><%= t('search') %></label>
+  <div class="search_field">
+    <%= render_icon('search') %>
+    <%= text_field_tag("query", params['query'], :class => 'thin_border', :id => "search_input_field") %>
+    <%= link_to(
+        "",
+        url,
+        :class => "search_field_clear",
+        :id => "search_field_clear",
+        :title => t("click_to_show_all"),
+        :style => (params[:query].nil? ? "display: none" : "display: block")
+      ) %>
+  </div>
+  <label><%= t('search') %></label>
 <% end %>

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

@@ -1,8 +1,8 @@
 <%- entries.each do |entry| -%>
-	<%- entry.stringify_keys! -%>
-	<%- permitted_to?(*navigate_module(entry)) do -%>
-	<div class="subnavi_tab<%= admin_sub_navigation_entry_active?(entry) ? ' active' : nil %>">
-		<%= link_to t(entry["name"]), url_for_module_sub_navigation(entry) %>
-	<%- end -%>
-	</div>
+  <%- entry.stringify_keys! -%>
+  <%- permitted_to?(*navigate_module(entry)) do -%>
+  <div class="subnavi_tab<%= admin_sub_navigation_entry_active?(entry) ? ' active' : nil %>">
+    <%= link_to t(entry["name"]), url_for_module_sub_navigation(entry) %>
+  <%- end -%>
+  </div>
 <%- end -%>

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

@@ -1,129 +1,67 @@
 <div class="info">
-	<%= render_icon('info') %>
-	<p><%= t('explain_upload.intro', :name => item_type) %>:</p>
-	<ol>
-		<li><%= t('explain_upload.step1', :name => item_type) %></li>
-		<li><%= t('explain_upload.step2', :name => item_type) %>*</li>
-		<li><%= t('explain_upload.step3') %></li>
-	</ol>
-	<small>*<%= t('explain_upload.footnote', :name => item_type) %></small>
+  <%= render_icon('info') %>
+  <p><%= t('explain_upload.intro', :name => item_type) %>:</p>
+  <ol>
+    <li><%= t('explain_upload.step1', :name => item_type) %></li>
+    <li><%= t('explain_upload.step2', :name => item_type) %>*</li>
+    <li id="explain_step3"><%= t('explain_upload.step3') %></li>
+    <li id="explain_drag_n_drop"><%= t('explain_upload.dragndrop', :name => item_type) %></li>
+  </ol>
+  <%- unless file_types.first == '*' -%>
+  <p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
+  <%- end -%>
+  <small>*<%= t('explain_upload.footnote', :name => item_type) %></small>
 </div>
-<div id="swf_upload_container">
-	<div id="spanButtonPlaceHolder">
-		<p>
-			<%= image_tag('alchemy/ajax_loader.gif', :style => 'width: 16px; height: 16px; top: 3px; position: relative') %>
-			<%= t('Please wait. Flash® is loading...') %>
-		</p>
-	</div>
-	<a href="#" class="button no-spinner" onclick="swfu.cancelQueue(); return false" style="display: none">
-		<%= t("swfupload.cancel_uploads") %>
-	</a>
-</div>
-<%- if file_types.first == '*' -%>
-<p><%= t('You may upload any file') %></p>
-<%- else -%>
-<p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
-<%- end -%>
-<p style="margin-top: 8px" id="choose_alternative_uploader">
-	<small>
-		<%= raw t('If you have any problems using the Flash uploader you can switch to', :link => t('<a href="#" id="uploadswitcher">%{value}</a>', :value => t('regular method'))) %>
-	</small>
-</p>
-<h2 id="swfUploadFlashError" style="display: none"><%= t('Could not load Adobe Flash® Plugin!') %></h2>
-<div id="alternativeUpload" style="display: none">
-	<h2 id="flash_upload_error_explanation" style="display: none">
-		<%= t('Error with the Flash® Uploader!') %>
-	</h2>
-	<p><%= t('use_alternative_uploader_instead') %></p>
-	<p>
-		<%= file_field_tag('Filedata') %>
-	</p>
-	<p>
-		<%= submit_tag t('upload'), :class => 'button' %>
-	</p>
-	<p>
-		<small>
-			<a href="#" id="switch_to_flash_uploader" class="underline">
-				<%= t('Switch to Flash® Uploader') %>
-			</a>
-		</small>
-	</p>
+
+<%= render 'alchemy/admin/partials/flash_upload' %>
+
+<div class="browse">
+  <input id="multiple" type="file" multiple value="<%= t('browse') %>">
+  <a href="#" class="button no-spinner" id="cancelHTML5Queue" style="display: none">
+    <%= t("swfupload.cancel_uploads") %>
+  </a>
 </div>
-<div id="SWFUploadStatus" style="display: none" class="info">
-	<%= render_icon('info') %>
+
+<div id="dropbox"><%= t('Or drag files over here') %></div>
+
+<div class="flash notice" style="display: none; margin: 8px 0" id="upload_info_container">
+  <%= render_icon('tick') %>
+  <span id="upload_info"></span>
 </div>
+
 <div id="uploadProgressContainer"></div>
 
 <%- post_params = {
-	:query => params[:query] || '',
-	:page => 1,
-	:per_page => params[:per_page],
-	:while_assigning => @while_assigning ? "true" : "false",
-	:content_id => @content.blank? ? nil : @content.id,
-	:element_id => @element.blank? ? nil : @element.id,
-	:size => @size,
-	:options => @options.to_param
+  :while_assigning => @while_assigning ? "true" : "false",
+  :content_id => @content.blank? ? nil : @content.id,
+  :element_id => @element.blank? ? nil : @element.id,
+  :size => @size,
+  :options => @options.to_param
 }.delete_if { |k,v| v.nil? }.to_json -%>
 
 <script type='text/javascript'>
-	try {
-		var swfu = new SWFUpload({
-			flash_url: "<%= asset_path('swfupload/swfupload.swf') %>",
-			flash9_url: "<%= asset_path('swfupload/swfupload.swf') %>",
-			upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
-			post_params: <%= post_params.html_safe %>,
-			file_size_limit: "<%= configuration(:uploader)[:file_size_limit] || 100 -%> MB",
-			file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
-			file_types_description: "<%= file_types_description %>",
-			file_upload_limit: <%= configuration(:uploader)[:upload_limit] || 50 -%>,
-			file_queue_limit: 0,
-			custom_settings: {
-				language: "<%= ::I18n.locale || 'en' %>"
-			},
-			debug: false,
-			button_image_url: "<%= image_path('alchemy/swfupload/browse_button.png') %>",
-			button_width: "120",
-			button_height: "25",
-			button_placeholder_id: "spanButtonPlaceHolder",
-			button_text: "<span class='swfButtonText'><%= t('browse') %></span>",
-			button_text_style: '.swfButtonText {font-size: 11px; font-family: "Lucida Grande", Arial, sans-serif; text-align: center; color: #333333; height: 25px; padding-left: 8px; padding-right: 8px; padding-bottom: 3px; padding-top: 5px}',
-			button_text_left_padding: 0,
-			button_text_top_padding: 4,
-			swfupload_load_failed_handler: function () {
-				jQuery('#swf_upload_container').hide();
-				jQuery('#choose_alternative_uploader').hide();
-				jQuery('#switch_to_flash_uploader').hide();
-				jQuery('#swfUploadFlashError').show();
-				jQuery('#alternativeUpload').show();
-			},
-			swfupload_loaded_handler : Alchemy.SWFUpload.init,
-			file_queued_handler : Alchemy.SWFUpload.fileQueued,
-			file_queue_error_handler : Alchemy.SWFUpload.fileQueueError,
-			file_dialog_complete_handler : Alchemy.SWFUpload.fileDialogComplete,
-			upload_start_handler : Alchemy.SWFUpload.uploadStart,
-			upload_progress_handler : Alchemy.SWFUpload.uploadProgress,
-			upload_error_handler : Alchemy.SWFUpload.uploadError,
-			upload_success_handler : Alchemy.SWFUpload.uploadSuccess,
-			queue_complete_handler : Alchemy.SWFUpload.queueComplete
-		});
-		swfu.window_mode = "opaque";
-	} catch(err) {
-		Alchemy.debug(err);
-		jQuery('#swf_upload_container').hide();
-		jQuery('#choose_alternative_uploader').hide();
-		jQuery('#alternativeUpload').show();
-		jQuery('#flash_upload_error_explanation').show();
-	};
-	(function($) {
-		$('#uploadswitcher').click(function() {
-			$('#choose_alternative_uploader').hide();
-			$('#alternativeUpload').show();
-			$('object.swfupload').hide();
-		});
-		$('#switch_to_flash_uploader').click(function() {
-			$('#choose_alternative_uploader').show();
-			$('#alternativeUpload').hide();
-			$('object.swfupload').show();
-		});
-	})(jQuery);
+
+  Alchemy.Uploader.init({
+    upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
+    post_params: <%= post_params.html_safe %>,
+    file_size_limit: <%= configuration(:uploader)[:file_size_limit] || 100 -%>,
+    file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
+    file_types_description: "<%= file_types_description %>",
+    file_upload_limit: <%= configuration(:uploader)[:upload_limit] || 50 -%>,
+    locale: "<%= ::I18n.locale || 'en' %>"
+  });
+
+  (function($) {
+    $('#uploadswitcher').click(function() {
+      $('#choose_alternative_uploader').hide();
+      $('#alternativeUpload').show();
+      $('#swf_upload_container').hide();
+    });
+    $('#switch_to_flash_uploader').click(function() {
+      $('#choose_alternative_uploader').show();
+      $('#alternativeUpload').hide();
+      $('#swf_upload_container').show();
+    });
+  })(jQuery);
+
 </script>

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

@@ -1,13 +1,13 @@
 <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><%= t("no_images_in_archive") %></p>
-	<% else -%>
-		<%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
-		<%= paginate @pictures, :remote => true %>
-	<% end -%>
-	</div>
+  <div id="overlay_toolbar">
+    <%= render :partial => 'filter_and_size_bar' %>
+  </div>
+  <div id="assign_image_list" class="with_padding">
+  <% if @pictures.empty? -%>
+    <p><%= t("no_images_in_archive") %></p>
+  <% else -%>
+    <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
+    <%= paginate @pictures, :remote => true %>
+  <% end -%>
+  </div>
 </div>

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

@@ -1,73 +1,73 @@
 <div id="image_assign_filter_and_image_sizing">
-	<div class="button_with_label">
-		<%= link_to(
-			render_icon('zoom-out'),
-			alchemy.admin_pictures_path({
-				:size => "small",
-				:content_id => @content,
-				:element_id => @element,
-				:swap => @swap,
-				:query => params[:query],
-				:options => @options
-			}),
-			:remote => true,
-			:title => t("small_thumbnails"),
-			:class => "icon_button"
-		) %>
-		<%= link_to(
-			render_icon('zoom-equal'),
-			alchemy.admin_pictures_path({
-				:size => "medium",
-				:content_id => @content,
-				:element_id => @element,
-				:swap => @swap,
-				:query => params[:query],
-				:options => @options
-			}),
-			:remote => true,
-			:title => t("medium_thumbnails"),
-			:class => "icon_button"
-		) %>
-		<%= link_to(
-			render_icon('zoom-in'),
-			alchemy.admin_pictures_path({
-				:size => "large",
-				:content_id => @content,
-				:element_id => @element,
-				:swap => @swap,
-				:query => params[:query],
-				:options => @options
-			}),
-			:remote => true,
-			:title => t("big_thumbnails"),
-			:class => "icon_button"
-		) %>
-		<label><%= t('Image size') %></label>
-		<%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
-	</div>
-	<div class="toolbar_spacer"></div>
-	<div class="button_with_label">
-	<%= link_to_overlay_window(
-		render_icon('upload'),
-		alchemy.new_admin_picture_path(
-			:element_id => @element.blank? ? nil : @element.id,
-			:content_id => @content.blank? ? nil : @content.id,
-			:swap => @swap,
-			:page => params[:page],
-			:per_page => params[:per_page],
-			:size => @size,
-			:options => @options
-		),
-		{
-			:size => "540x550",
-			:title => t('upload_image')
-		},
-		{
-			:class => 'icon_button',
-			:title => t('upload_image')
-		}
-	) %>
-	<label><%= t('upload_image') %></label>
-	</div>
-	<%= render(:partial => 'alchemy/admin/partials/remote_search_form') %>
+  <div class="button_with_label">
+    <%= link_to(
+      render_icon('zoom-out'),
+      alchemy.admin_pictures_path({
+        :size => "small",
+        :content_id => @content,
+        :element_id => @element,
+        :swap => @swap,
+        :query => params[:query],
+        :options => @options
+      }),
+      :remote => true,
+      :title => t("small_thumbnails"),
+      :class => "icon_button"
+    ) %>
+    <%= link_to(
+      render_icon('zoom-equal'),
+      alchemy.admin_pictures_path({
+        :size => "medium",
+        :content_id => @content,
+        :element_id => @element,
+        :swap => @swap,
+        :query => params[:query],
+        :options => @options
+      }),
+      :remote => true,
+      :title => t("medium_thumbnails"),
+      :class => "icon_button"
+    ) %>
+    <%= link_to(
+      render_icon('zoom-in'),
+      alchemy.admin_pictures_path({
+        :size => "large",
+        :content_id => @content,
+        :element_id => @element,
+        :swap => @swap,
+        :query => params[:query],
+        :options => @options
+      }),
+      :remote => true,
+      :title => t("big_thumbnails"),
+      :class => "icon_button"
+    ) %>
+    <label><%= t('Image size') %></label>
+    <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+  </div>
+  <div class="toolbar_spacer"></div>
+  <div class="button_with_label">
+  <%= link_to_overlay_window(
+    render_icon('upload'),
+    alchemy.new_admin_picture_path(
+      :element_id => @element.blank? ? nil : @element.id,
+      :content_id => @content.blank? ? nil : @content.id,
+      :swap => @swap,
+      :page => params[:page],
+      :per_page => params[:per_page],
+      :size => @size,
+      :options => @options
+    ),
+    {
+      :size => "540x550",
+      :title => t('upload_image')
+    },
+    {
+      :class => 'icon_button',
+      :title => t('upload_image')
+    }
+  ) %>
+  <label><%= t('upload_image') %></label>
+  </div>
+  <%= render(:partial => 'alchemy/admin/partials/remote_search_form') %>
 </div>