alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -15,7 +15,7 @@
       :remote => true,
       :method => :post,
       :class => "element_move_button",
-      :title => _t("cut_element")
+      :title => _t(:cut_element)
     ) %>
     <%= link_to(
       "",
@@ -23,14 +23,14 @@
       :remote => true,
       :method => :post,
       :class => "element_copy_button",
-      :title => _t("copy_element")
+      :title => _t(:copy_element)
     ) %>
   </span>
   <span class="element_public">
     <%= f.check_box :public, :id => "element_#{element.id}_public" -%>
-    <%= label_tag "element_#{element.id}_public", _t("visible") -%>
+    <%= label_tag "element_#{element.id}_public", _t(:visible) -%>
   </span>
   <button type="submit" class="button">
-    <%= _t('save') %>
+    <%= _t(:save) %>
   </button>
 </div>

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

@@ -13,14 +13,8 @@
   </span>
   <%= render_hint_for(element) %>
   <span class="ajax_folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
-    <%= image_tag(
-      "alchemy/ajax_loader.gif",
-      :style => "display: none",
-      :id => "element_#{element.id}_folder_spinner",
-      :class => "element_folder_spinner"
-    ) %>
     <%= link_to('', '#', {
-      :onclick => "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{_t('Warning!')}', message: '#{_t(:element_dirty_notice)}', okLabel: '#{_t('Yes')}', cancelLabel: '#{_t('No')}'})",
+      :onclick => "Alchemy.toggleElement(#{element.id}, {title: '#{_t('Warning!')}', message: '#{_t(:element_dirty_notice)}', okLabel: '#{_t('Yes')}', cancelLabel: '#{_t('No')}'})",
       :class => element.folded? ? 'expand_element' : 'fold_element',
       :title => element.folded? ? _t(:show_element_content) : _t(:hide_element_content),
       :id => "element_#{element.id}_folder"

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

@@ -1,9 +1,9 @@
 <%= select_tag(
   "element_from_page_#{@page_id}_to_link",
   options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text, "##{m.dom_id}"] }),
-  :prompt => _t("choose_element_to_link"),
+  :prompt => _t(:choose_element_to_link),
   :class => "elements_from_page_selector alchemy_selectbox",
   :onchange => "jQuery('#page_anchor').val(value)",
-  :title => _t("choose_element_as_target"),
+  :title => _t(:choose_element_as_target),
   :autofocus => true
 ) %>

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

@@ -2,7 +2,7 @@
 <%- if @elements.blank? -%>
   <div class="info with_margin">
     <%= render_icon('info') %>
-    <%= _t('no_more_elements_to_add') %>
+    <%= _t(:no_more_elements_to_add) %>
   </div>
 <%- else -%>
   <%= form_for [:admin, @element], :remote => true, :class => "add_element_content" do |form| %>
@@ -10,13 +10,13 @@
     <table>
       <tr>
         <td class="label">
-          <%= form.label :name, _t("element_of_type") %>
+          <%= form.label :name, _t(:element_of_type) %>
         </td>
         <td class="select">
           <%= form.select(
             'name',
             @page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
-            { :prompt => _t('select_element') },
+            { :prompt => _t(:select_element) },
             { :class => "alchemy_selectbox", :autofocus => true }
           ) -%>
         </td>
@@ -24,7 +24,7 @@
       <tr>
         <td colspan="2" class="submit">
           <%= form.hidden_field 'page_id' %>
-          <%= form.button _t('add'), :class => 'button' %>
+          <%= form.button _t(:add), :class => 'button' %>
         </td>
       </tr>
     </table>

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

@@ -1,6 +1,6 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
 <div class="content_editor picture_gallery_editor">
-  <label><%= _t("picture_gallery_editor.#{element.name}", :default => _t('picture_gallery_editor')) %></label>
+  <label><%= _t("picture_gallery_editor.#{element.name}", :default => _t(:picture_gallery_editor)) %></label>
   <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
     <%- pictures.each do |picture| -%>
       <%= render_essence_editor(picture, {:dragable => (pictures.size > 1)}.merge(options)) %>

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

@@ -27,7 +27,7 @@ if ($element_area.find('.element_editor').length > 0) {
   $element_area.sortable('refresh');
 }
 
-Alchemy.growl('<%= _t("successfully_added_element") -%>');
+Alchemy.growl('<%= _t(:successfully_added_element) -%>');
 Alchemy.closeCurrentWindow();
 
 <% @element.contents.essence_richtexts.each do |content| %>
@@ -35,7 +35,7 @@ Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
 <% end %>
 
 Alchemy.PreviewWindow.refresh();
-Alchemy.ElementEditorSelector.init();
+Alchemy.ElementEditors.init();
 
 $el = $('#element_<%= @element.id -%>');
 $el.trigger('Alchemy.SelectElementEditor');

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -10,14 +10,14 @@
 
   <% if @error %>
 
-    $("#element_<%= @element.id -%>_folder_spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
+    $("#element_<%= @element.id -%> .spinner").replaceWith("<span class='error_icon' title='<%= @error -%>'>!</span>");
 
   <% else %>
 
     $el.replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
     $el = $('#element_<%= @element.id %>');
     $('#element_area .sortable_cell').sortable('refresh');
-    Alchemy.ElementEditorSelector.reinit($el);
+    Alchemy.ElementEditors.reinit($el);
 
     <% if @element.folded %>
 
@@ -34,10 +34,7 @@
         Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
       <% end %>
 
-      Alchemy.ElementDirtyObserver($el);
-      Alchemy.Datepicker('input[type="date"]', $el);
-      Alchemy.Buttons.observe($el);
-      Alchemy.overlayObserver("#element_<%= @element.id -%>");
+      Alchemy.GUI.initElement($el);
 
     <% end %>
 

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

@@ -24,7 +24,7 @@
         <tr>
           <td colspan="2" class="submit">
             <%= f.hidden_field(:page_id) %>
-            <%= f.button _t("paste"), :class => 'button' %>
+            <%= f.button _t(:paste), :class => 'button' %>
           </td>
         </tr>
       </table>

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-  Alchemy.growl('<%= _t("successfully_saved_element_position") -%>');
+  Alchemy.growl('<%= _t(:successfully_saved_element_position) -%>');
   $('#element_area .ajax_folder').show();
   Alchemy.PreviewWindow.refresh();
 

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -2,7 +2,7 @@ $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
   Alchemy.growl('<%= escape_javascript(_t("Element trashed")) %>');
   $('#element_area .sortable_cell').sortable('refresh');
-  Alchemy.refreshTrashWindow(<%= @page.id %>);
+  Alchemy.TrashWindow.refresh(<%= @page.id %>);
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
   <% @element.contents.essence_richtexts.each do |content| %>

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

@@ -7,7 +7,7 @@ $('.element_heading .preview_text_quote', $el).html('<%= escape_javascript(@elem
 $('div.content_editor').removeClass('validation_failed');
 $("#element_<%= @element.id %>_errors").hide();
 Alchemy.setElementSaved($el);
-Alchemy.growl('<%= _t("element_saved") %>');
+Alchemy.growl('<%= _t(:element_saved) %>');
 Alchemy.PreviewWindow.refresh();
 
 <%=raw update_elements_with_essence_selects(@page, @element) %>
@@ -19,7 +19,7 @@ $('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @
 $("#element_<%= @element.id %>_errors").show();
 $('div.content_editor').removeClass('validation_failed');
 $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
-Alchemy.ElementEditorSelector.scrollToElement('#element_<%= @element.id %>');
+Alchemy.ElementEditors.scrollToElement('#element_<%= @element.id %>');
 Alchemy.Buttons.enable($el);
 
 <% end %>

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

@@ -10,9 +10,9 @@
         <%= f.select(
           "css_class", [
             [_t("Layout default"), ""],
-            [_t("above"), "no_float"],
-            [_t("left"), "left"],
-            [_t("right"), "right"]
+            [_t(:above), "no_float"],
+            [_t(:left), "left"],
+            [_t(:right), "right"]
           ],
           {},
           :class => 'alchemy_selectbox'
@@ -21,7 +21,7 @@
     </tr>
     <tr>
       <td colspan="2" class="submit">
-        <%= f.button _t("save"), :class => 'button' %>
+        <%= f.button _t(:save), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -8,23 +8,9 @@
     <%= _t('explain cropping') %>
   <% end %>
   <div class="thumbnail_background">
-    <span class="picture_content_spinner">
-      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-    </span>
-    <%= image_tag(show_alchemy_picture_path(@essence_picture.picture, :size => '800x600', :format => :png),
-      :id => 'imageToCrop',
-      :onload => %(
-        Alchemy.fadeImage(this, '#jscropper .picture_content_spinner');
-        Alchemy.ImageCropper.init(
-          [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
-          #{@size_x},
-          #{@size_y},
-          [#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
-          #{@ratio},
-          [#{@essence_picture.picture.image_file_width}, #{@essence_picture.picture.image_file_height}]
-        );
-      ),
-      :style => "display: none;"
+    <%= image_tag(
+      show_alchemy_picture_path(@essence_picture.picture, :size => '800x600', :format => :png),
+      :id => 'imageToCrop'
     ) %>
   </div>
   <%= form_for(
@@ -40,7 +26,20 @@
       :onclick => 'Alchemy.ImageCropper.reset()',
       :class => 'button with_icon'
     }) %>
-    <%= f.button _t("apply"), :class => 'button' %>
+    <%= f.button _t(:apply), :class => 'button' %>
   <% end %>
 <% end %>
 </div>
+<script type="text/javascript">
+  Alchemy.ImageLoader('#jscropper .thumbnail_background');
+  $('#imageToCrop').load(function() {
+    Alchemy.ImageCropper.init(
+      [<%= @initial_box[:x1] %>, <%= @initial_box[:y1] %>, <%= @initial_box[:x2] %>, <%= @initial_box[:y2] %>],
+      <%= @size_x %>,
+      <%= @size_y %>,
+      [<%= @default_box[:x1] %>, <%= @default_box[:y1] %>, <%= @default_box[:x2] %>, <%= @default_box[:y2] %>],
+      <%= @ratio %>,
+      [<%= @essence_picture.picture.image_file_width %>, <%= @essence_picture.picture.image_file_height %>]
+    );
+  });
+</script>

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

@@ -49,7 +49,7 @@
       <td class="select">
         <%= f.select(
           "css_class",
-          [[_t("Layout default"), ""], [_t("above"), "no_float"], [_t("left"), "left"], [_t("right"), "right"]],
+          [[_t("Layout default"), ""], [_t(:above), "no_float"], [_t(:left), "left"], [_t(:right), "right"]],
           {},
           {:class => 'alchemy_selectbox'}
         ) %>
@@ -78,7 +78,7 @@
     <tr>
       <td colspan="2" class="submit">
         <%= hidden_field_tag 'content_id', @content.id %>
-        <%= f.button _t("apply"), :class => 'button' %>
+        <%= f.button _t(:apply), :class => 'button' %>
       </td>
     </tr>
   </table>

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

@@ -4,5 +4,6 @@
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>
   $('.thumbnail_background img', '#<%= content_dom_id(@content) %>').replaceWith('<%= essence_picture_thumbnail(@content, @options) %>');
+  Alchemy.ImageLoader('#<%= content_dom_id(@content) %> .thumbnail_background');
 <% end %>
 })(jQuery);

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

@@ -1,18 +1,20 @@
-<%= form_for [alchemy, :admin, @language], :remote => true, :html => {:style => 'width: 403px'} do |f| %>
+<%= form_for [alchemy, :admin, @language], remote: true, html: {style: 'width: 403px'} do |f| %>
   <div id="errors"></div>
   <table>
     <tr>
       <td class="label"><%= f.label :name %></td>
-      <td class="input"><%= f.text_field :name, :class => 'thin_border' -%></td>
+      <td class="input"><%= f.text_field :name, class: 'thin_border', autofocus: 'true' %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label :language_code %></td>
-      <td class="input"><%= f.text_field :language_code, :class => 'thin_border', :placeholder => _t(:language_code_placeholder) -%></td>
+      <td class="input">
+        <%= f.text_field :language_code, class: 'thin_border', placeholder: _t(:language_code_placeholder) %>
+      </td>
     </tr>
     <tr>
       <td class="label"><%= f.label :country_code %>*</td>
       <td class="input">
-        <%= f.text_field :country_code, :class => 'thin_border', :placeholder => _t(:country_code_placeholder) -%>
+        <%= f.text_field :country_code, class: 'thin_border', placeholder: _t(:country_code_placeholder) %>
         <p class="foot_note">
           * <%= _t(:country_code_foot_note) %>
         </p>
@@ -20,29 +22,29 @@
     </tr>
     <tr>
       <td class="label"><%= f.label :frontpage_name %></td>
-      <td class="input"><%= f.text_field :frontpage_name, :class => 'thin_border' -%></td>
+      <td class="input"><%= f.text_field :frontpage_name, class: 'thin_border' %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label :page_layout %></td>
-      <td class="input"><%= f.text_field :page_layout, :class => 'thin_border' -%></td>
+      <td class="input"><%= f.text_field :page_layout, class: 'thin_border' %></td>
     </tr>
     <tr>
       <td></td>
       <td class="checkbox">
-        <%= f.check_box :public -%>
+        <%= f.check_box :public %>
         <%= f.label :public %>
       </td>
     </tr>
     <tr>
       <td></td>
       <td class="checkbox">
-        <%= f.check_box :default -%>
-        <%= f.label :default -%>
+        <%= f.check_box :default %>
+        <%= f.label :default %>
       </td>
     </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/languages/_language.html.erb

@@ -35,7 +35,8 @@
       '',
       alchemy.edit_admin_language_path(language),
       {
-        :title => _t("Edit")
+        :title => _t("Edit"),
+        :size => "430xauto"
       },
       {
         :class => "icon edit",

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

@@ -2,13 +2,13 @@
 <table class="list" id="languages_list">
   <tr>
     <th>
-      <%= Alchemy::Language.human_attribute_name(:name) %>
+      <%= sortable_column(Alchemy::Language.human_attribute_name(:name), :column => :name) %>
     </th>
     <th>
-      <%= Alchemy::Language.human_attribute_name(:language_code) %>
+      <%= sortable_column(Alchemy::Language.human_attribute_name(:language_code), :column => :language_code) %>
     </th>
     <th>
-      <%= Alchemy::Language.human_attribute_name(:country_code) %>
+      <%= sortable_column(Alchemy::Language.human_attribute_name(:country_code), :column => :country_code) %>
     </th>
     <th>
       <%= Alchemy::Language.human_attribute_name(:frontpage_name) %>

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

@@ -1,23 +1,23 @@
-<%- 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 => "430x400"
+      icon: 'create',
+      label: label_title,
+      url: new_resource_path,
+      title: label_title,
+      hotkey: 'alt-n',
+      overlay_options: {
+        title: label_title,
+        size: "430x400"
       },
-      :if_permitted_to => [:new, resource_permission_scope]
+      if_permitted_to: [:new, resource_permission_scope]
     }
-  ],
-  :search => true,
-  :search_url => resources_path
-) -%>
+  ]
+) %>
 
 <div id="archive_all">
+  <%= resources_header %>
   <%= render 'table' %>
 </div>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -9,11 +9,11 @@
         render_icon('configure_page'),
         alchemy.configure_admin_page_path(layoutpage),
         {
-          :title => _t('edit_page_properties'),
+          :title => _t(:edit_page_properties),
           :size => '410x150'
         },
         :class => '',
-        :title => _t('edit_page_properties')
+        :title => _t(:edit_page_properties)
       ) -%>
       <%- end -%>
       <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
@@ -28,13 +28,13 @@
           :remote => true,
           :method => :post,
           :class => "",
-          :title => _t("copy_page")
+          :title => _t(:copy_page)
         ) %>
         <%- end -%>
         <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
         <%= link_to_confirmation_window(
           render_icon('delete_page'),
-          _t("confirm_to_delete_page"),
+          _t(:confirm_to_delete_page),
           url_for(
             :controller => 'pages',
             :action => 'destroy',
@@ -42,7 +42,7 @@
           ),
           {
             :class => "",
-            :title => _t("delete_page")
+            :title => _t(:delete_page)
           }
         ) -%>
         <%- end -%>
@@ -53,7 +53,7 @@
       <%= link_to(
         layoutpage.name,
         alchemy.edit_admin_page_path(layoutpage),
-        :title => _t("edit_page"),
+        :title => _t(:edit_page),
         :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
       ) -%>
     </div>