alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -1,7 +1,7 @@
-<%- content_for(:subnav_additions) do -%>
-<%- unless @locked_pages.blank? -%>
+<% content_for(:subnav_additions) do %>
+<% unless @locked_pages.blank? %>
 <label><%= _t('Active Pages') %> &raquo;</label>
-<%- @locked_pages.each do |page| -%>
+<% @locked_pages.each do |page| %>
 <div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
   <%= link_to alchemy.edit_admin_page_path(page) do %>
   <span class="page_name" title="<%= page.name %>">
@@ -9,19 +9,19 @@
   </span>
   <% end %>
   <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-    <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
+    <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
       <%= render_icon('close small') %>
     </button>
   <% end %>
 </div>
-<%- end -%>
-<%- end -%>
-<%- end -%>
+<% end %>
+<% end %>
+<% end %>
 
-<%- content_for :toolbar do -%>
-<div id="toolbar_buttons">
+<% content_for :toolbar do %>
+<div class="toolbar_buttons">
   <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
-  <%- permitted_to?(:flush, :alchemy_admin_pages) do -%>
+  <% permitted_to?(:flush, :alchemy_admin_pages) do %>
   <div class="button_with_label">
     <%= link_to(
       render_icon('flush'),
@@ -30,11 +30,11 @@
       :method => :post,
       :class => 'icon_button please_wait',
       :title => _t('Flush page cache')
-    ) -%>
+    ) %>
     <label><%= _t('Flush page cache') %></label>
   </div>
-  <%- end -%>
-  <%- permitted_to?(:sort, :alchemy_admin_pages) do -%>
+  <% end %>
+  <% permitted_to?(:sort, :alchemy_admin_pages) do %>
   <div class="button_with_label" id="page_sorting_button">
     <%= link_to(
       render_icon('sort'),
@@ -44,10 +44,10 @@
       :remote => true,
       :class => 'icon_button please_wait',
       :title => _t('Sort pages')
-    ) -%>
+    ) %>
     <label><%= _t('Sort pages') %></label>
   </div>
-  <%- end -%>
+  <% end %>
   <div class="button_with_label" id="clipboard_button">
     <%= link_to_overlay_window(
       render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
@@ -58,26 +58,37 @@
       },
       :class => 'icon_button',
       :title => _t('Show clipboard')
-    ) -%>
+    ) %>
     <label><%= _t('Show clipboard') %></label>
   </div>
 </div>
-<%- end -%>
+<div class="js_filter_field_box">
+  <input name="filter" id="search_field" class="thin_border js_filter_field">
+  <%= render_icon :search %>
+  <%= link_to('', '#', {
+    class: "js_filter_field_clear",
+    title: _t(:click_to_show_all)
+  }) %>
+  <label><%= _t :search %></label>
+</div>
+<% end %>
 
 <div id="archive_all">
-<%- if @page_root -%>
+<% if @page_root %>
 
   <div id="sort_panel" style="display: none">
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t('explain_sitemap_dragndrop_sorting') %>
+      <%= _t(:explain_sitemap_dragndrop_sorting) %>
     </div>
     <div class="buttons">
-      <%= link_to( _t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
+      <%= link_to( _t(:cancel), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
       <%= submit_tag( _t('save order'), :id => 'save_page_order', :class => 'button' ) %>
     </div>
   </div>
 
+  <h1 id="page_filter_result"></h1>
+
   <h2 id="sitemap_heading">
     <span class="page_name"><%= _t('Name') %></span>
     <span class="page_infos"><%= _t('Status') %></span>
@@ -85,7 +96,7 @@
 
   <%= render :partial => 'sitemap' %>
 
-<%- else -%>
+<% else %>
 
   <%= render :partial => 'create_language_form' %>
   <% content_for(:javascripts) do %>
@@ -96,7 +107,7 @@
       }});
     });
   </script>
-  <%- end -%>
+  <% end %>
 
-<% end -%>
+<% end %>
 </div>

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

@@ -33,7 +33,7 @@
         <tr>
           <td class="label">&nbsp;</td>
           <td class="submit">
-            <%= f.button _t("paste"), :class => 'button', :name => nil %>
+            <%= f.button _t(:paste), :class => 'button', :name => nil %>
           </td>
         </tr>
       </table>

data/app/views/alchemy/admin/pages/sort.js.erb

@@ -1,7 +1,7 @@
 (function($) {
   $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
   $('#sort_panel').show();
-  $('#sitemap_heading').css({'padding-top': 82});
+  $('#sitemap_heading').css({'padding-top': 102});
   Alchemy.PageSorter.init();
   Alchemy.pleaseWaitOverlay(false);
 })(jQuery);

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

@@ -1,7 +1,6 @@
 <div id="swf_upload_container" style="display: block">
   <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>
@@ -21,12 +20,12 @@
   <h2 id="flash_upload_error_explanation" style="display: none">
     <%= _t('Error with the Flash® Uploader!') %>
   </h2>
-  <p><%= _t('use_alternative_uploader_instead') %></p>
+  <p><%= _t(:use_alternative_uploader_instead) %></p>
   <p>
     <%= file_field_tag('Filedata') %>
   </p>
   <p>
-    <%= submit_tag _t('upload'), :class => 'button' %>
+    <%= submit_tag _t(:upload), :class => 'button' %>
   </p>
   <p>
     <small>

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

@@ -30,9 +30,9 @@
       :remote => true,
       :class => "search_field_clear",
       :id => "search_field_clear",
-      :title => _t("click_to_show_all"),
+      :title => _t(:click_to_show_all),
       :style => (params[:query].nil? ? "display: none" : "display: block")
     ) %>
   </div>
-  <%= submit_tag _t('search'), :name => nil, :class => 'button' %>
+  <%= submit_tag _t(:search), :name => nil, :class => 'button' %>
 <% end %>

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

@@ -5,7 +5,7 @@
           self
         end -%>
 <%- url ||= url_scope.url_for(:action => 'index') -%>
-<%= form_tag(url, :method => :get) do %>
+<%= form_tag(url, :method => :get, class: 'search_form') do %>
   <div class="search_field">
     <%= render_icon('search') %>
     <%= text_field_tag("query", params['query'], :class => 'thin_border', :id => "search_input_field") %>
@@ -14,9 +14,9 @@
         url,
         :class => "search_field_clear",
         :id => "search_field_clear",
-        :title => _t("click_to_show_all"),
+        :title => _t(:click_to_show_all),
         :style => (params[:query].nil? ? "display: none" : "display: block")
       ) %>
   </div>
-  <label><%= _t('search') %></label>
+  <label><%= _t(:search) %></label>
 <% end %>

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

@@ -16,8 +16,8 @@
 <%= render 'alchemy/admin/partials/flash_upload' %>
 
 <div class="browse">
-  <%= label_tag :multiple, _t('browse'), :style => 'display:none;' %>
-  <input name="Filedata" id="multiple" type="file" multiple value="<%= _t('browse') %>">
+  <%= label_tag :multiple, _t(:browse), :style => 'display:none;' %>
+  <input name="Filedata" id="multiple" type="file" multiple value="<%= _t(:browse) %>">
   <a href="#" class="button no-spinner" id="cancelHTML5Queue" style="display: none">
     <%= _t("swfupload.cancel_uploads") %>
   </a>

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

@@ -1,12 +1,12 @@
 <div id="library_sidebar">
   <%= render :partial => 'filter_bar' %>
-  <div id="tag_list">
+  <div id="tag_list" class="with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
     <%= render :partial => 'tag_list' %>
   </div>
 </div>
 <%= form_tag delete_multiple_admin_pictures_path, :method => :delete do %>
   <div class="selected_item_tools">
-    <h2><%= _t("edit_selected_pictures") %></h2>
+    <h2><%= _t(:edit_selected_pictures) %></h2>
     <%= link_to(
       render_icon('edit') + _t("Edit"),
       edit_multiple_admin_pictures_path,
@@ -16,12 +16,12 @@
       :style => 'float: none'
     ) %>
     <%= button_tag render_icon('destroy') + _t("Delete"), 'data-alchemy-confirm' => {
-      :title => _t("please_confirm"),
-      :message => _t("confirm_to_delete_images_from_server"),
+      :title => _t(:please_confirm),
+      :message => _t(:confirm_to_delete_images_from_server),
       :okLabel => _t("Yes"),
       :cancelLabel => _t("No")
     }.to_json, :class => 'button with_icon' %>
-    &nbsp;<%= _t('or') %>&nbsp;
+    &nbsp;<%= _t(:or) %>&nbsp;
     <%= link_to(
       render_icon('delete-small') + _t("Clear selection"),
       admin_pictures_path(
@@ -39,12 +39,12 @@
   <% if @pictures.blank? and @recent_pictures.blank? and params[:query].nil? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t("no_images_in_archive") %>
+      <%= _t(:no_images_in_archive) %>
     </div>
   <% elsif @pictures.blank? and @recent_pictures.blank? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t("no_search_results") %>
+      <%= _t(:no_search_results) %>
     </div>
   <% else %>
     <%= render :partial => 'picture', :collection => @pictures %>

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

@@ -2,7 +2,7 @@
   <div id="overlay_toolbar">
     <%= render 'filter_and_size_bar' %>
   </div>
-  <div id="assign_image_list" class="with_padding">
+  <div id="assign_image_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
     <div id="library_sidebar">
       <%= render 'filter_bar' %>
       <div id="tag_list">

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

@@ -11,7 +11,7 @@
         :options => @options
       }),
       :remote => true,
-      :title => _t("small_thumbnails"),
+      :title => _t(:small_thumbnails),
       :class => "icon_button"
     ) %>
     <%= link_to(
@@ -25,7 +25,7 @@
         :options => @options
       }),
       :remote => true,
-      :title => _t("medium_thumbnails"),
+      :title => _t(:medium_thumbnails),
       :class => "icon_button"
     ) %>
     <%= link_to(
@@ -39,7 +39,7 @@
         :options => @options
       }),
       :remote => true,
-      :title => _t("big_thumbnails"),
+      :title => _t(:big_thumbnails),
       :class => "icon_button"
     ) %>
     <label><%= _t('Image size') %></label>
@@ -59,14 +59,14 @@
       ),
       {
         :size => "540x550",
-        :title => _t('upload_image')
+        :title => _t(:upload_image)
       },
       {
         :class => 'icon_button',
-        :title => _t('upload_image')
+        :title => _t(:upload_image)
       }
     ) %>
-    <label><%= _t('upload_image') %></label>
+    <label><%= _t(:upload_image) %></label>
   </div>
   <%= render :partial => 'alchemy/admin/partials/remote_search_form' %>
 </div>

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

@@ -1,13 +1,13 @@
-<% params_to_keep = [:size, :tagged_with, :query, :element_id, :content_id, :_] %>
+<% params_to_keep = [:size, :tagged_with, :query, :element_id, :options, :content_id, :_] %>
 
 <div id="filter_bar">
   <h2><%= _t('Filter') %></h2>
   <%= select_tag(
     'picture_filter',
     options_for_select([
-      [_t("all_pictures"), ''],
-      [_t("last_upload_only"), 'last_upload'],
-      [_t("recently_uploaded_only"), 'recent']
+      [_t(:all_pictures), ''],
+      [_t(:last_upload_only), 'last_upload'],
+      [_t(:recently_uploaded_only), 'recent']
     ], params[:filter]),
     :data => { :remote => !!request.xhr? },
     :class => 'alchemy_selectbox'

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

@@ -1,7 +1,7 @@
 <% if @pictures.empty? %>
   <div class="info">
     <%= render_icon('info') %>
-    <%= _t("no_images_in_archive") %>
+    <%= _t(:no_images_in_archive) %>
   </div>
 <% else %>
   <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>

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

@@ -6,7 +6,7 @@
   <span class="picture_tool delete">
     <%= link_to_confirmation_window(
       "",
-      _t("confirm_to_delete_image_from_server"),
+      _t(:confirm_to_delete_image_from_server),
       alchemy.admin_picture_path(
         :id => picture,
         :query => params[:query],
@@ -65,19 +65,14 @@
     ) -%>
   </span>
   <% end %>
-  <div class="image_spinner spinner">
-    <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-  </div>
   <%= link_to(
     image_tag(
       alchemy.thumbnail_path(:id => picture, :size => @size, :sh => picture.security_token(:size => @size)),
       :alt => picture.name,
-      :title => _t('zoom_image'),
-      :onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
-      :style => "display: none;"
+      :title => _t(:zoom_image)
     ),
     '#',
-    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(:id => picture.id, :sh => picture.security_token)}', '#{picture.name}', #{picture.image_file_width || 320}, #{picture.image_file_height || 240})",
+    :onclick => "Alchemy.zoomImage('#{admin_picture_path(:id => picture.id, :sh => picture.security_token)}', '#{picture.name}', #{picture.image_file_width || 320}, #{picture.image_file_height || 240})",
     :class => 'thumbnail_background',
     :id => 'show_in_window'
   ) %>

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

@@ -1,14 +1,11 @@
 <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>
+<% 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 %>
   <%= link_to(
     image_tag(
       alchemy.thumbnail_path(
@@ -16,15 +13,13 @@
         :size => size,
         :sh => picture_to_assign.security_token(:size => size)
       ),
-      :alt => picture_to_assign.name,
-      :onload => "Alchemy.fadeImage(this, '#picture_to_assign_#{picture_to_assign.id} .image_spinner');",
-      :style => "display: none;"
+      :alt => picture_to_assign.name
     ),
     action_url,
     :remote => true,
     :onclick => '$(self).attr("href", "#").off("click")',
     :method => action_method,
-    :title => _t("assign_image"),
+    :title => _t(:assign_image),
     :class => 'thumbnail_background'
   ) %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">

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

@@ -1,29 +1,31 @@
 <% p = params.dup %>
-<h2><%= _t("Filter by tag") %></h2>
-<%#= js_filter_field :onkeyup => "Alchemy.ListFilter('#tag_list li')", :id => 'tag_list_filter' %>
-<ul>
-  <% Alchemy::Picture.tag_counts.each do |t| %>
-    <% picture_tags = pictures_filtered_by_tag?(t) ? picture_tag_filter(:remove => t) : picture_tag_filter(:add => t) %>
-    <%= content_tag 'li', :name => t.name, :class => p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
-      <%= link_to(
-        "#{t.name} (#{t.count})",
-        url_for(
-          p.delete_if { |k, v| k == "page" }.merge(
-            :action => :index,
-            :tagged_with => picture_tags
-          )
-        ),
-        :remote => request.xhr?,
-        :class => 'please_wait'
-      ) %>
+<% if Alchemy::Picture.tag_counts.any? %>
+  <h2><%= _t("Filter by tag") %></h2>
+  <%= js_filter_field '#tag_list li' %>
+  <ul>
+    <% Alchemy::Picture.tag_counts.each do |t| %>
+      <% picture_tags = filtered_by_tag?(t) ? tag_filter(remove: t) : tag_filter(add: t) %>
+      <%= content_tag 'li', name: t.name, class: p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
+        <%= link_to(
+          "#{t.name} (#{t.count})",
+          url_for(
+            p.delete_if { |k, v| k == "page" }.merge(
+              action: 'index',
+              tagged_with: picture_tags
+            )
+          ),
+          remote: request.xhr?,
+          class: 'please_wait'
+        ) %>
+      <% end %>
     <% end %>
+  </ul>
+  <% if p[:tagged_with].present? %>
+    <%= link_to(
+      render_icon('delete-small') + _t('Remove tag filter'),
+      url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+      remote: request.xhr?,
+      class: 'button small with_icon please_wait'
+    ) %>
   <% end %>
-</ul>
-<% if p[:tagged_with].present? %>
-  <%= link_to(
-    render_icon('delete-small') + _t('Remove tag filter'),
-    url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(:action => :index)),
-    :remote => request.xhr?,
-    :class => 'button small with_icon please_wait'
-  ) %>
 <% end %>