alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -9,17 +9,24 @@
             :options => @options
           ),
           {
-            :title => _t('upload_file'),
+            :title => _t(:upload_file),
             :size => '540x550'
           },
-          :title => _t('upload_file'),
+          :title => _t(:upload_file),
           :class => 'icon_button'
         ) %>
-      <label><%= _t('upload_file') %></label>
+      <label><%= _t(:upload_file) %></label>
+    </div>
+    <%= render 'alchemy/admin/partials/remote_search_form' %>
+  </div>
+  <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+    <div id="library_sidebar">
+      <div id="tag_list">
+        <%= render 'tag_list' %>
+      </div>
+    </div>
+    <div id="overlay_file_list">
+      <%= render 'overlay_file_list' %>
     </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

@@ -3,34 +3,39 @@
     <%= render_icon attachment.icon_css_class %>
   </td>
   <td class="name">
-  <% if permitted_to?(:show, :attachments) %>
-    <%= link_to(
+  <% if permitted_to?(:show, :alchemy_attachments) && %w(audio image video flash pdf text).include?(attachment.icon_css_class) %>
+    <%= link_to_overlay_window(
       attachment.name,
       alchemy.admin_attachment_path(attachment),
-      :target => '_blank',
-      :title => _t('View File')
+      {
+        :title => attachment.name,
+        :size => "fullscreen"
+      },
+      {
+        :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="file_name"><%= attachment.file_name %></td>
+  <td class="file_type"><%= mime_to_human(attachment.file_mime_type) %></td>
+  <td class="file_size"><%= number_to_human_size(attachment.file_size) %></td>
   <td class="date"><%= l(attachment.created_at, :format => :short) %></td>
   <td class="tools long">
   <% permitted_to?(:download, :alchemy_attachments) do %>
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
-      :title => _t("download_file", :filename => attachment.filename),
+      :title => _t("download_file", :filename => attachment.file_name),
       :class => "icon file_download"
     ) %>
   <% end %>
   <% permitted_to?(:destroy, :alchemy_admin_attachments) do %>
     <%= link_to_confirmation_window(
       "",
-      _t("confirm_to_delete_file"),
+      _t(:confirm_to_delete_file),
       alchemy.admin_attachment_path(
         :id => attachment,
         :query => params[:query],
@@ -39,7 +44,7 @@
       ),
       {
         :class => 'icon file_delete',
-        :title => _t('delete_file')
+        :title => _t(:delete_file)
       }
     ) %>
   <% end %>
@@ -47,11 +52,11 @@
     <%= link_to_overlay_window("",
       alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
       {
-        :title => _t('rename_file'),
+        :title => _t(:rename_file),
         :size => '380x220'
       },
       :class => 'icon file_edit',
-      :title => _t('rename_file')
+      :title => _t(:rename_file)
     ) %>
   <% end %>
   </td>

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

@@ -1,11 +1,6 @@
-<%-
-  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 %>">
+<li class="assign_file_file <%= cycle('even', 'odd') %>">
   <%= link_to(
-    img_tag,
+    render_icon(file_to_assign.icon_css_class) + file_to_assign.name,
     {
       :controller => :essence_files,
       :action => :assign,
@@ -15,6 +10,6 @@
     },
     :remote => true,
     :method => 'put',
-    :title => file_to_assign.filename
+    :title => file_to_assign.name
   ) %>
 </li>

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

@@ -1,26 +1,34 @@
-<%- if @attachments.blank? && params[:query].nil? -%>
+<% if @attachments.blank? && params[:query].nil? %>
 <div class="info" id="no_files_notice">
   <%= render_icon('info') %>
-  <%= _t("no_files_in_archive") %>
+  <%= _t(:no_files_in_archive) %>
 </div>
-<%- elsif @attachments.blank? -%>
+<% elsif @attachments.blank? %>
 <div class="info">
   <%= render_icon('info') %>
-  <%= _t("no_search_results") %>
+  <%= _t(:no_search_results) %>
 </div>
-<%- end -%>
+<% end %>
 <table id="all_files" class="list">
-  <%- unless @attachments.blank? -%>
+  <% 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="name">
+      <%= sortable_column(Alchemy::Attachment.human_attribute_name('name'), :column => :name) %>
+    </th>
+    <th class="file_name">
+      <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_name'), :column => :file_name) %>
+    </th>
+    <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
+    <th class="file_size">
+      <%= sortable_column(Alchemy::Attachment.human_attribute_name('file_size'), :column => :file_size) %>
+    </th>
+    <th class="date">
+      <%= sortable_column(Alchemy::Attachment.human_attribute_name('created_at'), :column => :created_at) %>
+    </th>
     <th class="tools"></th>
   </tr>
-  <%- end -%>
+  <% end %>
   <%= render :partial => 'alchemy/admin/attachments/attachment', :collection => @attachments %>
 </table>
 

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

@@ -0,0 +1,11 @@
+<% if @attachments.empty? %>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= _t(:no_files_in_archive) %>
+  </div>
+<% else %>
+  <ul class="with_padding">
+    <%= render :partial => 'file_to_assign', :collection => @attachments %>
+  </ul>
+  <%= paginate @attachments, :remote => true %>
+<% end %>

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

@@ -0,0 +1,31 @@
+<% p = params.dup %>
+<% if Alchemy::Attachment.tag_counts.any? %>
+  <h2><%= _t("Filter by tag") %></h2>
+  <%= js_filter_field '#tag_list li' %>
+  <ul>
+    <% Alchemy::Attachment.tag_counts.each do |t| %>
+      <% attachment_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: attachment_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 %>
+<% end %>

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

@@ -0,0 +1,4 @@
+jQuery('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) %>');
+Alchemy.SelectBox('#filter_bar');
+Alchemy.overlayObserver('#alchemy_window_body');
+Alchemy.ListFilter('#alchemy_window_body');

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

@@ -1,25 +1,26 @@
-<%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}) do |f| -%>
+<%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}, :remote => true) do |f| -%>
+  <div id="errors"></div>
   <table>
     <tr>
-      <td class="label"><%= f.label 'name' %></td>
-      <td class="input"><%= f.text_field 'name', :class => 'thin_border long', :autofocus => true %></td>
+      <td class="label"><%= f.label :name %></td>
+      <td class="input"><%= f.text_field :name, :class => 'thin_border long', :autofocus => true %></td>
     </tr>
     <tr>
-      <td class="label"><%= f.label 'filename' %>*</td>
+      <td class="label"><%= f.label :file_name %>*</td>
       <td class="input">
-        <%= f.text_field 'filename', :class => 'thin_border long' %>
+        <%= f.text_field :file_name, :class => 'thin_border long' %>
         <p class="foot_note"><%= _t(:attachment_filename_notice) %></p>
       </td>
     </tr>
     <tr>
-      <td class="label"><%= f.label 'tag_list' %></td>
+      <td class="label"><%= f.label :tag_list %></td>
       <td class="input">
         <%= render 'alchemy/admin/partials/autocomplete_tag_list', :object => @attachment, :f => f %>
       </td>
     </tr>
     <tr>
       <td colspan="2" class="submit">
-        <%= f.button _t('save'), :class => 'button' %>
+        <%= f.button _t(:save), :class => 'button' %>
       </td>
     </tr>
   </table>

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

@@ -1,19 +1,26 @@
 <%= toolbar(
-  :buttons => [
+  buttons: [
     {
-      :icon => 'upload',
-      :url => alchemy.new_admin_attachment_path,
-      :overlay_options => {
-        :title => _t('upload_file'),
-        :size => '540x550'
+      icon: 'upload',
+      url: alchemy.new_admin_attachment_path,
+      hotkey: 'alt-n',
+      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]
+      title: _t(:upload_file),
+      class: 'icon_button',
+      label: _t(:upload_file),
+      if_permitted_to: [:new, :alchemy_admin_attachments]
     }
   ]
 ) %>
-<div id="archive_all">
-  <%= render :partial => 'files_list' %>
+<div id="archive_all" class="with_tag_filter">
+  <%= resources_header %>
+  <%= render partial: 'files_list' %>
+  <div id="library_sidebar">
+    <div id="tag_list" class="<%= params[:tagged_with].present? ? 'filtered' : '' %>">
+      <%= render partial: 'tag_list' %>
+    </div>
+  </div>
 </div>

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

@@ -3,9 +3,9 @@
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
       :file_types => configuration(:uploader)['allowed_filetypes']['attachments'],
-      :file_types_description => _t('documents'),
+      :file_types_description => _t(:documents),
       :model_name => 'attachment',
-      :item_type => _t('files')
+      :item_type => _t(:files)
     }
   ) %>
 <% end %>

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

@@ -0,0 +1,3 @@
+<iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 style="width: 100%; min-height: 90%">
+  Your browser does not support frames.
+</iframe>

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

@@ -1,17 +1,17 @@
 <div class="content_editor missing" id="element_<%= element.id %>_content_missing">
-  <label><%= Alchemy::I18n.t("content_names.#{element.name}.#{name}", :default => ["content_names.#{name}".to_sym, name.capitalize]) %></label>
+  <label><%= Alchemy::Content.translated_label_for(name, element.name) %></label>
   <p>
     <%= render_icon('warning') %>
-    <%= _t('content_not_found') %>
+    <%= _t(:content_not_found) %>
     <%= link_to(
-      _t('create'),
+      _t(:create),
       alchemy.admin_contents_path(
         :content => {
           :element_id => element.id,
           :name => name
         },
         :was_missing => true,
-        :options => options
+        :options => options.to_json
       ),
       :method => 'post',
       :remote => true,

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

@@ -40,7 +40,7 @@
 
 <% elsif @content.essence_type == "Alchemy::EssenceDate" %>
 
-  Alchemy.Datepicker('#element_<%= @element.id %> input.date');
+  Alchemy.Datepicker('#element_<%= @element.id %>');
 
 <% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
 

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

@@ -3,10 +3,13 @@
   <%= f.hidden_field :element_id %>
   <table>
     <tr>
-      <td class="label"><%= f.label :name, _t('name') %></td>
+      <td class="label"><%= f.label :name %></td>
       <td class="select">
-        <%= f.select('name', @contents.map { |a|
-          [_t("content_names.#{a['name']}"), a['name']]
+        <%= f.select('name', @contents.map { |content|
+          [
+            _t(content['name'], scope: 'content_names', default: content['name'].humanize),
+            content['name']
+          ]
         }, {}, {:class => 'alchemy_selectbox'}) %>
       </td>
     </tr>

data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb

@@ -17,7 +17,7 @@
       </td>
       <td>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) 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 %>

data/app/views/alchemy/admin/dashboard/_users.html.erb

@@ -10,7 +10,7 @@
     <tr class="<%= cycle('even', 'odd') %>">
       <td><%= user.name %></td>
       <td>
-        <small><%= user.human_role_name %></small>
+        <small><%= user.human_roles_string %></small>
       </td>
     </tr>
     <% end %>

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

@@ -2,11 +2,11 @@
   :buttons => [
     {
       :icon => 'info',
-      :label => _t('info'),
+      :label => _t(:info),
       :url => alchemy.dashboard_info_path,
-      :title => _t('info'),
+      :title => _t(:info),
       :overlay_options => {
-        :title => _t('info'),
+        :title => _t(:info),
         :size => "420x360"
       },
       :if_permitted_to => [:info, :alchemy_admin_dashboard]

data/app/views/alchemy/admin/dashboard/info.html.erb

@@ -3,7 +3,6 @@
   <%= _t("Version") %>: <%= @alchemy_version %>
 </h2>
 <p class="center with_margin" id="update_check">
-  <%= image_tag('alchemy/ajax_loader.gif', :id => 'load_info') %>
   <span id="update_available">
     <%= render_icon('warn') %>
     <%= _t 'Update available' %>
@@ -42,16 +41,20 @@
   </ul>
 </div>
 <script type="text/javascript">
-  $('#load_info').show();
-  $.get('/admin/dashboard/update_check', function(data, textStatus, jqXHR) {
-    if (data == 'true') {
-      $('#update_available').show();
-    } else {
-      $('#up_to_date').show();
-    }
-  }).fail(function(jqXHR, textStatus, errorThrown) {
-    $('#error').show();
-  }).always(function() {
-    $('#load_info').hide();
-  });
+  (function() {
+    var el = $('#update_check');
+    var spinner = Alchemy.Spinner.small();
+    spinner.spin(el[0]);
+    $.get('<%= alchemy.update_check_path %>', function(data, textStatus, jqXHR) {
+      if (data == 'true') {
+        $('#update_available').show();
+      } else {
+        $('#up_to_date').show();
+      }
+    }).fail(function(jqXHR, textStatus, errorThrown) {
+      $('#error').show();
+    }).always(function() {
+      spinner.stop();
+    });
+  })();
 </script>

data/app/views/alchemy/admin/elements/_add_picture.html.erb

@@ -6,7 +6,7 @@
       :options => options
     ),
     {
-      :title => _t('add_image_to_element'),
+      :title => _t(:add_image_to_element),
       :size => '780x580',
       :resizable => true
     }