RubyGems - alchemy_cms - Versions diffs - 2.5.3.1 → 2.6.0.rc5 - Mend

alchemy_cms 2.5.3.1 → 2.6.0.rc5

Files changed (331) hide show

data/app/views/alchemy/admin/layoutpages/index.html.erb CHANGED

@@ -1,52 +1,53 @@
-<%- content_for(:subnav_additions) do -%>
-<%- unless @locked_pages.blank? -%>
-<label><%= _t('Active Pages') %> &raquo;</label>
-<%- @locked_pages.each do |page| -%>
-<div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
-  <%= link_to alchemy.edit_admin_page_path(page) do %>
-  <span class="page_name" title="<%= page.name %>">
-    <%= truncate page.name, :length => 15 %>
-  </span>
+<% content_for(:subnav_additions) do %>
+  <% unless @locked_pages.blank? %>
+    <label><%= _t('Active Pages') %> &raquo;</label>
+    <% @locked_pages.each do |page| %>
+    <div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
+      <%= link_to alchemy.edit_admin_page_path(page) do %>
+      <span class="page_name" title="<%= page.name %>">
+        <%= truncate page.name, length: 15 %>
+      </span>
+      <% end %>
+      <%= form_tag(alchemy.unlock_admin_page_path(page), remote: true) do %>
+        <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
+          <%= render_icon('close small') %>
+        </button>
+      <% end %>
+    </div>
+    <% end %>
   <% end %>
-  <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-    <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
-      <%= render_icon('close small') %>
-    </button>
-  <% end %>
-</div>
-<%- end -%>
-<%- end -%>
-<%- end -%>
+<% end %>
-<%- content_for :toolbar do -%>
-<div id="toolbar_buttons">
-  <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
+<% content_for :toolbar do %>
+<div class="toolbar_buttons">
+  <%= render partial: 'alchemy/admin/partials/language_tree_select' %>
   <%= toolbar_button(
-    :icon => 'add_page',
-    :url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),
-    :overlay_options => {
-      :title => _t('Add global page'),
-      :size => '340x150',
-      :overflow => true
+    icon: 'add_page',
+    url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
+    hotkey: 'alt-n',
+    overlay_options: {
+      title: _t('Add global page'),
+      size: '340x150',
+      overflow: true
     },
-    :title => _t('Add global page'),
-    :label => _t('Add global page'),
-    :if_permitted_to => [:new, :alchemy_admin_pages]
+    title: _t('Add global page'),
+    label: _t('Add global page'),
+    if_permitted_to: [:new, :alchemy_admin_pages]
   ) %>
   <%= toolbar_button(
-    :icon => "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
-    :url => alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
-    :overlay_options => {
-      :title => _t('Clipboard'),
-      :size => '380x270'
+    icon: "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
+    url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
+    overlay_options: {
+      title: _t('Clipboard'),
+      size: '380x270'
     },
-    :title => _t('Show clipboard'),
-    :id => "clipboard_button",
-    :label => _t('Show clipboard')
+    title: _t('Show clipboard'),
+    id: "clipboard_button",
+    label: _t('Show clipboard')
   ) %>
 </div>
-<%- end -%>
+<% end %>
 <ul class="list" id="layoutpages">
-  <%= render :partial => "layoutpage", :collection => @layout_root.children %>
+  <%= render partial: "layoutpage", collection: @layout_root.children %>
 </ul>

data/app/views/alchemy/admin/pages/_contactform_links.html.erb CHANGED

@@ -12,7 +12,7 @@
     ) %>
     <tr>
       <td class="label">
-        <label for="contactform_subject" class="medium"><%= _t("subject") %></label>
+        <label for="contactform_subject" class="medium"><%= _t(:subject) %></label>
       </td>
       <td class="input">
         <%= text_field_tag "contactform_subject", {}, :class => "thin_border auto_resize" %>
@@ -20,7 +20,7 @@
     </tr>
     <tr>
       <td class="label">
-        <label for="contactform_mailto" class="medium"><%= _t("mail_to") %></label>
+        <label for="contactform_mailto" class="medium"><%= _t(:mail_to) %></label>
       </td>
       <td class="input">
         <%= select_tag(
@@ -33,7 +33,7 @@
     <tr>
       <td class="label">
         <label for="contactform_body" class="medium">
-          <%= _t("contactform_body") %>
+          <%= _t(:contactform_body) %>
         </label>
       </td>
       <td class="input">
@@ -43,7 +43,7 @@
     <tr>
       <td class="label">
         <label for="contactform_link_title" class="medium">
-          <%= _t("link_title") %>
+          <%= _t(:link_title) %>
         </label>
       </td>
       <td class="input">

data/app/views/alchemy/admin/pages/_create_language_form.html.erb CHANGED

@@ -2,14 +2,14 @@
 <div id="create_language_tree_form" style="display: none">
   <div class="info">
     <%= render_icon('info') %>
-    <%= _t("language_does_not_exist") %>
+    <%= _t(:language_does_not_exist) %>
   </div>
 <%- if @language -%>
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
-      <h2><%= _t('copy_language_tree_heading') %></h2>
-      <p><%= _t("want_to_make_copy_of_existing_language") %></p>
+      <h2><%= _t(:copy_language_tree_heading) %></h2>
+      <p><%= _t(:want_to_make_copy_of_existing_language) %></p>
       <table>
         <tr>
           <td class="label"><%= label_tag('languages[old_lang_id]', _t('Language tree')) %></td>
@@ -21,7 +21,7 @@
         <tr>
           <td class="submit" colspan="2">
             <%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
-            <%= submit_tag _t("copy"), :class => 'button' %>
+            <%= submit_tag _t(:copy), :class => 'button' %>
           </td>
         </tr>
       </table>
@@ -31,8 +31,8 @@
   <%- if params[:action] == "index" -%>
   <%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
-    <h2><%= _t('create_language_tree_heading') %></h2>
-    <p><%= _t("want_to_create_new_language") %></p>
+    <h2><%= _t(:create_language_tree_heading) %></h2>
+    <p><%= _t(:want_to_create_new_language) %></p>
     <%= form.hidden_field :name, :value => @language.frontpage_name %>
     <%= form.hidden_field :language_id, :value => @language.id %>
     <%= form.hidden_field :language_code, :value => @language.code %>

data/app/views/alchemy/admin/pages/_external_link.html.erb CHANGED

@@ -1,5 +1,5 @@
 <div id="overlay_tab_external_link">
-  <h2><%= _t("enter_external_link") %></h2>
+  <h2><%= _t(:enter_external_link) %></h2>
   <%= render_message do %>
     <p><%= _t(:external_link_notice_1) %></p>
     <p><%= _t(:external_link_notice_2) %></p>
@@ -18,7 +18,7 @@
     </tr>
     <tr>
       <td class="label long">
-        <label for="extern_link_title"><%= _t("link_title") %></label>
+        <label for="extern_link_title"><%= _t(:link_title) %></label>
       </td>
       <td class="input"><%= text_field_tag "extern_link_title", '', :class => 'thin_border auto_resize link_title' %></td>
     </tr>

data/app/views/alchemy/admin/pages/_file_link.html.erb CHANGED

@@ -1,11 +1,11 @@
 <div id="overlay_tab_file_link">
   <h2>
-    <%= _t("choose_file_to_link") %>
+    <%= _t(:choose_file_to_link) %>
   </h2>
   <table class="window_form">
     <tr>
       <td class="label long">
-        <label for="public_filename"><%= _t("file") %></label>
+        <label for="public_filename"><%= _t(:file) %></label>
       </td>
       <td class="select">
         <%= select_tag(
@@ -18,7 +18,7 @@
     <tr>
       <td class="label long">
         <label for="file_link_title">
-          <%= _t("link_title") %>
+          <%= _t(:link_title) %>
         </label>
       </td>
       <td class="input">

data/app/views/alchemy/admin/pages/_internal_link.html.erb CHANGED

@@ -1,5 +1,5 @@
 <div id="overlay_tab_internal_link">
-  <h2><%= _t("internal_link_headline") %></h2>
+  <h2><%= _t(:internal_link_headline) %></h2>
   <table class="window_form">
     <tr>
       <td colspan="2">

data/app/views/alchemy/admin/pages/_new_page_form.html.erb CHANGED

@@ -22,7 +22,7 @@
     <tr>
       <td class="label">&nbsp;</td>
       <td class="submit">
-        <%= f.button _t("create"), :class => 'button', :name => nil %>
+        <%= f.button _t(:create), :class => 'button', :name => nil %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/pages/_page.html.erb CHANGED

@@ -1,12 +1,12 @@
-<li id="page_<%= page.id %>" class="<%= "page_level_#{page.level} #{page.page_layout}" %>">
-  <div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
+<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>">
+  <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
       <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
       <div class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %>">
         <div class="tooltip">
-          <h3><%= _t("page_type") %>:</h3>
+          <h3><%= _t(:page_type) %>:</h3>
           <p><%= page.layout_display_name %></p>
-          <h3><%= _t("page_status") %>:</h3>
+          <h3><%= _t(:page_status) %>:</h3>
           <p><%= combined_page_status(page) %></p>
           <h3><%= _t(:created_at) %>:</h3>
           <p><%= l(page.created_at) %></p>
@@ -17,7 +17,7 @@
           <h3><%= _t(:updated_by) %>:</h3>
           <p><%= page.updater %></p>
           <%- if page.locked? -%>
-          <h3><%= _t("currently_edited_by") %>:</h3>
+          <h3><%= _t(:currently_edited_by) %>:</h3>
           <p><%= page.current_editor %></p>
           <%- end -%>
         </div>
@@ -30,11 +30,11 @@
         render_icon('configure_page'),
         alchemy.configure_admin_page_path(page),
         {
-          :title => _t('edit_page_properties'),
+          :title => _t(:edit_page_properties),
           :size => page.redirects_to_external? ? '410x270' : '410x655'
         },
         :class => '',
-        :title => _t('edit_page_properties')
+        :title => _t(:edit_page_properties)
       ) -%>
       <%- end -%>
       <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
@@ -49,13 +49,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',
@@ -63,7 +63,7 @@
           ),
           {
             :class => "",
-            :title => _t("delete_page")
+            :title => _t(:delete_page)
           }
         ) -%>
         <%- end -%>
@@ -72,12 +72,12 @@
           render_icon('add_page'),
           alchemy.new_admin_page_path(:parent_id => page.id),
           {
-            :title => _t('create_page'),
+            :title => _t(:create_page),
             :size => '340x150',
             :overflow => true
           },
           :class => '',
-          :title => _t('create_page')
+          :title => _t(:create_page)
         ) -%>
         <%- end -%>
       </span>
@@ -100,7 +100,7 @@
         @sorting,
         page.name,
         alchemy.edit_admin_page_path(page),
-        :title => _t("edit_page"),
+        :title => _t(:edit_page),
         :class => "sitemap_pagename_link #{cycle_class}"
       ) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
     <%- end -%>

data/app/views/alchemy/admin/pages/_page_for_links.html.erb CHANGED

@@ -13,11 +13,9 @@
             :url => @url_prefix + page_for_links.urlname
           },
           :class => "show_elements_to_link",
-          :title => _t('show_elements_from_page')
+          :title => _t(:show_elements_from_page)
         ) %>
-        <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page">
-          <%= image_tag("alchemy/ajax_loader.gif", :alt => '') %>
-        </div>
+        <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page"></div>
       <% end %>
     </div>
     <div class="page_infos">

data/app/views/alchemy/admin/pages/_sitemap.html.erb CHANGED

@@ -1,3 +1,8 @@
 <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
   <%= render :partial => 'page', :object => @page_root %>
 </ul>
+<script type="text/javascript">
+  $(function() {
+    Alchemy.Sitemap.init();
+  });
+</script>

data/app/views/alchemy/admin/pages/configure.html.erb CHANGED

@@ -2,14 +2,14 @@
   <div id="errors"></div>
   <table id="page_names">
     <tr>
-      <td class="label"><%= _t("page_type") %>: </td>
+      <td class="label"><%= _t(:page_type) %>: </td>
       <td class="select">
         <%= f.select('page_layout', @page_layouts, {}, {:class => 'alchemy_selectbox long'}) %>
       </td>
     </tr>
     <% unless @page.layoutpage %>
     <tr>
-      <td class="label"><%= _t("page_status") %>: </td>
+      <td class="label"><%= _t(:page_status) %>: </td>
       <td class="checkbox long">
         <%= f.check_box :public %>
         <%= f.label :public %><br/>
@@ -26,7 +26,7 @@
     <% end %>
     <% unless @page.layoutpage %>
     <tr>
-      <td colspan="2" class="heading"><%= _t("names") %></td>
+      <td colspan="2" class="heading"><%= _t(:names) %></td>
     </tr>
     <% end %>
     <tr>
@@ -36,17 +36,17 @@
     <% unless @page.layoutpage %>
     <tr>
       <td class="label"><%= f.label "urlname" %>: </td>
-      <td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
+      <td class="input"><%= f.text_field "urlname", :value => @page.slug, :size => 31, :class => "thin_border long" %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label "title" %>: </td>
       <td class="input"><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
     </tr>
     <tr>
-      <td colspan="2" class="heading"><%= _t("meta_data") %></td>
+      <td colspan="2" class="heading"><%= _t(:meta_data) %></td>
     </tr>
     <tr>
-      <td class="label"><%= _t("search_engines") %>: </td>
+      <td class="label"><%= _t(:search_engines) %>: </td>
       <td class="checkbox long">
         <%= f.check_box "robot_index" %>
         <%= f.label "robot_index" %><br/>
@@ -80,7 +80,7 @@
     <% end %>
     <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/pages/configure_external.html.erb CHANGED

@@ -2,13 +2,13 @@
   <div id="errors"></div>
   <table id="page_names">
     <tr>
-      <td class="label"><%= _t("page_type") %>: </td>
+      <td class="label"><%= _t(:page_type) %>: </td>
       <td class="value long">
         <p><%= @page.layout_display_name %></p>
       </td>
     </tr>
     <tr>
-      <td class="label"><%= _t("page_status") %>: </td>
+      <td class="label"><%= _t(:page_status) %>: </td>
       <td class="checkbox long">
         <%= f.check_box :visible -%>
         <%= f.label :visible %><br/>
@@ -19,7 +19,7 @@
       </td>
     </tr>
     <tr>
-      <td colspan="2" class="heading"><%= _t("names") %></td>
+      <td colspan="2" class="heading"><%= _t(:names) %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label "name" %>:&nbsp;</td>
@@ -34,7 +34,7 @@
       <td class="input"><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
     </tr>
     <tr>
-      <td colspan="2" class="submit"><%= f.button _t("save"), :class => 'button' %></td>
+      <td colspan="2" class="submit"><%= f.button _t(:save), :class => 'button' %></td>
     </tr>
   </table>
 <% end %>

data/app/views/alchemy/admin/pages/edit.html.erb CHANGED

@@ -13,7 +13,7 @@
     </span>
     <% end %>
     <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-      <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
+      <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
         <%= render_icon('close small') %>
       </button>
     <% end %>
@@ -23,13 +23,13 @@
 <% end %>
 <% content_for(:toolbar) do %>
-<div id="toolbar_buttons">
+<div class="toolbar_buttons">
   <div class="button_with_label">
     <%= form_tag alchemy.unlock_admin_page_path(@page, :redirect_to => @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), :id => 'unlock_page_form' do %>
-      <button class="icon_button" title="<%= _t('explain_unlocking') %>">
+      <button class="icon_button" title="<%= _t(:explain_unlocking) %>">
         <%= render_icon('close') %>
       </button>
-      <label><%= _t("unlock_page") %></label>
+      <label><%= _t(:unlock_page) %></label>
     <% end %>
   </div>
   <% unless @page.layoutpage? %>
@@ -47,18 +47,18 @@
       render_icon('settings'),
       alchemy.configure_admin_page_path(@page),
       {
-        :title => _t('edit_page_properties'),
+        :title => _t(:edit_page_properties),
         :size => @page.layoutpage? ? '410x150' : '410x650'
       },
       :class => :icon_button,
-      :title => _t('edit_page_properties')
+      :title => _t(:edit_page_properties)
     ) %>
-    <label><%= _t('page_properties') %></label>
+    <label><%= _t(:page_properties) %></label>
   </div>
   <% if configuration(:cache_pages) && !@page.layoutpage? %>
   <div class="button_with_label">
     <%= form_tag alchemy.publish_admin_page_path(@page), :id => 'publish_page_form' do %>
-      <button class="icon_button" title="<%= _t('explain_publishing') %>">
+      <button class="icon_button" title="<%= _t(:explain_publishing) %>">
         <%= render_icon('publish') %>
       </button>
       <label><%= _t("Publish page") %></label>
@@ -70,7 +70,7 @@
     <label><%= _t(:preview_size) %></label>
   </div>
 </div>
-<div id="toolbar_buttons_right">
+<div class="toolbar_buttons right">
   <div class="button_with_label" id="show_preview_window">
     <%= link_to(render_icon(:preview_window), '#', {
       :onclick => "Alchemy.openPreviewWindow()",
@@ -113,15 +113,11 @@
           label: '<%= _t("New Element") %>',
           iconClass: 'new_element',
           onClick: function() {
-            Alchemy.openWindow(
-              '<%= alchemy.new_admin_element_path(:page_id => @page.id) %>',
-              '<%= _t("New Element") %>',
-              320,
-              120,
-              false,
-              true,
-              true
-            );
+            Alchemy.openWindow('<%= alchemy.new_admin_element_path(:page_id => @page.id) %>', {
+              title: '<%= _t("New Element") %>',
+              width: 320,
+              height: 120
+            });
           }
         },
         {
@@ -130,15 +126,11 @@
           iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
-            Alchemy.openWindow(
-              '<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") %>',
-              '<%= _t("Clipboard") %>',
-              380,
-              270,
-              false,
-              true,
-              true
-            );
+            Alchemy.openWindow('<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") %>', {
+              title :'<%= _t("Clipboard") %>',
+              width: 380,
+              height: 270
+            });
           }
         },
         {
@@ -147,13 +139,14 @@
           iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
           buttonId: 'element_trash_button',
           onClick: function() {
-            Alchemy.openTrashWindow(<%= @page.id %>, '<%= _t("Trash") %>');
+            Alchemy.TrashWindow.open(<%= @page.id %>, '<%= _t("Trash") %>');
           }
         }
       ]
     }, function() {
+      Alchemy.ImageLoader('#element_area');
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
-      Alchemy.ElementEditorSelector.init();
+      Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element_editor');
       Alchemy.Tinymce.init(function() {
         Alchemy.ElementDirtyObserver('#element_area');
@@ -192,7 +185,7 @@
     });
     $('#preview_size').bind('blur.selectBoxIt', function (e) {
-      $('#top_menu').css('z-index', 5);
+      $('#top_menu').css('z-index', 30);
     });
     Alchemy.PreviewWindow.currentWidth = Alchemy.PreviewWindow.currentWindow.dialog('widget').width();