alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -19,7 +19,7 @@
     remote: true,
     onclick: '$(self).attr("href", "#").off("click"); return false',
     method: action_method,
-    title: _t(:assign_image),
+    title: Alchemy.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,13 +1,13 @@
 <% p = params.dup %>
 <% if Alchemy::Picture.tag_counts.any? %>
-  <h2><%= _t("Filter by tag") %></h2>
+  <h2><%= Alchemy.t("Filter by tag") %></h2>
   <%= js_filter_field '#tag_list li' %>
   <ul>
     <%= render_tag_list('Alchemy::Picture', p) %>
   </ul>
   <% if p[:tagged_with].present? %>
     <%= link_to(
-      render_icon('delete-small') + _t('Remove tag filter'),
+      render_icon('delete-small') + Alchemy.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'

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

@@ -1,5 +1,5 @@
 <%= form_tag update_multiple_admin_pictures_path do %>
-  <%= hidden_field_tag :query, params[:query] %>
+  <%= hidden_field_tag :q, params[:q] %>
   <%= hidden_field_tag :size, params[:size] %>
   <%= hidden_field_tag :tagged_with, params[:tagged_with] %>
   <%= hidden_field_tag :filter, params[:filter] %>
@@ -10,21 +10,21 @@
 
   <div class="info">
     <%= render_icon :info %>
-    <p><%= _t('You are about to edit many pictures at once') % {length: @pictures.size} %></p>
+    <p><%= Alchemy.t('You are about to edit many pictures at once') % {length: @pictures.size} %></p>
   </div>
 
   <div class="input text">
-    <%= label_tag :pictures_name, _t('Name'), class: 'control-label' %>
+    <%= label_tag :pictures_name, Alchemy.t('Name'), class: 'control-label' %>
     <%= text_field_tag :pictures_name %>
   </div>
 
   <div class="input tag_list">
-    <%= label_tag :pictures_tag_list, _t(:tags), class: 'control-label' %>
+    <%= label_tag :pictures_tag_list, Alchemy.t(:tags), class: 'control-label' %>
     <%= text_field_tag :pictures_tag_list, @tags, data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>
-    <small class="hint"><%= _t('Please seperate the tags with commata') %></small>
+    <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
   </div>
 
   <div class="submit">
-    <%= button_tag _t(:save), name: nil, class: 'button' %>
+    <%= button_tag Alchemy.t(:save), name: nil, class: 'button' %>
   </div>
 <% end %>

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

@@ -1,56 +1,41 @@
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
-    <%= toolbar_button(
-      icon: 'upload',
-      label: _t(:upload_image),
-      url: alchemy.new_admin_picture_path(size: @size),
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: _t(:upload_image),
-        size: '540x525'
-      },
-      class: 'icon_button',
-      title: _t(:upload_image),
-      if_permitted_to: [:create, Alchemy::Picture]
-    ) %>
     <% if can? :create, Alchemy::Picture %>
-    <div class="toolbar_spacer"></div>
+      <%= render 'alchemy/admin/uploader/button',
+        model_class: Alchemy::Picture,
+        file_attribute: 'image_file',
+        redirect_url: alchemy.admin_pictures_path(
+          size: params[:size],
+          filter: 'last_upload'
+        ) %>
+      <div class="toolbar_spacer"></div>
     <% end %>
     <div class="button_group">
       <div class="button_with_label">
         <%= link_to(
           render_icon('zoom-out'),
-          alchemy.admin_pictures_path({
-            size: "small",
-            query: params[:query]
-          }),
-          title: _t(:small_thumbnails),
+          alchemy.admin_pictures_path(size: "small", q: params[:q]),
+          title: Alchemy.t(:small_thumbnails),
           class: "icon_button please_wait"
         ) %>
       </div>
       <div class="button_with_label">
         <%= link_to(
           render_icon('zoom-equal'),
-          alchemy.admin_pictures_path({
-            size: "medium",
-            query: params[:query]
-          }),
-          title: _t(:medium_thumbnails),
+          alchemy.admin_pictures_path(size: "medium", q: params[:q]),
+          title: Alchemy.t(:medium_thumbnails),
           class: "icon_button please_wait"
         ) %>
       </div>
       <div class="button_with_label">
         <%= link_to(
           render_icon('zoom-in'),
-          alchemy.admin_pictures_path({
-            size: "large",
-            query: params[:query]
-          }),
-          title: _t(:big_thumbnails),
+          alchemy.admin_pictures_path(size: "large", q: params[:q]),
+          title: Alchemy.t(:big_thumbnails),
           class: "icon_button please_wait"
         ) %>
       </div>
-      <label><%= _t('Image size') %></label>
+      <label><%= Alchemy.t('Image size') %></label>
       <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
     </div>
     <% if can?(:flush, Alchemy::Picture) %>
@@ -63,9 +48,9 @@
           remote: true,
           method: :post
         },
-        label: _t('Flush picture cache'),
+        label: Alchemy.t('Flush picture cache'),
         class: 'icon_button please_wait',
-        title: _t('Flush picture cache'),
+        title: Alchemy.t('Flush picture cache'),
         skip_permission_check: true
       ) %>
     <% end %>
@@ -78,18 +63,19 @@
         class: 'icon_button',
         'data-alchemy-hotkey' => 'alt+a'
       ) %>
-      <label><%= _t("Select all") %></label>
+      <label><%= Alchemy.t("Select all") %></label>
     </div>
   </div>
 
-  <%= render partial: 'alchemy/admin/partials/search_form' %>
+  <%= render 'alchemy/admin/partials/search_form',
+    additional_params: [:filter, :tagged_with, :size] %>
 <% end %>
 
 <div id="picture_archive">
   <h1>
     <%= @pictures.total_count %>
     <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-    <%= _t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
+    <%= Alchemy.t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
   </h1>
   <%= render 'archive' %>
 </div>
@@ -103,7 +89,13 @@
         e.preventDefault;
         return false;
       });
-
+      $('.thumbnail_background').click(function(event) {
+        var url = $(this).attr('href');
+        var overlay = new Alchemy.ImageOverlay(url);
+        overlay.open();
+        event.preventDefault();
+        return false;
+      });
     });
   </script>
 <% end %>

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

@@ -1,11 +1,48 @@
-<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 class="zoomed-picture-background">
+  <%= image_tag alchemy.zoom_picture_path(
+    id: @picture.id,
+    name: @picture.urlname,
+    format: @picture.suffix,
+    sh: @picture.security_token
   ) %>
 </div>
+
+<div class="picture-overlay-navigation">
+  <% if @previous %>
+    <%= link_to alchemy.admin_picture_path(
+        id: @previous,
+        q: params[:q],
+        page: params[:page],
+        tagged_with: params[:tagged_with],
+        size: params[:size],
+        filter: params[:filter]
+      ),
+      class: "previous-picture",
+      remote: true do %>
+      <span class="icon-angle-left"></span>
+    <% end %>
+  <% end %>
+  <% if @next %>
+    <%= link_to alchemy.admin_picture_path(
+        id: @next,
+        q: params[:q],
+        page: params[:page],
+        tagged_with: params[:tagged_with],
+        size: params[:size],
+        filter: params[:filter]
+      ),
+      class: "next-picture",
+      remote: true do %>
+      <span class="icon-angle-right"></span>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="picture-details-overlay">
+  <%= render 'form' %>
+  <%= render 'infos' %>
+</div>
+
+<div class="picture-overlay-handle">
+  <span class="icon-angle-double-right"></span>
+</div>

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

@@ -0,0 +1,6 @@
+Alchemy.growl('<%= @message[:body] %>', '<%= @message[:type] %>');
+$('#picture_<%= @picture.id %> .picture_name').text('<%= @picture.name %>');
+$('#picture_<%= @picture.id %> .picture_tags').html('<%== @picture.tag_list.map do |tag|
+  "<span class=\"tag\">#{tag}</span>".html_safe
+end.join %>');
+$('#picture_name').blur();

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

@@ -1,13 +1,13 @@
-<%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable) do |f| %>
+<%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable, current_location_params) do |f| %>
   <% resource_handler.editable_attributes.each do |attribute| %>
     <% if relation = attribute[:relation] %>
       <%= f.association relation[:name].to_sym,
         label_method: relation[:attr_method],
-        include_blank: _t(:blank, scope: 'resources.relation_select'),
+        include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
         input_html: {class: 'alchemy_selectbox'} %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>
   <% end %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -10,19 +10,19 @@
 <% end %>
   <td class="tools">
     <% if can?(:destroy, resource) %>
-    <%= delete_button resource_path(resource) %>
+    <%= delete_button resource_path(resource, current_location_params) %>
     <% end %>
     <% if can?(:edit, resource) %>
     <%= link_to_dialog(
       '',
-      edit_resource_path(resource),
+      edit_resource_path(resource, current_location_params),
       {
-        title: _t('Edit'),
+        title: Alchemy.t('Edit'),
         size: resource_window_size
       },
       {
         class: 'icon edit',
-        title: _t('Edit')
+        title: Alchemy.t('Edit')
       }
     ) %>
     <% end %>

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

@@ -4,11 +4,10 @@
     <tr>
     <% resource_handler.attributes.each do |attribute| %>
       <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
-        <%= sortable_column(
+        <%= sort_link [:resource_url_proxy, @query],
+          sortable_resource_header_column(attribute),
           resource_handler.model.human_attribute_name(attribute[:name]),
-          :column => sortable_resource_header_column(attribute),
-          :route_proxy => resource_url_proxy
-        ) %>
+          hide_indicator: true %>
       </th>
     <% end %>
       <th class="tools"></th>
@@ -18,8 +17,8 @@
     <%= render_resources %>
   </tbody>
 </table>
-<% elsif params[:query] %>
-<p><%= _t('Nothing found') %></p>
+<% elsif params[:q].present? %>
+<p><%= Alchemy.t('Nothing found') %></p>
 <% end %>
 
 <%= paginate resources_instance_variable, scope: resource_url_proxy, theme: 'alchemy' %>

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

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

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

@@ -1,4 +1,4 @@
-<% label_title = _t("Create #{resource_name}", default: _t('Create')) %>
+<% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
 <% toolbar(
   buttons: [
@@ -16,9 +16,9 @@
     },
     {
       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),
+      url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: params[:q], sort: params[:sort]),
+      label: Alchemy.t(:download_csv),
+      title: Alchemy.t(:download_csv),
       dialog: false,
       loading_indicator: false,
       if_permitted_to: [:index, resource_model]

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

@@ -1,4 +1,4 @@
-<% label_title = _t("Create #{resource_name}", default: _t('Create')) %>
+<% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
 <% toolbar(
   buttons: [

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

@@ -8,20 +8,20 @@
   <td class="tools">
     <% if can?(:destroy, Alchemy::Tag) %>
     <%= delete_button admin_tag_path(tag), {
-      message: _t(:do_you_really_want_to_delete_this_tag?),
+      message: Alchemy.t(:do_you_really_want_to_delete_this_tag?),
       icon: 'tag_delete',
-      title: _t(:delete_tag)
+      title: Alchemy.t(:delete_tag)
     } %>
     <% end %>
     <% if can?(:edit, Alchemy::Tag) %>
     <%= link_to_dialog '',
       edit_admin_tag_path(tag),
       {
-        title: _t(:edit_tag),
+        title: Alchemy.t(:edit_tag),
         size: '360x410'
       },
       {
-        title: _t(:edit_tag),
+        title: Alchemy.t(:edit_tag),
         class: 'icon tag_edit'
       }
     %>

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

@@ -1,17 +1,17 @@
 <%= alchemy_form_for @tag, as: 'tag', url: alchemy.admin_tag_path(@tag), html: {method: 'patch'} do |f| %>
   <%= render_message :info do %>
-    <%= _t(:you_can_rename_this_tag) %>
+    <%= Alchemy.t(:you_can_rename_this_tag) %>
   <% end %>
   <%= f.input :name %>
-  <%= f.submit _t(:rename) %>
+  <%= f.submit Alchemy.t(:rename) %>
 <% end %>
 <% if @tags.any? -%>
   <%= alchemy_form_for @tag, as: 'tag', url: alchemy.admin_tag_path(@tag), html: {method: 'patch'} do |f| %>
     <%= render_message :info do %>
-      <%= _t(:or_replace_it_with_an_existing_tag) %>
+      <%= Alchemy.t(:or_replace_it_with_an_existing_tag) %>
     <% end %>
     <div class="input tags">
-      <label class="control-label"><%= _t('Tags') %></label>
+      <label class="control-label"><%= Alchemy.t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">
         <%= js_filter_field '#tag_list li' %>
         <ul id="tag_list" class="tags">
@@ -19,6 +19,6 @@
         </ul>
       </div>
     </div>
-    <%= f.submit _t(:replace) %>
+    <%= f.submit Alchemy.t(:replace) %>
   <% end %>
 <% end %>

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

@@ -2,12 +2,12 @@
   buttons: [
     {
       icon: 'tag_add',
-      label: _t('New Tag'),
+      label: Alchemy.t('New Tag'),
       url: alchemy.new_admin_tag_path,
-      title: _t('New Tag'),
+      title: Alchemy.t('New Tag'),
       hotkey: 'alt+n',
       dialog_options: {
-        title: _t('New Tag'),
+        title: Alchemy.t('New Tag'),
         size: '310x180'
       },
       if_permitted_to: [:create, Alchemy::Tag]
@@ -26,9 +26,9 @@
     <thead>
       <tr>
         <th class="icon"></th>
-        <th class="name"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:name), column: :name) %></th>
+        <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
         <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></th>
-        <th class="count"><%= sortable_column(ActsAsTaggableOn::Tag.human_attribute_name(:taggings_count), column: :taggings_count) %></th>
+        <th class="count"><%= sort_link(@query, :taggings_count, hide_indicator: true) %></th>
         <th class="tools"></th>
       </tr>
     </thead>
@@ -42,9 +42,9 @@
   <% else %>
 
   <%= render_message do %>
-    <h2><%= _t('No Tags found') %></h2>
-    <% if params[:query].blank? %>
-      <p><%= _t(:tags_get_created_if_used_the_first_time) %></p>
+    <h2><%= Alchemy.t('No Tags found') %></h2>
+    <% if params[:q].blank? %>
+      <p><%= Alchemy.t(:tags_get_created_if_used_the_first_time) %></p>
     <% end %>
   <% end %>