alchemy_cms 2.5.0.b5 → 2.5.0.b9

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

@@ -13,7 +13,7 @@
             :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 => '') %>
@@ -21,9 +21,9 @@
       <% end %>
     </div>
     <div class="page_infos">
-      <span class="page_status <%= page_for_links.public ? 'public' : 'not_public' %>" title="<%= page_for_links.public ? t('Page public') : t('Page not public') %>"></span>
-      <span class="page_status <%= page_for_links.visible ? 'visible' : 'not_visible' %>" title="<%= page_for_links.visible ? t('Page visible') : t('Page not visible') %>"></span>
-      <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
+      <span class="page_status <%= page_for_links.public ? 'public' : 'not_public' %>" title="<%= page_for_links.status_title(:public) %>"></span>
+      <span class="page_status <%= page_for_links.visible ? 'visible' : 'not_visible' %>" title="<%= page_for_links.status_title(:visible) %>"></span>
+      <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.status_title(:restricted) %>"></span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_<%= page_for_links.id %>" name="<%= parse_sitemap_name(page_for_links) %>">
       <% if page_for_links.redirects_to_external? %>
@@ -34,7 +34,7 @@
             'page-id' => page_for_links.id,
             :url => @url_prefix + page_for_links.urlname
           },
-          :title => t('page_for_links.choose_page', :name => page_for_links.name),
+          :title => _t('page_for_links.choose_page', :name => page_for_links.name),
           :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
         }) %>
       <% end %>

data/app/views/alchemy/admin/pages/_page_infos.html.erb

@@ -1,3 +1,3 @@
-<span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.public ? t('Page public') : t('Page not public') %>"></span>
-<span class="page_status <%= page.visible ? 'visible' : 'not_visible' %>" title="<%= page.visible ? t('Page visible') : t('Page not visible') %>"></span>
-<span class="page_status <%= page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
+<span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.status_title(:public) %>"></span>
+<span class="page_status <%= page.visible ? 'visible' : 'not_visible' %>" title="<%= page.status_title(:visible) %>"></span>
+<span class="page_status <%= page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page.status_title(:restricted) %>"></span>

data/app/views/alchemy/admin/pages/_page_status.html.erb

@@ -3,7 +3,7 @@
     <%- if multi_language? -%>
     <span class="page_language"><%= @page.language_code %></span>
     <%- end -%>
-    <span class="page_status <%= @page.public ? 'public' : 'not_public' %>" title="<%= @page.public ? t('Page public') : t('Page not public') %>"></span>
-    <span class="page_status <%= @page.visible ? 'visible' : 'not_visible' %>" title="<%= @page.visible ? t('Page visible') : t('Page not visible') %>"></span>
-    <span class="page_status <%= @page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= @page.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
+    <span class="page_status <%= @page.public ? 'public' : 'not_public' %>" title="<%= @page.status_title(:public) %>"></span>
+    <span class="page_status <%= @page.visible ? 'visible' : 'not_visible' %>" title="<%= @page.status_title(:visible) %>"></span>
+    <span class="page_status <%= @page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= @page.status_title(:restricted) %>"></span>
 </span>

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

@@ -1,3 +1,3 @@
-<ul id="sitemap" class="list">
+<ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
   <%= render :partial => 'page', :object => @page_root %>
 </ul>

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

@@ -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>
@@ -43,10 +43,10 @@
       <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/>
@@ -62,6 +62,11 @@
       <td class="label"><%= f.label "meta_keywords" %>*:&nbsp;</td>
       <td class="input">
         <%= f.text_area "meta_keywords", :class => "thin_border long" %><br/>
+        <% if !@page.layoutpage %>
+        <p class="foot_note">
+          * <%= _t('pages.update.comma_seperated') %>
+        </p>
+        <% end %>
       </td>
     </tr>
     <% end %>
@@ -75,12 +80,7 @@
     <% end %>
     <tr>
       <td colspan="2" class="submit">
-        <% if !@page.layoutpage || @page.taggable? %>
-        <p class="foot_note">
-          *<%= t('pages.update.comma_seperated') %>
-        </p>
-        <% end %>
-        <%= 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

@@ -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/destroy.js.erb

@@ -8,7 +8,6 @@ window.location.replace('<%= alchemy.admin_layoutpages_path -%>');
 
 $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
 Alchemy.growl('<%= @message -%>');
-Alchemy.Tooltips();
 Alchemy.overlayObserver('#sitemap');
 
 <% else %>

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

@@ -1,7 +1,7 @@
 <% content_for(:title) { @page.name } %>
 
 <% content_for(:subnav_additions) do %>
-  <label><%= t('Active Pages') %> &raquo;</label>
+  <label><%= _t('Active Pages') %> &raquo;</label>
   <% @locked_pages.each do |page| %>
   <% if @page == page %>
   <%= render :partial => 'page_status' %>
@@ -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 %>
@@ -26,19 +26,19 @@
 <div id="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? %>
   <div class="button_with_label">
     <%= form_tag alchemy.visit_admin_page_path(@page), :id => 'visit_page_form' do %>
-      <button class="icon_button" title="<%= t('Visit page') %>">
+      <button class="icon_button" title="<%= _t('Visit page') %>">
         <%= render_icon('visit_page') %>
       </button>
-      <label><%= t("Visit page") %></label>
+      <label><%= _t("Visit page") %></label>
     <% end %>
   </div>
   <% end %>
@@ -47,45 +47,45 @@
       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>
+      <label><%= _t("Publish page") %></label>
     <% end %>
   </div>
   <% end %>
   <div class="button_with_label">
     <%= select_tag('preview_size', preview_sizes_for_select, :class => 'alchemy_selectbox short') %>
-    <label><%= t :preview_size %></label>
+    <label><%= _t(:preview_size) %></label>
   </div>
 </div>
 <div id="toolbar_buttons_right">
   <div class="button_with_label" id="show_preview_window">
     <%= link_to(render_icon(:preview_window), '#', {
       :onclick => "Alchemy.openPreviewWindow()",
-      :title => t('Show Preview Window'),
+      :title => _t('Show Preview Window'),
       :class => :icon_button
     }) %>
-    <label><%= t('Show Preview Window') %></label>
+    <label><%= _t('Show Preview Window') %></label>
   </div>
   <div class="button_with_label" id="show_element_window">
     <%= link_to(render_icon(:element_window), '#', {
       :onclick => "Alchemy.openElementsWindow()",
-      :title => t('Show Elements Window'),
+      :title => _t('Show Elements Window'),
       :class => :icon_button
     }) %>
-    <label><%= t('Show Elements Window') %></label>
+    <label><%= _t('Show Elements Window') %></label>
   </div>
 </div>
 <% end %>
@@ -95,27 +95,27 @@
 <script type="text/javascript" charset="utf-8">
 
   Alchemy.openPreviewWindow = function() {
-    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") %>');
+    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= _t("Page Preview") %>');
   }
 
   Alchemy.openElementsWindow = function() {
     Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) %>', {
       texts: {
-        title: '<%= t("Elements") %>',
-        dirtyTitle: '<%= t("Warning!") %>',
-        dirtyMessage: '<%= t(:element_dirty_close_window_notice) %>',
-        okLabel: '<%= t("Yes") %>',
-        cancelLabel: '<%= t("No") %>'
+        title: '<%= _t("Elements") %>',
+        dirtyTitle: '<%= _t("Warning!") %>',
+        dirtyMessage: '<%= _t(:element_dirty_close_window_notice) %>',
+        okLabel: '<%= _t("Yes") %>',
+        cancelLabel: '<%= _t("No") %>'
       },
       toolbarButtons: [
         {
-          title: '<%= t("New Element") %>',
-          label: '<%= t("New Element") %>',
+          title: '<%= _t("New Element") %>',
+          label: '<%= _t("New Element") %>',
           iconClass: 'new_element',
           onClick: function() {
             Alchemy.openWindow(
               '<%= alchemy.new_admin_element_path(:page_id => @page.id) %>',
-              '<%= t("New Element") %>',
+              '<%= _t("New Element") %>',
               320,
               120,
               false,
@@ -125,14 +125,14 @@
           }
         },
         {
-          title: '<%= t("Clipboard") %>',
-          label: '<%= t("Show clipboard") %>',
+          title: '<%= _t("Clipboard") %>',
+          label: '<%= _t("Show clipboard") %>',
           iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
             Alchemy.openWindow(
               '<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") %>',
-              '<%= t("Clipboard") %>',
+              '<%= _t("Clipboard") %>',
               380,
               270,
               false,
@@ -142,12 +142,12 @@
           }
         },
         {
-          title: '<%= t("Show trash") %>',
-          label: '<%= t("Show trash") %>',
+          title: '<%= _t("Show trash") %>',
+          label: '<%= _t("Show trash") %>',
           iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
           buttonId: 'element_trash_button',
           onClick: function() {
-            Alchemy.openTrashWindow(<%= @page.id %>, '<%= t("Trash") %>');
+            Alchemy.openTrashWindow(<%= @page.id %>, '<%= _t("Trash") %>');
           }
         }
       ]
@@ -173,10 +173,10 @@
 
   jQuery(function($) {
     var texts = {
-      title: '<%= t("Warning!") %>',
-      message: '<%= t(:element_dirty_page_leave_warning) %>',
-      okLabel: '<%= t("Yes") %>',
-      cancelLabel: '<%= t("No") %>'
+      title: '<%= _t("Warning!") %>',
+      message: '<%= _t(:element_dirty_page_leave_warning) %>',
+      okLabel: '<%= _t("Yes") %>',
+      cancelLabel: '<%= _t("No") %>'
     };
     $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
       var not_dirty = Alchemy.checkPageDirtyness(this, texts);

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

@@ -1,2 +1,2 @@
-Alchemy.growl('<%= t("Page cache flushed") -%>');
+Alchemy.growl('<%= _t("Page cache flushed") -%>');
 Alchemy.pleaseWaitOverlay(false);

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

@@ -1,5 +1,4 @@
 (function($) {
   $('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
-  Alchemy.Tooltips();
   Alchemy.overlayObserver('#page_<%= @page.id -%>');
 })(jQuery);

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

@@ -1,6 +1,6 @@
 <%- content_for(:subnav_additions) do -%>
 <%- unless @locked_pages.blank? -%>
-<label><%= t('Active Pages') %> &raquo;</label>
+<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 %>
@@ -9,7 +9,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 %>
@@ -29,9 +29,9 @@
       :remote => true,
       :method => :post,
       :class => 'icon_button please_wait',
-      :title => t('Flush page cache')
+      :title => _t('Flush page cache')
     ) -%>
-    <label><%= t('Flush page cache') %></label>
+    <label><%= _t('Flush page cache') %></label>
   </div>
   <%- end -%>
   <%- permitted_to?(:sort, :alchemy_admin_pages) do -%>
@@ -43,9 +43,9 @@
       :method => :get,
       :remote => true,
       :class => 'icon_button please_wait',
-      :title => t('Sort pages')
+      :title => _t('Sort pages')
     ) -%>
-    <label><%= t('Sort pages') %></label>
+    <label><%= _t('Sort pages') %></label>
   </div>
   <%- end -%>
   <div class="button_with_label" id="clipboard_button">
@@ -53,13 +53,13 @@
       render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
       alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
       {
-        :title => t('Clipboard'),
+        :title => _t('Clipboard'),
         :size => '380x270'
       },
       :class => 'icon_button',
-      :title => t('Show clipboard')
+      :title => _t('Show clipboard')
     ) -%>
-    <label><%= t('Show clipboard') %></label>
+    <label><%= _t('Show clipboard') %></label>
   </div>
 </div>
 <%- end -%>
@@ -70,17 +70,17 @@
   <div id="sort_panel" style="display: none">
     <div class="info">
       <%= render_icon('info') %>
-      <%= t('explain_sitemap_dragndrop_sorting') %>
+      <%= _t('explain_sitemap_dragndrop_sorting') %>
     </div>
     <div class="buttons">
-      <%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
-      <%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
+      <%= link_to( _t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
+      <%= submit_tag( _t('save order'), :id => 'save_page_order', :class => 'button' ) %>
     </div>
   </div>
 
   <h2 id="sitemap_heading">
-    <span class="page_name"><%= t('Name') %></span>
-    <span class="page_infos"><%= t('Status') %></span>
+    <span class="page_name"><%= _t('Name') %></span>
+    <span class="page_infos"><%= _t('Status') %></span>
   </h2>
 
   <%= render :partial => 'sitemap' %>

data/app/views/alchemy/admin/pages/link.html.erb

@@ -1,10 +1,10 @@
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#overlay_tab_internal_link"><%= t('link_overlay_tab_label.internal') %></a></li>
-    <li><a href="#overlay_tab_external_link"><%= t('link_overlay_tab_label.external') %></a></li>
-    <li><a href="#overlay_tab_file_link"><%= t('link_overlay_tab_label.file') %></a></li>
+    <li><a href="#overlay_tab_internal_link"><%= _t('link_overlay_tab_label.internal') %></a></li>
+    <li><a href="#overlay_tab_external_link"><%= _t('link_overlay_tab_label.external') %></a></li>
+    <li><a href="#overlay_tab_file_link"><%= _t('link_overlay_tab_label.file') %></a></li>
     <%- if configuration(:mailer)[:contactform_linking] -%>
-    <li><a href="#overlay_tab_contactform_link"><%= t('link_overlay_tab_label.contactform') %></a></li>
+    <li><a href="#overlay_tab_contactform_link"><%= _t('link_overlay_tab_label.contactform') %></a></li>
     <%- end -%>
   </ul>
   <div class="with_padding">