alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -1,37 +1,42 @@
 <% content_for :toolbar do %>
-  <div id="toolbar_buttons">
+  <div class="toolbar_buttons">
     <div class="button_with_label">
       <%= link_to_overlay_window(
-        content_tag('span', '', :class => 'icon tag_add'),
+        content_tag('span', '', class: 'icon tag_add'),
         new_admin_tag_path,
         {
-          :title => _t('New Tag'),
-          :size => '310x210'
+          title: _t('New Tag'),
+          size: '310x210'
         },
-        :title => _t('New Tag'),
-        :class => 'icon_button'
+        title: _t('New Tag'),
+        class: 'icon_button',
+        'data-alchemy-hotkey' => 'alt-n'
       ) %><br />
       <label><%= _t('New Tag') %></label>
     </div>
   </div>
-  <%= render :partial => 'alchemy/admin/partials/search_form' %>
+  <%= render partial: 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all">
+  <h1>
+    <%= @tags.total_count %>
+    <%= ActsAsTaggableOn::Tag.model_name.human(count: @tags.total_count) %>
+  </h1>
   <% if @tags.any? %>
 
   <table class="list" id="tag_list">
     <tr class="legend">
       <th class="icon"></th>
-      <th class="name"><%= ActsAsTaggableOn::Tag.human_attribute_name(:name) %></th>
+      <th class="name"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:name), column: :name) %></th>
       <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></th>
-      <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count) %></th>
+      <th class="count"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count), column: :taggings_count) %></th>
       <th class="tools"></th>
     </tr>
-    <%= render :partial => 'tag', :collection => @tags %>
+    <%= render partial: 'tag', collection: @tags %>
   </table>
 
-  <%= render 'alchemy/admin/partials/pagination_links', :items => @tags %>
+  <%= render 'alchemy/admin/partials/pagination_links', items: @tags %>
 
   <% else %>
 

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

@@ -1,4 +1,4 @@
-<%= form_for [:admin, @tag], :as => :tag, :url => admin_tags_path, :html => {:id => 'new_tag'}, :remote => true do |form| %>
+<%= form_for [:admin, @tag], as: :tag, url: admin_tags_path, html: {id: 'new_tag'}, remote: true do |form| %>
   <div class="info">
     <%= render_icon('info') %>
     <%= _t(:tags_get_created_if_used_the_first_time) %>
@@ -7,10 +7,10 @@
   <table>
     <tr>
       <td class="label"><%= form.label :name %></td>
-      <td class="input"><%= form.text_field :name, :class => 'input_field' %></td>
+      <td class="input"><%= form.text_field :name, class: 'input_field', autofocus: true %></td>
     </tr>
     <tr>
-      <td colspan="2" class="submit"><%= form.button _t('save'), :name => nil, :class => 'button' %></td>
+      <td colspan="2" class="submit"><%= form.button _t(:save), name: nil, class: 'button' %></td>
     </tr>
   </table>
 <% end %>

data/app/views/alchemy/admin/trash/clear.js.coffee

@@ -1,4 +1,4 @@
 Alchemy.growl '<%= _t("Cleared trash") %>'
-Alchemy.refreshTrashWindow <%= @page.id %>
+Alchemy.TrashWindow.refresh <%= @page.id %>
 jQuery('#element_trash_button .icon').removeClass 'full'
 Alchemy.pleaseWaitOverlay false

data/app/views/alchemy/admin/users/_table.html.erb

@@ -32,11 +32,18 @@
     <td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border long', :autocomplete => "off", :required => action_name == 'signup' %></td>
   </tr>
   <% if @signup %>
-  <%= f.hidden_field :role %>
-  <% elsif permitted_to? :update_role %>
+  <%= f.hidden_field :roles %>
+  <% elsif permitted_to? :update_roles %>
   <tr>
-    <td class="label"><%= f.label 'role' %></td>
-    <td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, {:class => 'alchemy_selectbox long'} %></td>
+    <td class="label"><%= f.label 'roles' %></td>
+    <td id="user_roles">
+    <% Alchemy::User::ROLES.each do |role| %>
+      <label>
+        <%= check_box_tag 'user[roles][]', role, @user.has_role?(role) %>
+        <%= Alchemy::User.human_rolename(role) %>
+      </label>
+    <% end %>
+    </td>
   </tr>
   <% end %>
   <% unless @signup %>
@@ -56,7 +63,7 @@
   </tr>
   <tr>
     <td class="submit" colspan="2">
-      <%= f.button _t('save'), :class => 'button' %>
+      <%= f.button _t(:save), :class => 'button' %>
     </td>
   </tr>
 </table>

data/app/views/alchemy/admin/users/_user.html.erb

@@ -1,39 +1,39 @@
 <tr class="<%= cycle('even', 'odd') %>">
-  <td class="icon"><%= content_tag 'span', '', :class => "icon user#{user.gender == 'female' ? ' female' : ' male'}" -%></td>
+  <td class="icon"><%= content_tag 'span', '', :class => "icon user#{user.gender == 'female' ? ' female' : ' male'}" %></td>
   <td>
     <%= render_icon(user.logged_in? ? 'online' : 'offline') %>
   </td>
   <td class="login"><%= user.login %></td>
-  <td class="name"><%= user.firstname -%></td>
-  <td><%= user.lastname -%></td>
+  <td class="name"><%= user.firstname %></td>
+  <td><%= user.lastname %></td>
   <td class="email"><%= user.email %></td>
-  <td><%= _t(user.language, :scope => 'translations') %></td>
+  <td><%= _t(user.language, scope: 'translations', default: _t(:unknown)) %></td>
   <td><%= user.last_sign_in_at.present? ? l(user.last_sign_in_at, :format => :default) : _t(:unknown) %></td>
-  <td class="role"><%= user.human_role_name %></td>
+  <td class="role"><%= user.human_roles_string %></td>
   <td class="tools">
-    <%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
+    <% permitted_to?(:destroy, :alchemy_admin_users) do %>
     <%= link_to_confirmation_window(
       '',
-      _t("confirm_to_delete_user"),
+      _t(:confirm_to_delete_user),
       alchemy.admin_user_path(user),
-      :title => _t('delete_user'),
+      :title => _t(:delete_user),
       :class => "icon user_delete#{user.gender == 'female' ? ' female' : ' male'}"
-    ) -%>
-    <%- end -%>
-    <%- permitted_to?(:edit, :alchemy_admin_users) do -%>
+    ) %>
+    <% end %>
+    <% permitted_to?(:edit, :alchemy_admin_users) do %>
     <%= link_to_overlay_window(
       '',
       alchemy.edit_admin_user_path(user),
       {
-        :title => _t('edit_user'),
+        :title => _t(:edit_user),
         :overflow => true,
-        :size => '420x560'
+        :size => '420x580'
       },
       {
         :class => "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
-        :title => _t('edit_user')
+        :title => _t(:edit_user)
       }
-    ) -%>
-    <%- end -%>
+    ) %>
+    <% end %>
   </td>
 </tr>

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

@@ -1,36 +1,48 @@
 <%= toolbar(
-  :buttons => [
+  buttons: [
     {
-      :icon => 'user_add',
-      :label => _t('create_user'),
-      :url => alchemy.new_admin_user_path,
-      :title => _t('create_user'),
-      :overlay_options => {
-        :title => _t('create_user'),
-        :size => "420x560"
+      icon: 'user_add',
+      label: _t(:create_user),
+      url: alchemy.new_admin_user_path,
+      title: _t(:create_user),
+      hotkey: 'alt-n',
+      overlay_options: {
+        title: _t(:create_user),
+        size: "420x580"
       },
-      :if_permitted_to => [:new, :alchemy_admin_users]
+      if_permitted_to: [:new, :alchemy_admin_users]
     }
   ]
 ) %>
 
 <div id="archive_all">
+  <%= resources_header %>
 <% if @users.any? %>
 
   <table class="list" id="user_list">
     <tr>
       <th class="icon"></th>
       <th class="login_status"></th>
-      <th class="login"><%= Alchemy::User.human_attribute_name('login') %></th>
-      <th class="name"><%= Alchemy::User.human_attribute_name('firstname') %></th>
-      <th><%= Alchemy::User.human_attribute_name('lastname') %></th>
-      <th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
+      <th class="login">
+        <%= sortable_column(Alchemy::User.human_attribute_name('login'), column: :login) %>
+      </th>
+      <th class="name">
+        <%= sortable_column(Alchemy::User.human_attribute_name('firstname'), column: :firstname) %>
+      </th>
+      <th>
+        <%= sortable_column(Alchemy::User.human_attribute_name('lastname'), column: :lastname) %>
+      </th>
+      <th class="email">
+        <%= sortable_column(Alchemy::User.human_attribute_name('email'), column: :email) %>
+      </th>
       <th><%= Alchemy::User.human_attribute_name('language') %></th>
-      <th><%= Alchemy::User.human_attribute_name('last_sign_in_at') %></th>
-      <th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
+      <th>
+        <%= sortable_column(Alchemy::User.human_attribute_name('last_sign_in_at'), column: :last_sign_in_at) %>
+      </th>
+      <th class="role"><%= Alchemy::User.human_attribute_name('roles') %></th>
       <th class="tools"></th>
     </tr>
-    <%= render :partial => 'alchemy/admin/users/user', :collection => @users %>
+    <%= render partial: 'alchemy/admin/users/user', collection: @users %>
   </table>
 
   <%= paginate @users %>

data/app/views/alchemy/breadcrumb/_page.html.erb

@@ -0,0 +1,15 @@
+<% css_classes = [options[:page] == page ? "active" : nil] %>
+<% if page == pages.first %>
+  <% css_classes << "first" %>
+<% elsif page == pages.last %>
+  <% css_classes << "last" %>
+<% end %>
+<%= link_to_unless(
+  !options[:link_active_page] && options[:page] == page,
+  h(page.name),
+  show_alchemy_page_path(page),
+  class: css_classes.compact.join(" "),
+  title: page.title
+) do |name, url, html_options| %>
+  <%= content_tag :span, name, html_options %>
+<% end %>

data/app/views/alchemy/breadcrumb/_spacer.html.erb

@@ -0,0 +1 @@
+<%= options[:seperator].html_safe %>

data/app/views/alchemy/elements/_editor_not_found.html.erb

@@ -1,5 +1,5 @@
 <div class="error">
   <%= render_icon('error') %>
-  <h1><%= _t("element_editor_not_found") %>:</h1>
+  <h1><%= _t(:element_editor_not_found) %>:</h1>
   <p><%= error.html_safe %></p>
 </div>

data/app/views/alchemy/essences/_essence_file_editor.html.erb

@@ -5,7 +5,7 @@
   </label>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
-    <%- if content.ingredient.nil? -%>
+    <% if content.ingredient.nil? %>
       <%= link_to_overlay_window("",
         alchemy.admin_attachments_path(
           :content_id => content.id,
@@ -14,21 +14,21 @@
           :options => options
         ),
         {
-          :title => _t('assign_file'),
-          :size => '520x400',
-          :resizable => 'true'
+          :title => _t(:assign_file),
+          :size => '780x580',
+          :close_on_escape => false
         },
         :class => 'assign_file',
-        :title => _t('assign_file')
+        :title => _t(:assign_file)
       ) %>
-    <%- else -%>
+    <% else %>
       <%= render_icon(content.ingredient.icon_css_class) %>
-    <%- end -%>
+    <% end %>
     </div>
     <div class="file_name">
-      <%= content.ingredient.name rescue ("&#x2190;" + _t('assign_file_from_archive')).html_safe %>
+      <%= content.ingredient.name rescue ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
     </div>
-    <%- unless content.ingredient.nil? -%>
+    <% unless content.ingredient.nil? %>
     <%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
     <div class="essence_file_tools">
       <%= link_to_overlay_window("",
@@ -39,12 +39,12 @@
           :options => options
         ),
         {
-          :title => _t('assign_file'),
-          :size => '520x400',
-          :resizable => 'true'
+          :title => _t(:assign_file),
+          :size => '780x580',
+          :close_on_escape => false
         },
         :class => 'assign_file',
-        :title => _t('assign_file')
+        :title => _t(:assign_file)
       ) %>
       <%= link_to_overlay_window("",
         url_for(
@@ -53,13 +53,13 @@
           :id => content
         ),
         {
-          :title => _t('edit_file_properties'),
+          :title => _t(:edit_file_properties),
           :size => '400x150'
         },
         :class => 'edit_file',
-        :title => _t('edit_file_properties')
+        :title => _t(:edit_file_properties)
       ) %>
     </div>
-    <%- end -%>
+    <% end %>
   </div>
 </div>

data/app/views/alchemy/essences/_essence_file_view.html.erb

@@ -1,9 +1,8 @@
-<%= link_to(
-  h(content.essence.attachment.name),
-  alchemy.download_attachment_path(
-    :id => content.essence.attachment.id,
-    :name => content.essence.attachment.urlname
-  ),
-  :class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
-  :title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
-) if content.essence.attachment %>
+<% if attachment = content.essence.attachment %>
+  <%= link_to(
+    h(attachment.name),
+    download_alchemy_attachment_path(attachment),
+    :class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
+    :title => "#{content.essence.title.blank? ? attachment.file_name : content.essence.title}"
+  ) %>
+<% end %>

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -12,13 +12,13 @@
       <% if options[:grouped] %>
       <%= link_to_confirmation_window(
         "",
-        _t("confirm_to_delete_image"),
+        _t(:confirm_to_delete_image),
         alchemy.admin_essence_picture_path(
           :id => content,
           :options => options
         ),
         {
-          :title => _t("delete_image")
+          :title => _t(:delete_image)
         }
       ) -%>
       <% else %>
@@ -30,10 +30,7 @@
       <% end %>
     </span>
     <%- if content.ingredient -%>
-    <div class="picture_handle" title="<%= _t('drag_to_sort') if options[:dragable] %>"></div>
-    <div class="picture_content_spinner">
-      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-    </div>
+    <div class="picture_handle" title="<%= _t(:drag_to_sort) if options[:dragable] %>"></div>
     <%- end -%>
     <div class="picture_image">
       <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">

data/app/views/alchemy/essences/_essence_picture_tools.html.erb

@@ -4,7 +4,8 @@
   alchemy.crop_admin_essence_picture_path(content.essence, :options => options),
   {
     :size => "816x754",
-    :title => _t('Edit Picturemask')
+    :title => _t('Edit Picturemask'),
+    :image_loader => false
   },
   {
     :title => _t('Edit Picturemask')
@@ -23,17 +24,17 @@
     :options => options
   ),
   {
-    :title => (content.ingredient ? _t('swap_image') : _t('insert_image')),
+    :title => (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
     :size => '780x580',
-    :resizable => "true"
+    :close_on_escape => false
   },
-  :title => (content.ingredient ? _t('swap_image') : _t('insert_image'))
+  :title => (content.ingredient ? _t(:swap_image) : _t(:insert_image))
 ) %>
 
 <%= link_to(render_icon(:link), '#', {
   :onclick => "Alchemy.LinkOverlay.open(this, 420)",
   :class => content.linked? ? 'linked' : nil,
-  :title => _t('link_image'),
+  :title => _t(:link_image),
   :data => {'content-id' => content.id},
   :id => "edit_link_#{content.id}"
 }) %>
@@ -41,7 +42,7 @@
 <%= link_to(render_icon('unlink'), '#', {
   :onclick => "Alchemy.LinkOverlay.removeLink(this, #{content.id})",
   :class => content.linked? ? 'linked' : 'disabled',
-  :title => _t('unlink')
+  :title => _t(:unlink)
 }) %>
 
 <%= link_to_overlay_window(
@@ -52,8 +53,8 @@
     :options => options
   ),
   {
-    :title => _t('edit_image_properties'),
+    :title => _t(:edit_image_properties),
     :size => (options[:caption_as_textarea] ? (options[:manual_image_size] ? '380x230' : '380x210') : (options[:manual_image_size] ? '380x190' : '380x180'))
   },
-  :title => _t('edit_image_properties')
+  :title => _t(:edit_image_properties)
 ) %>

data/app/views/alchemy/essences/_essence_richtext_editor.html.erb

@@ -2,11 +2,6 @@
 <div class="content_editor essence_richtext" id="<%= content_dom_id(content) %>">
   <%= label_and_remove_link(content) %>
   <div class="tinymce_container">
-    <% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>
-    <div class="essence_richtext_loader">
-      <%= image_tag('alchemy/ajax_loader.gif') %>
-    </div>
-    <% end -%>
     <%= text_area_tag(
       content.form_field_name,
       content.ingredient || '',

data/app/views/alchemy/essences/_linkable_essence_tools.html.erb

@@ -5,7 +5,7 @@
     :onclick => "Alchemy.LinkOverlay.open(this, 420); return false;",
     :class => "icon_button#{content.linked? ? ' linked' : ''}",
     :data => {'content-id' => content.id},
-    :title => _t('place_link'),
+    :title => _t(:place_link),
     :id => "edit_link_#{content.id}"
   ) %>
   <%= link_to(
@@ -14,6 +14,6 @@
     :onclick => "Alchemy.LinkOverlay.removeLink(this, #{content.id}); return false;",
     :class => "icon_button unlink #{content.linked? ? 'linked' : 'disabled'}",
     :data => {'content-id' => content.id},
-    :title => _t('unlink')
+    :title => _t(:unlink)
   ) %>
 </span>