alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

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

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

@@ -1,87 +1,95 @@
 <% content_for(:toolbar) do %>
-  <div id="toolbar_buttons">
+  <div class="toolbar_buttons">
     <%= toolbar_button(
-      :icon => 'upload',
-      :label => _t('upload_image'),
-      :url => alchemy.new_admin_picture_path(:size => @size),
-      :overlay_options => {
-        :title => _t('upload_image'),
-        :size => '540x590'
+      icon: 'upload',
+      label: _t(:upload_image),
+      url: alchemy.new_admin_picture_path(size: @size),
+      hotkey: 'alt-n',
+      overlay_options: {
+        title: _t(:upload_image),
+        size: '540x590'
       },
-      :class => 'icon_button',
-      :title => _t('upload_image'),
-      :if_permitted_to => [:new, :alchemy_admin_pictures]
+      class: 'icon_button',
+      title: _t(:upload_image),
+      if_permitted_to: [:new, :alchemy_admin_pictures]
     ) %>
     <div class="toolbar_spacer"></div>
     <div class="button_with_label">
       <%= link_to(
         render_icon('zoom-out'),
         alchemy.admin_pictures_path({
-          :size => "small",
-          :query => params[:query]
+          size: "small",
+          query: params[:query]
         }),
-        :title => _t("small_thumbnails"),
-        :class => "icon_button please_wait"
+        title: _t(:small_thumbnails),
+        class: "icon_button please_wait"
       ) %>
       <%= link_to(
         render_icon('zoom-equal'),
         alchemy.admin_pictures_path({
-          :size => "medium",
-          :query => params[:query]
+          size: "medium",
+          query: params[:query]
         }),
-        :title => _t("medium_thumbnails"),
-        :class => "icon_button please_wait"
+        title: _t(:medium_thumbnails),
+        class: "icon_button please_wait"
       ) %>
       <%= link_to(
         render_icon('zoom-in'),
         alchemy.admin_pictures_path({
-          :size => "large",
-          :query => params[:query]
+          size: "large",
+          query: params[:query]
         }),
-        :title => _t("big_thumbnails"),
-        :class => "icon_button please_wait"
+        title: _t(:big_thumbnails),
+        class: "icon_button please_wait"
       ) %>
       <label><%= _t('Image size') %></label>
-      <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+      <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
     </div>
 
     <% permitted_to?(:flush, :alchemy_admin_pictures) do %>
       <div class="toolbar_spacer"></div>
       <%= toolbar_button(
-        :icon => 'flush',
-        :url => alchemy.flush_admin_pictures_path,
-        :overlay => false,
-        :link_options => {
-          :remote => true,
-          :method => :post
+        icon: 'flush',
+        url: alchemy.flush_admin_pictures_path,
+        overlay: false,
+        link_options: {
+          remote: true,
+          method: :post
         },
-        :label => _t('Flush picture cache'),
-        :class => 'icon_button please_wait',
-        :title => _t('Flush picture cache'),
-        :skip_permission_check => true
+        label: _t('Flush picture cache'),
+        class: 'icon_button please_wait',
+        title: _t('Flush picture cache'),
+        skip_permission_check: true
       ) %>
     <% end %>
     <div class="toolbar_spacer"></div>
     <div class="button_with_label">
-      <%= link_to render_icon('select_all'), '', :id => 'select_all_pictures', :class => 'icon_button' %>
+      <%= link_to(
+        render_icon('select_all'),
+        '',
+        id: 'select_all_pictures',
+        class: 'icon_button',
+        'data-alchemy-hotkey' => 'alt-a'
+      ) %>
       <label><%= _t("Select all") %></label>
     </div>
   </div>
 
-  <%= render :partial => 'alchemy/admin/partials/search_form' %>
+  <%= render partial: 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="picture_archive">
+  <h1>
+    <%= @pictures.total_count %>
+    <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
+  </h1>
   <%= render 'archive' %>
 </div>
 
-<%- content_for :javascripts do -%>
+<% content_for :javascripts do %>
   <script type="text/javascript" charset="utf-8">
-
-    jQuery(document).ready(function($) {
-
+    $(function() {
       Alchemy.pictureSelector();
-
       $('#select_all_pictures').on('click', function(e) {
         $('.picture_tool.select :checkbox').prop('checked', true).change();
         e.preventDefault;
@@ -89,6 +97,5 @@
       });
 
     });
-
   </script>
-<%- end -%>
+<% end %>

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

@@ -3,9 +3,9 @@
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
       :file_types => configuration(:uploader)['allowed_filetypes']['pictures'],
-      :file_types_description => _t('images'),
+      :file_types_description => _t(:images),
       :model_name => 'picture',
-      :item_type => _t('images')
+      :item_type => _t(:images)
     }
   ) %>
   <%= f.submit :upload, :style => 'display: none' %>

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

@@ -0,0 +1,11 @@
+<div id="zoomed_picture_background">
+  <%= image_tag(
+    alchemy.zoom_picture_path(
+      :id => @picture.id,
+      :name => @picture.urlname,
+      :format => :png,
+      :sh => @picture.security_token
+    ),
+    :class => "zoomed_picture"
+  ) %>
+</div>

data/app/views/alchemy/admin/resources/_boolean.html.erb

@@ -1,5 +1,5 @@
 <td></td>
 <td class="checkbox">
-  <%= f.send :check_box, attribute[:name] -%>
-  <%= f.send :label, attribute[:name] %>
+  <%= f.check_box attribute[:name] -%>
+  <%= f.label attribute[:name] %>
 </td>

data/app/views/alchemy/admin/resources/_datetime.html.erb

@@ -1,2 +1,2 @@
-<td class="label"><%= f.send :label, attribute[:name] %></td>
-<td class="input"><%= f.send :text_field, attribute[:name], :type => :date -%></td>
+<td class="label"><%= f.label attribute[:name] %></td>
+<td class="input"><%= f.text_field attribute[:name], :type => :date -%></td>

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for resource_instance_variable, :url => resource_path(resource_instance_variable), :remote => true do |f| %>
+<%= form_for resource_instance_variable, url: resource_path(resource_instance_variable), remote: true do |f| %>
   <div id="errors">
     <ul>
     <% resource_instance_variable.errors.full_messages.each do |error| %>
@@ -9,13 +9,14 @@
   <table>
   <% resource_handler.attributes.each do |attribute| %>
     <tr>
-    <% attr_array = attribute[:name].split('.') %>
-    <% if attr_array.length > 1 %>
+    <% if relation = attribute[:relation] %>
+      <td class="label"><%= f.label attribute[:name] %></td>
       <td class="select">
-        <%= f.send(:select,
-          "#{attr_array[0]}_id",
-          attr_array[0].classify.constantize.all.collect {|r| [r.send(attr_array[1]), r.id] },
-          { :prompt => _t("Please choose") }, { :class => "alchemy_selectbox" }
+        <%= f.select(
+          attribute[:name],
+          options_for_resource_relation_select(relation),
+          {include_blank: _t(:blank, scope: 'resources.relation_select')},
+          {class: "alchemy_selectbox"}
         ) %>
       </td>
     <% else %>
@@ -29,7 +30,7 @@
   <% end %>
     <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/resources/_resource.html.erb

@@ -1,31 +1,25 @@
 <tr class="<%= cycle('even', 'odd') %>">
-  <%- resource_handler.attributes.each do |attribute| -%>
-  <%- if attribute[:type] == :boolean -%>
-  <td class="center">
-    <% attr_value = render_attribute(resource, attribute[:name]) %>
-    <%= attr_value.blank? ? '' : render_icon(attr_value) -%>
+<% resource_handler.attributes.each do |attribute| %>
+  <td class="<%= attribute[:type] %> <%= attribute[:name] %>">
+  <% if attribute[:type] == :boolean %>
+    <%= render_icon render_attribute(resource, attribute) %>
+  <% else %>
+    <%= render_attribute(resource, attribute) %>
+  <% end %>
   </td>
-  <%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
-
-  <td class="right"><%= render_attribute(resource, attribute[:name]) -%></td>
-  <%- else -%>
-  <td>
-    <%= render_attribute(resource, attribute[:name]) %>
-  </td>
-  <%- end -%>
-  <%- end -%>
+<% end %>
   <td class="tools">
-    <%- permitted_to?(:destroy, resource_permission_scope) do -%>
+    <% permitted_to?(:destroy, resource_permission_scope) do %>
     <%= link_to_confirmation_window(
       '',
       _t("Are you sure?"),
       resource_path(resource),
       :title => _t("Delete"),
       :class => "icon destroy",
-      :id => "delete_#{resource_handler.model_name}_#{resource.id}"
-    ) -%>
-    <%- end -%>
-    <%- permitted_to?(:edit, resource_permission_scope) do -%>
+      :id => "delete_#{resource_handler.resource_name}_#{resource.id}"
+    ) %>
+    <% end %>
+    <% permitted_to?(:edit, resource_permission_scope) do %>
     <%= link_to_overlay_window(
       '',
       edit_resource_path(resource),
@@ -37,7 +31,7 @@
         :class => "icon edit",
         :title => _t("Edit")
       }
-    ) -%>
-    <%- end -%>
+    ) %>
+    <% end %>
   </td>
 </tr>

data/app/views/alchemy/admin/resources/_string.html.erb

@@ -1,5 +1,5 @@
-<td class="label"><%= f.send :label, attribute[:name] %></td>
+<td class="label"><%= f.label attribute[:name] %></td>
 <td class="input">
-  <%= f.send :text_field, attribute[:name], :class => 'thin_border' %>
+  <%= f.text_field attribute[:name], :class => 'thin_border' %>
   <%= resource_help_text attribute %>
 </td>

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

@@ -1,23 +1,21 @@
-<%- if resources_instance_variable.any? -%>
+<% if resources_instance_variable.any? %>
 <table class="list" id="<%= resource_handler.resources_name %>_list">
   <tr>
-    <%- resource_handler.attributes.each do |attribute| -%>
-    <%- if attribute[:type] == :boolean -%>
-    <th class="center">
-    <%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
-    <th class="right">
-    <%- else -%>
-    <th>
-    <%- end -%>
-    <%= resource_handler.model.human_attribute_name(attribute[:name]) %>
+  <% resource_handler.attributes.each do |attribute| %>
+    <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
+      <%= sortable_column(
+        resource_handler.model.human_attribute_name(attribute[:name]),
+        :column => sortable_resource_header_column(attribute),
+        :route_proxy => resource_url_proxy
+      ) %>
     </th>
-    <%- end -%>
+  <% end %>
     <th class="tools"></th>
   </tr>
   <%= render_resources %>
 </table>
-<%- elsif params[:query] -%>
+<% elsif params[:query] %>
 <p><%= _t('Nothing found') %></p>
-<%- end -%>
+<% end %>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable, :scope => resource_url_proxy %>

data/app/views/alchemy/admin/resources/_text.html.erb

@@ -1,5 +1,5 @@
-<td class="label"><%= f.send :label, attribute[:name] %></td>
+<td class="label"><%= f.label attribute[:name] %></td>
 <td class="input">
-  <%= f.send :text_area, attribute[:name], :rows => 4 %>
+  <%= f.text_area attribute[:name], :rows => 4 %>
   <%= resource_help_text attribute %>
 </td>

data/app/views/alchemy/admin/resources/index.csv.erb

@@ -0,0 +1,13 @@
+<% csv = CSV.generate(:col_sep => ";", :row_sep => "\r\n") do |row| %>
+  <% row << resource_handler.attributes.collect { |a| resource_handler.model.human_attribute_name(a[:name]) } %>
+  <% resources_instance_variable.each do |resource| %>
+    <% row << resource_handler.attributes.map { |a|
+      if a[:type] == :boolean
+        resource.send(a[:name]) ? 'x' : ''
+      else
+        render_attribute(resource, a).to_s.strip
+      end
+    } %>
+  <% end %>
+<% end %>
+<%= csv.html_safe %>

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

@@ -1,23 +1,32 @@
-<%- label_title = _t("Create #{resource_model_name}", :default => _t('Create')) -%>
+<% label_title = _t("Create #{resource_name}", default: _t('Create')) %>
 
-<%- toolbar(
-  :buttons => [
+<% toolbar(
+  buttons: [
     {
-      :icon => 'create',
-      :label => label_title,
-      :url => new_resource_path,
-      :title => label_title,
-      :overlay_options => {
-        :title => label_title,
-        :size => resource_window_size
+      icon: 'create',
+      label: label_title,
+      url: new_resource_path,
+      title: label_title,
+      hotkey: 'alt-n',
+      overlay_options: {
+        title: label_title,
+        size: resource_window_size
       },
-      :if_permitted_to => [:new, resource_permission_scope]
+      if_permitted_to: [:new, resource_permission_scope]
+    },
+    {
+      icon: 'download',
+      url: resource_url_proxy.url_for(action: 'index', format: 'csv', query: params[:query], sort: params[:sort]),
+      label: _t(:download_csv),
+      title: _t(:download_csv),
+      overlay: false,
+      loading_indicator: false,
+      if_permitted_to: [:index, resource_permission_scope]
     }
-  ],
-  :search => true,
-  :search_url => resources_path
-) -%>
+  ]
+) %>
 
 <div id="archive_all">
+  <%= resources_header %>
   <%= render 'table' %>
 </div>

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

@@ -0,0 +1,23 @@
+<% label_title = _t("Create #{resource_name}", default: _t('Create')) %>
+
+<% toolbar(
+  buttons: [
+    {
+      icon: 'create',
+      label: label_title,
+      url: new_resource_path,
+      title: label_title,
+      hotkey: 'alt-n',
+      overlay_options: {
+        title: label_title,
+        size: resource_window_size
+      },
+      if_permitted_to: [:new, resource_permission_scope]
+    }
+  ]
+) %>
+
+<div id="archive_all">
+  <%= resources_header %>
+  <%= render 'table' %>
+</div>

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

@@ -1,4 +1,4 @@
-<li class="<%= cycle('even', 'odd') %>" name="<%= radio_tag.name.downcase %>">
+<li name="<%= radio_tag.name.downcase %>">
   <%= radio_button_tag name + "[merge_to]", radio_tag.id, false, :id => radio_tag.name + "_tag_list" %>
   <label for="<%= radio_tag.name + "_tag_list" %>">
     <%= radio_tag.name %>

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

@@ -11,7 +11,8 @@
       edit_admin_tag_path(tag),
       {
         :title => _t(:edit_tag),
-        :size => '360x385'
+        :size => '360x385',
+        :close_on_escape => false
       },
       {
         :title => _t(:edit_tag),

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

@@ -25,7 +25,7 @@
           <label>Tags</label>
         </td>
         <td class="input" id="tags_tag_list">
-          <%= js_filter_field :onkeyup => "Alchemy.ListFilter('#tag_list li')" %>
+          <%= js_filter_field '#tag_list li' %>
           <ul id="tag_list" class="tags">
             <%= render :partial => "radio_tag", :collection => @tags, :locals => {:name => "tag"} %>
           </ul>