alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,12 +1,12 @@
-<% if @attachments.blank? && params[:query].nil? %>
+<% if @attachments.blank? && params[:q].blank? %>
 <div class="info" id="no_files_notice">
   <%= render_icon('info') %>
-  <%= _t(:no_files_in_archive) %>
+  <%= Alchemy.t(:no_files_in_archive) %>
 </div>
 <% elsif @attachments.blank? %>
 <div class="info">
   <%= render_icon('info') %>
-  <%= _t(:no_search_results) %>
+  <%= Alchemy.t(:no_search_results) %>
 </div>
 <% end %>
 <table id="all_files" class="list">
@@ -14,19 +14,11 @@
   <thead>
     <tr>
       <th class="icon"></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="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
+      <th class="file_name"><%= sort_link(@query, :file_name, hide_indicator: true) %></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="file_size"><%= sort_link(@query, :file_size, hide_indicator: true) %></th>
+      <th class="date"><%= sort_link(@query, :created_at, hide_indicator: true) %></th>
       <th class="tools"></th>
     </tr>
   </thead>

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

@@ -1,7 +1,7 @@
 <% if @attachments.empty? %>
   <div class="info">
     <%= render_icon('info') %>
-    <%= _t(:no_files_in_archive) %>
+    <%= Alchemy.t(:no_files_in_archive) %>
   </div>
 <% else %>
   <ul>

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

@@ -1,12 +1,12 @@
 <% p = params.dup %>
-<h2><%= _t("Filter by tag") %></h2>
+<h2><%= Alchemy.t("Filter by tag") %></h2>
 <%= js_filter_field '#tag_list li' %>
 <ul>
   <%= render_tag_list('Alchemy::Attachment', 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/attachments/edit.html.erb

@@ -1,10 +1,10 @@
 <%= alchemy_form_for([:admin, @attachment],
-  url: {action: :update, query: params[:query], page: params[:page]}) do |f| -%>
+  url: {action: :update, q: params[:q], page: params[:page]}) do |f| -%>
   <%= f.input :name, input_html: {autofocus: true} %>
-  <%= f.input :file_name, input_html: {autofocus: true}, hint: _t(:attachment_filename_notice) %>
+  <%= f.input :file_name, input_html: {autofocus: true}, hint: Alchemy.t(:attachment_filename_notice) %>
   <div class="input string">
     <%= f.label :tag_list %>
     <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
   </div>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1,21 +1,14 @@
 <% any_tags = Alchemy::Attachment.tag_counts.any? %>
-<%= toolbar(
-  buttons: [
-    {
-      icon: 'upload',
-      url: alchemy.new_admin_attachment_path,
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: _t(:upload_file),
-        size: '540x515'
-      },
-      title: _t(:upload_file),
-      class: 'icon_button',
-      label: _t(:upload_file),
-      if_permitted_to: [:create, Alchemy::Attachment]
-    }
-  ]
-) %>
+<% content_for(:toolbar) do %>
+  <div class="toolbar_buttons">
+    <% if can? :create, Alchemy::Attachment %>
+      <%= render 'alchemy/admin/uploader/button',
+        redirect_url: alchemy.admin_attachments_path,
+        model_class: Alchemy::Attachment,
+        file_attribute: 'file' %>
+    <% end %>
+  </div>
+<% end %>
 <div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
   <%= resources_header %>
   <%= render partial: 'files_list' %>

data/app/views/alchemy/admin/clipboard/clear.js.erb

@@ -1,3 +1,3 @@
-$("#clipboard_items").replaceWith("<%= j render_message { _t('No items in your clipboard') } -%>");
+$("#clipboard_items").replaceWith("<%= j render_message { Alchemy.t('No items in your clipboard') } -%>");
 $('#clipboard_button .icon.clipboard').removeClass('full');
 Alchemy.pleaseWaitOverlay(false);

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

@@ -1,7 +1,7 @@
 <%- if @clipboard_items.blank? -%>
 <div class="info">
   <%= render_icon('info') %>
-  <%= _t('No items in your clipboard') %>
+  <%= Alchemy.t('No items in your clipboard') %>
 </div>
 <%- else -%>
 <div id="clipboard_items">
@@ -11,12 +11,12 @@
     <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
       <%= render_icon("clipboard_#{item_class}") %>
       <%= item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text(60) : item.name %>
-      <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(remarkable_type: item_class, remarkable_id: item.id), remote: true, method: 'delete', title: _t('Remove item from clipboard')) %></span>
+      <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(remarkable_type: item_class, remarkable_id: item.id), remote: true, method: 'delete', title: Alchemy.t('Remove item from clipboard')) %></span>
     </li>
     <%- end -%>
   </ul>
   <p>
-    <%= link_to_confirm_dialog(_t('clear clipboard'), _t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(remarkable_type: params[:remarkable_type]), class: 'button') %>
+    <%= link_to_confirm_dialog(Alchemy.t('clear clipboard'), Alchemy.t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(remarkable_type: params[:remarkable_type]), class: 'button') %>
   </p>
 </div>
 <%- end -%>

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -1,6 +1,6 @@
 <% if params[:remove] -%>
 
-$(".element_editor[data-element-id='<%= @item.id %>']").remove();
+$(".element-editor[data-element-id='<%= @item.id %>']").remove();
 
 <% if @item.class.to_s == 'Element' -%>
 
@@ -8,11 +8,11 @@ $('#element_area .sortable_cell').sortable('refresh');
 
 <% end -%>
 
-Alchemy.growl('<%= j _t("item moved to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>');
+Alchemy.growl('<%= j Alchemy.t("item moved to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>');
 
 <% else -%>
 
-Alchemy.growl('<%= j _t("item copied to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
+Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
 
 <% end -%>
 

data/app/views/alchemy/admin/clipboard/remove.js.erb

@@ -1,10 +1,10 @@
 (function($) {
 
   $("#clipboard_item_<%= @item.id -%>").remove();
-  Alchemy.growl('<%= _t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+  Alchemy.growl('<%= Alchemy.t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- if @clipboard.blank? -%>
   $('#clipboard_button .icon.clipboard').removeClass('full');
-  $("#clipboard_items").replaceWith("<p><%= _t('No items in your clipboard') -%></p>");
+  $("#clipboard_items").replaceWith("<p><%= Alchemy.t('No items in your clipboard') -%></p>");
 <%- end -%>
 
 })(jQuery);

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

@@ -1,9 +1,8 @@
 <div class="content_editor missing" data-element-<%= element.id %>-missing-content="<%= name %>">
   <label><%= Alchemy::Content.translated_label_for(name, element.name) %></label>
-  <p>
-    <%= render_icon('warning') %>
-    <%= _t(:content_not_found) %>
-    <%= link_to _t(:create),
+  <%= render_message :warning do %>
+    <p><%= Alchemy.t(:content_not_found) %></p>
+    <%= link_to Alchemy.t(:create),
       alchemy.admin_contents_path(
         content: {
           element_id: element.id,
@@ -13,7 +12,6 @@
         options: options.to_json
       ),
       'data-create-missing-content' => true,
-      class: 'small button'
-    %>
-  </p>
+      class: 'small button' %>
+  <% end %>
 </div>

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

@@ -16,7 +16,7 @@ $("<%= @content_dom_id %>").before('<%= j(
   )
 ) %>');
 Alchemy.Buttons.enable();
-Alchemy.growl('<%= j _t("Successfully added content") % {content: @content.name_for_label} %>')
+Alchemy.growl('<%= j Alchemy.t("Successfully added content") % {content: @content.name_for_label} %>')
 
 <% end %>
 

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

@@ -3,9 +3,9 @@
   <%= hidden_field_tag('options', @options.to_json) %>
   <%= f.input :name, collection: @contents.map { |content|
       [
-        _t(content['name'], scope: 'content_names', default: content['name'].humanize),
+        Alchemy.t(content['name'], scope: 'content_names', default: content['name'].humanize),
         content['name']
       ]
     }, include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
-  <%= f.submit _t(:create) %>
+  <%= f.submit Alchemy.t(:create) %>
 <% end %>

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

@@ -1,23 +1,23 @@
 <div class="widget">
-  <h2><%= _t('Currently locked pages') %>:</h2>
+  <h2><%= Alchemy.t('Currently locked pages') %>:</h2>
   <table>
-  <% if @locked_pages.blank? %>
+  <% if @all_locked_pages.blank? %>
     <tr class="even">
-      <td><%= _t('no pages') %></td>
+      <td><%= Alchemy.t('no pages') %></td>
     </tr>
   <% else %>
-    <% @locked_pages.each do |page| %>
+    <% @all_locked_pages.each do |page| %>
     <tr class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
       <% if current_alchemy_user.id == page.locked_by %>
       <td>
         <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %>
       </td>
       <td>
-        <small><%= _t(:me) %></small>
+        <small><%= Alchemy.t(:me) %></small>
       </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="<%= Alchemy.t(:explain_unlocking) %>">
             <%= render_icon('close small') %>
           </button>
         <% end %>

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

@@ -1,9 +1,9 @@
 <div class="widget">
-  <h2><%= _t('Your last updated pages') %>:</h2>
+  <h2><%= Alchemy.t('Your last updated pages') %>:</h2>
   <table>
   <% if @last_edited_pages.blank? %>
     <tr class="even">
-      <td><%= _t('no pages') %></td>
+      <td><%= Alchemy.t('no pages') %></td>
     </tr>
   <% else %>
     <% @last_edited_pages.each do |page| %>

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

@@ -1,9 +1,9 @@
 <div class="widget">
-  <h2><%= _t('Who else is online') %>:</h2>
+  <h2><%= Alchemy.t('Who else is online') %>:</h2>
   <table>
   <% if @online_users.blank? %>
     <tr class="even">
-      <td><%= _t('no users') %></td>
+      <td><%= Alchemy.t('no users') %></td>
     </tr>
   <% else %>
     <% @online_users.each do |user| %>

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

@@ -1,21 +1,21 @@
-<h2><%= _t('Global shortcuts') %></h2>
+<h2><%= Alchemy.t('Global shortcuts') %></h2>
 <ul class="shortcuts">
-  <li><kbd>?</kbd><%= _t('Open help window', scope: 'help.shortcuts') %></li>
-  <li><kbd>esc</kbd><%= _t('Close current dialog', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>q</kbd><%= _t('Open logout dialog', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>f</kbd><%= _t('Focus search field', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Create a new record', scope: 'help.shortcuts') %></li>
+  <li><kbd>?</kbd><%= Alchemy.t('Open help window', scope: 'help.shortcuts') %></li>
+  <li><kbd>esc</kbd><%= Alchemy.t('Close current dialog', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>q</kbd><%= Alchemy.t('Open logout dialog', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>f</kbd><%= Alchemy.t('Focus search field', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>n</kbd><%= Alchemy.t('Create a new record', scope: 'help.shortcuts') %></li>
 </ul>
-<h2><%= _t('Page edit shortcuts') %></h2>
+<h2><%= Alchemy.t('Page edit shortcuts') %></h2>
 <ul class="shortcuts">
-  <li><kbd>alt</kbd><kbd>i</kbd><%= _t('Show page infos', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Create new element', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>e</kbd><%= _t('Edit page properties', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>r</kbd><%= _t('Reload the preview', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>x</kbd><%= _t('Leave the page', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>i</kbd><%= Alchemy.t('Show page infos', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>n</kbd><%= Alchemy.t('Create new element', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>e</kbd><%= Alchemy.t('Edit page properties', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>r</kbd><%= Alchemy.t('Reload the preview', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>x</kbd><%= Alchemy.t('Leave the page', scope: 'help.shortcuts') %></li>
 </ul>
-<h2><%= _t('Library shortcuts') %></h2>
+<h2><%= Alchemy.t('Library shortcuts') %></h2>
 <ul class="shortcuts">
-  <li><kbd>alt</kbd><kbd>n</kbd><%= _t('Open upload form', scope: 'help.shortcuts') %></li>
-  <li><kbd>alt</kbd><kbd>a</kbd><%= _t('Select all pictures', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>n</kbd><%= Alchemy.t('Open upload form', scope: 'help.shortcuts') %></li>
+  <li><kbd>alt</kbd><kbd>a</kbd><%= Alchemy.t('Select all pictures', scope: 'help.shortcuts') %></li>
 </ul>

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

@@ -2,11 +2,11 @@
   buttons: [
     {
       icon: 'info',
-      label: _t(:info),
+      label: Alchemy.t(:info),
       url: alchemy.dashboard_info_path,
-      title: _t(:info),
+      title: Alchemy.t(:info),
       dialog_options: {
-        title: _t(:info),
+        title: Alchemy.t(:info),
         size: "420x380"
       },
       if_permitted_to: [:info, :alchemy_admin_dashboard],
@@ -19,14 +19,14 @@
 <div id="dashboard">
   <h1>
     <% if @first_time -%>
-    <%= _t(:welcome_note, name: current_alchemy_user.try(:name)) %>
+    <%= Alchemy.t(:welcome_note, name: current_alchemy_user.try(:name)) %>
     <% else -%>
-    <%= _t(:welcome_back_note, name: current_alchemy_user.try(:name)) %>
+    <%= Alchemy.t(:welcome_back_note, name: current_alchemy_user.try(:name)) %>
     <% end -%>
   </h1>
   <% if @last_sign_at %>
   <p>
-    <small><%= _t('Your last login was on', time: l(@last_sign_at)) %></small>
+    <small><%= Alchemy.t('Your last login was on', time: l(@last_sign_at)) %></small>
   </p>
   <% end %>
   <div class="column left">

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

@@ -1,26 +1,26 @@
 <p class="center"><%= image_tag('alchemy/alchemy-logo.svg') %></p>
 <h2 class="center">
-  <%= _t("Version") %>: <%= @alchemy_version %>
+  <%= Alchemy.t("Version") %>: <%= @alchemy_version %>
 </h2>
 <% if can? :update_check, :alchemy_admin_dashboard %>
 <p class="center" id="update_check">
   <span id="update_available">
     <%= render_icon('warning') %>
-    <%= _t 'Update available' %>
+    <%= Alchemy.t 'Update available' %>
   </span>
   <span id="up_to_date">
     <%= render_icon('ok') %>
-    <%= _t 'Alchemy is up to date' %>
+    <%= Alchemy.t 'Alchemy is up to date' %>
   </span>
   <span id="error">
     <%= render_icon('warning') %>
-    <%= _t 'Update status unavailable' %>
+    <%= Alchemy.t 'Update status unavailable' %>
   </span>
 </p>
 <% end %>
 <div class="info">
   <%= render_icon('info') %>
-  <p><%= _t('Alchemy is open software and itself uses open software and free resources:') %></p>
+  <p><%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %></p>
   <ul>
     <li>
       <a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>

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

@@ -6,7 +6,7 @@
       options: options
     ),
     {
-      title: _t(:add_image_to_element),
+      title: Alchemy.t(:add_image_to_element),
       size: '780x580',
       padding: false
     }

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

@@ -1,23 +1,57 @@
-<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
-  <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
-  <% if !element.folded? %>
-    <%= form_for [:admin, element], :remote => true, :html => {:id => "element_#{element.id}_form"} do |f| %>
-      <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
-      <div id="element_<%= element.id %>_content" class="element_content">
-        <%= render_editor(element) %>
+<%= content_tag :div,
+  id: "element_#{element.id}",
+  data: {'element-id' => element.id, 'element-name' => element.name},
+  class: element_editor_classes(element, local_assigns) do %>
+
+  <%= render 'alchemy/admin/elements/element_header', element: element %>
+
+  <% if element.expanded? %>
+    <%= render 'alchemy/admin/elements/element_toolbar', element: element %>
+
+    <%= form_for [alchemy, :admin, element], remote: true,
+      html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
+
+      <div id="element_<%= element.id %>_errors" class="element_errors"></div>
+
+      <div id="element_<%= element.id %>_content" class="element-content-editors">
+        <%== render_editor(element) %>
       </div>
-      <% if element.has_validations? %>
-      <p class="validation_notice">
-        <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
-      </p>
-      <% end %>
+
       <% if element.taggable? %>
-      <div class="autocomplete_tag_list">
-        <%= f.label :tag_list %>
-        <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-      </div>
+        <div class="autocomplete_tag_list">
+          <%= f.label :tag_list %>
+          <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+        </div>
       <% end %>
-      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element, :f => f} %>
     <% end %>
   <% end %>
-</div>
+
+  <% if element.nestable_elements.any? %>
+    <% if show_element_footer?(element, :with_nestable_elements) %>
+      <%= render 'alchemy/admin/elements/element_footer', element: element %>
+    <% end %>
+    <div class="nestable-elements">
+      <%= content_tag :div,
+            class: "nested-elements", data: {
+              'droppable-elements' => element.nestable_elements.join(' ')
+            } do %>
+        <%= render partial: 'alchemy/admin/elements/element', collection: element.nested_elements %>
+      <% end %>
+
+      <% if element.expanded? %>
+        <%= link_to_dialog render_icon(:create) + Alchemy.t("New Element"),
+          alchemy.new_admin_element_path(
+            parent_element_id: element.id,
+            page_id: element.page.id
+          ), {
+            size: "320x125",
+            title: Alchemy.t("New Element")
+          }, class: "button with_icon add-nestable-element-button" %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if show_element_footer?(element) %>
+    <%= render 'alchemy/admin/elements/element_footer', element: element %>
+  <% end %>
+<% end %>