alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -2,7 +2,7 @@
   $('#locked_page_<%= @page.id -%>').remove();
   $('#page_<%= @page.id -%> .sitemap_page').removeClass('locked');
   <%- if @pages_locked_by_user.blank? -%>
-  $('#subnav_additions label').hide();
+  $('#locked_pages label').hide();
   <%- end -%>
   Alchemy.growl('<%= flash[:notice] -%>');
 })(jQuery);

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

@@ -5,13 +5,13 @@
 
 <% if @old_page_layout != @page.page_layout -%>
   Alchemy.ElementsWindow.reload();
-  Alchemy.growl('<%= j _t(:page_layout_changed_notice) %>');
+  Alchemy.growl('<%= j Alchemy.t(:page_layout_changed_notice) %>');
 <% end -%>
 
 <% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
-  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("page_status") %>');
+  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("page_status", page: @page) %>');
 
 <% else -%>
 
@@ -26,7 +26,7 @@
   <% if @page.restricted? -%>
     $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
   <% elsif @page.redirects_to_external? -%>
-    $('span.redirect_url', $page).html('&raquo; <%= _t("Redirects to") %>: <%= h @page.external_urlname %>');
+    $('span.redirect_url', $page).html('&raquo; <%= Alchemy.t("Redirects to") %>: <%= h @page.external_urlname %>');
   <% else -%>
     $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
   <% end -%>

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

@@ -1 +1 @@
-<%= f.text_field :tag_list, data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>
+<%= f.text_field :tag_list, value: f.object.tag_list.join(","), data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>

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

@@ -7,5 +7,5 @@
       data: {'auto-submit' => true}
     ) %>
   <% end %>
-  <label><%= _t("Language tree") %></label>
+  <label><%= Alchemy.t("Language tree") %></label>
 </div>

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

@@ -7,6 +7,6 @@
     <% else %>
     <span class="module icon"></span>
     <% end %>
-    <label><%= truncate _t(navigation["name"]), length: 10 %></label>
+    <label><%= truncate Alchemy.t(navigation["name"]), length: 10 %></label>
   <% end %>
 <% end %>

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

@@ -1,33 +1,27 @@
-<%= form_tag(
-  url_for({
+<%= search_form_for @query, url: url_for(
     action: 'index',
     options: @options.to_json,
     size: @size
-  }),
-  remote: true,
-  method: 'get'
-) do %>
+  ), remote: true, html: {class: 'remote-search-form', id: nil} do |f| %>
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
   <div class="search_field">
-  <%= render_icon('search') %>
-    <%= text_field_tag :query,
-      params['query'],
-      class: 'thin_border',
+    <%= render_icon('search') %>
+    <%= f.search_field resource_handler.search_field_name,
       id: 'search_input_field',
-      placeholder: _t(:search) %>
-    <%= link_to '', url_for({
+      placeholder: Alchemy.t(:search) %>
+    <%= link_to '', url_for(
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
         options: @options.to_json,
         size: @size,
         overlay: true
-      }),
+      ),
       remote: true,
       class: 'search_field_clear',
       id: 'search_field_clear',
-      title: _t(:click_to_show_all),
-      style: params[:query].nil? ? 'display: none' : 'display: block' %>
+      title: Alchemy.t(:click_to_show_all),
+      style: params[:q].blank? ? 'display: none' : 'display: block' %>
   </div>
 <% end %>

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

@@ -1,20 +1,21 @@
-<%- url_scope =
-        begin
-          resource_url_proxy
-        rescue NameError
-          self
-        end -%>
-<%- url ||= url_scope.url_for(action: 'index') -%>
-<%= form_tag(url, method: 'get', class: 'search_form') do %>
+<%- url ||= resource_url_proxy.url_for(action: 'index') -%>
+
+<%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
     <%= render_icon('search') %>
-    <%= text_field_tag 'query', params['query'],
-      class: 'thin_border', id: 'search_input_field',
-      placeholder: _t(:search) %>
+    <%= f.search_field resource_handler.search_field_name,
+      id: 'search_input_field',
+      placeholder: Alchemy.t(:search) %>
+    <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
+      <%= f.hidden_field field %>
+    <% end %>
     <%= link_to '', url,
         class: 'search_field_clear',
         id: 'search_field_clear',
-        title: _t(:click_to_show_all),
-        style: params[:query].nil? ? 'display: none' : 'display: block' %>
+        title: Alchemy.t(:click_to_show_all),
+        style: params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
+    <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
+      <%= hidden_field_tag additional_param, params[additional_param] %>
+    <% end %>
   </div>
 <% end %>

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

@@ -2,7 +2,7 @@
   <% entry.stringify_keys! %>
   <% if can? *navigate_module(entry) %>
   <div class="subnavi_tab<%= entry_active?(entry) ? ' active' : nil %>">
-    <%= link_to _t(entry['name']), url_for_module_sub_navigation(entry) %>
+    <%= link_to Alchemy.t(entry['name']), url_for_module_sub_navigation(entry) %>
   </div>
   <% end %>
 <% end %>

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

@@ -6,26 +6,26 @@
 </div>
 <%= form_tag delete_multiple_admin_pictures_path, :method => :delete do %>
   <div class="selected_item_tools">
-    <h2><%= _t(:edit_selected_pictures) %></h2>
+    <h2><%= Alchemy.t(:edit_selected_pictures) %></h2>
     <%= link_to(
-      render_icon('edit') + _t("Edit"),
+      render_icon('edit') + Alchemy.t("Edit"),
       edit_multiple_admin_pictures_path,
       :class => 'button with_icon',
-      :title => _t('Edit multiple pictures'),
+      :title => Alchemy.t('Edit multiple pictures'),
       :id => 'edit_multiple_pictures',
       :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),
-      :ok_label => _t("Yes"),
-      :cancel_label => _t("No")
+    <%= button_tag render_icon('destroy') + Alchemy.t("Delete"), 'data-alchemy-confirm' => {
+      :title => Alchemy.t(:please_confirm),
+      :message => Alchemy.t(:confirm_to_delete_images_from_server),
+      :ok_label => Alchemy.t("Yes"),
+      :cancel_label => Alchemy.t("No")
     }.to_json, :class => 'button with_icon' %>
-    &nbsp;<%= _t(:or) %>&nbsp;
+    &nbsp;<%= Alchemy.t(:or) %>&nbsp;
     <%= link_to(
-      render_icon('delete-small') + _t("Clear selection"),
+      render_icon('delete-small') + Alchemy.t("Clear selection"),
       admin_pictures_path(
-        :query => params[:query],
+        :q => params[:q],
         :tagged_with => params[:tagged_with],
         :size => params[:size],
         :filter => params[:filter]
@@ -35,15 +35,15 @@
     ) %>
   </div>
   <div id="pictures">
-  <% if @pictures.blank? and @recent_pictures.blank? and params[:query].nil? %>
+  <% if @pictures.blank? and @recent_pictures.blank? and params[:q].blank? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t(:no_images_in_archive) %>
+      <%= Alchemy.t(:no_images_in_archive) %>
     </div>
   <% elsif @pictures.blank? and @recent_pictures.blank? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t(:no_search_results) %>
+      <%= Alchemy.t(:no_search_results) %>
     </div>
   <% else %>
     <%= render :partial => 'picture', :collection => @pictures %>

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

@@ -1,27 +1,18 @@
 <div id="image_assign_filter_and_image_sizing">
-  <div class="button_with_label">
-    <%= link_to_dialog(
-      render_icon('upload'),
-      alchemy.new_admin_picture_path(
-        element_id: @element.blank? ? nil : @element.id,
-        content_id: @content.blank? ? nil : @content.id,
-        swap: @swap,
-        page: params[:page],
-        size: @size,
-        options: @options.to_json
-      ),
-      {
-        size: "540x550",
-        title: _t(:upload_image)
-      },
-      {
-        class: 'icon_button',
-        title: _t(:upload_image)
-      }
-    ) %>
-    <label><%= _t(:upload_image) %></label>
-  </div>
-  <div class="toolbar_spacer"></div>
+  <% if can? :create, Alchemy::Picture %>
+    <%= render 'alchemy/admin/uploader/button',
+      model_class: Alchemy::Picture,
+      dropzone: '#assign_image_list',
+      file_attribute: 'image_file',
+      in_dialog: true,
+      redirect_url: alchemy.admin_pictures_path(
+        size: params[:size],
+        filter: 'last_upload',
+        content_id: @content.try(:id),
+        element_id: @element.try(:id)
+      ) %>
+    <div class="toolbar_spacer"></div>
+  <% end %>
   <div class="button_group">
     <div class="button_with_label">
       <%= link_to(
@@ -30,12 +21,13 @@
           size: "small",
           content_id: @content,
           element_id: @element,
-          swap: @swap,
-          query: params[:query],
-          options: @options.to_json
+          q: params[:q],
+          options: @options.to_json,
+          filter: params[:filter],
+          tagged_with: params[:tagged_with]
         }),
         remote: true,
-        title: _t(:small_thumbnails),
+        title: Alchemy.t(:small_thumbnails),
         class: "icon_button"
       ) %>
     </div>
@@ -46,12 +38,13 @@
           size: "medium",
           content_id: @content,
           element_id: @element,
-          swap: @swap,
-          query: params[:query],
-          options: @options.to_json
+          q: params[:q],
+          options: @options.to_json,
+          filter: params[:filter],
+          tagged_with: params[:tagged_with]
         }),
         remote: true,
-        title: _t(:medium_thumbnails),
+        title: Alchemy.t(:medium_thumbnails),
         class: "icon_button"
       ) %>
     </div>
@@ -62,16 +55,17 @@
           size: "large",
           content_id: @content,
           element_id: @element,
-          swap: @swap,
-          query: params[:query],
-          options: @options.to_json
+          q: params[:q],
+          options: @options.to_json,
+          filter: params[:filter],
+          tagged_with: params[:tagged_with]
         }),
         remote: true,
-        title: _t(:big_thumbnails),
+        title: Alchemy.t(:big_thumbnails),
         class: "icon_button"
       ) %>
     </div>
-    <label><%= _t('Image size') %></label>
+    <label><%= Alchemy.t('Image size') %></label>
     <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
   </div>
   <%= render partial: 'alchemy/admin/partials/remote_search_form' %>

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

@@ -1,14 +1,14 @@
 <% params_to_keep = [:size, :tagged_with, :query, :element_id, :options, :content_id, :_] %>
 
 <div id="filter_bar">
-  <h2><%= _t('Filter') %></h2>
+  <h2><%= Alchemy.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(:without_tag), 'without_tag']
+      [Alchemy.t(:all_pictures), ''],
+      [Alchemy.t(:last_upload_only), 'last_upload'],
+      [Alchemy.t(:recently_uploaded_only), 'recent'],
+      [Alchemy.t(:without_tag), 'without_tag']
     ], params[:filter]),
     :data => { :remote => !!request.xhr? },
     :class => 'alchemy_selectbox'

data/app/views/alchemy/admin/pictures/{edit.html.erb → _form.html.erb}

@@ -1,13 +1,14 @@
 <%= alchemy_form_for [:admin, @picture] do |f| %>
-  <%= hidden_field_tag :query, params[:query] %>
-  <%= hidden_field_tag :size, params[:size] %>
-  <%= hidden_field_tag :tagged_with, params[:tagged_with] %>
-  <%= hidden_field_tag :filter, params[:filter] %>
+  <h2><%= Alchemy.t('Edit image') %></h2>
   <%= f.input :name %>
   <div class="input tag_list">
     <%= f.label :tag_list %>
     <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-    <small class="hint"><%= _t('Please seperate the tags with commata') %></small>
+    <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
   </div>
-  <%= f.submit _t(:save) %>
+  <%= 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] %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -0,0 +1,50 @@
+<div class="resource_info">
+  <div class="picture-file-infos">
+    <h2><%= Alchemy.t('Picture infos') %></h2>
+    <div class="value">
+      <label><%= Alchemy::Picture.human_attribute_name(:image_file_name) %></label>
+      <p><%= @picture.image_file_name %></p>
+    </div>
+    <div class="value">
+      <label><%= Alchemy::Picture.human_attribute_name(:image_file_dimensions) %></label>
+      <p><%= @picture.image_file_dimensions %>px</p>
+    </div>
+    <div class="value">
+      <label><%= Alchemy::Picture.human_attribute_name(:image_file_size) %></label>
+      <p><%= number_to_human_size @picture.image_file_size %></p>
+    </div>
+  </div>
+</div>
+
+<div class="picture-usage-info resource_info">
+  <h2><%= Alchemy.t(:this_picture_is_used_on_these_pages) %></h2>
+  <div id="pictures_page_list">
+    <% if @pages.any? %>
+      <ol>
+        <% @pages.each do |page, essence_pictures| %>
+          <% if page %>
+            <li>
+              <h3><%= link_to page.name, edit_admin_page_path(page) %></h3>
+              <ul class="list">
+                <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
+                  <li class="<%= cycle('even', 'odd') %>">
+                    <% page_link = link_to element.display_name_with_preview_text,
+                                   edit_admin_page_path(page, anchor: "element_#{element.id}") %>
+                    <% pictures = essence_pictures.collect do |e|
+                                    e.content.name_for_label
+                                  end.to_sentence %>
+                    <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                  </li>
+                <% end %>
+              </ul>
+            </li>
+          <% end %>
+        <% end %>
+      </ol>
+    <% else %>
+      <%= render_message do %>
+        <%= Alchemy.t(:picture_not_in_use_yet) %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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) %>
+    <%= Alchemy.t(:no_images_in_archive) %>
   </div>
 <% else %>
   <%= render partial: 'picture_to_assign',

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

@@ -6,77 +6,43 @@
   <span class="picture_tool delete">
     <%= link_to_confirm_dialog(
       "",
-      _t(:confirm_to_delete_image_from_server),
+      Alchemy.t(:confirm_to_delete_image_from_server),
       alchemy.admin_picture_path(
         id: picture,
-        query: params[:query],
+        q: params[:q],
         page: params[:page],
         tagged_with: params[:tagged_with],
         size: params[:size],
         filter: params[:filter]
       ),
       {
-        title: _t('Delete image')
+        title: Alchemy.t('Delete image')
       }
     ) -%>
   </span>
   <% end %>
+  <% image = image_tag(
+    alchemy.thumbnail_path(id: picture, size: @size, sh: picture.security_token(size: @size)),
+    alt: picture.name,
+    title: Alchemy.t(:zoom_image)
+  ) %>
   <% if can?(:edit, picture) %>
-  <span class="picture_tool edit">
-    <%= link_to_dialog(
-      "",
-      alchemy.edit_admin_picture_path(
-        id: picture,
-        query: params[:query],
-        page: params[:page],
-        tagged_with: params[:tagged_with],
-        size: params[:size],
-        filter: params[:filter]
-      ),
-      {
-        title: _t('Edit image'),
-        size: "400x210"
-      },
-      {
-        title: _t('Edit image')
-      }
-    ) -%>
-  </span>
-  <% end %>
-  <% if can?(:info, picture) %>
-  <span class="picture_tool info">
-    <%= link_to_dialog(
-      "",
-      alchemy.info_admin_picture_path(
+    <%= link_to(
+      image,
+      alchemy.admin_picture_path(
         id: picture,
-        query: params[:query],
+        q: params[:q],
         page: params[:page],
         tagged_with: params[:tagged_with],
         size: params[:size],
         filter: params[:filter]
       ),
-      {
-        title: _t('Picture infos'),
-        size: "400x270"
-      },
-      {
-        title: _t('Show picture infos')
-      }
-    ) -%>
-  </span>
+      class: 'thumbnail_background'
+    ) %>
+  <% else %>
+    <%= image %>
   <% end %>
-  <%= link_to(
-    image_tag(
-      alchemy.thumbnail_path(id: picture, size: @size, sh: picture.security_token(size: @size)),
-      alt: picture.name,
-      title: _t(:zoom_image)
-    ),
-    '#',
-    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}); return false",
-    class: 'thumbnail_background',
-    id: 'show_in_window'
-  ) %>
-  <span class="picture_name" title="<%= picture.name %>" id="image_picture_<%= picture.id %>_name">
+  <span class="picture_name" title="<%= picture.name %>">
     <%= picture.name %>
   </span>
   <div class="picture_tags">