alchemy_cms 2.5.0.b5 → 2.5.0.b9

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

@@ -7,12 +7,15 @@
     </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>
       </td>
     </tr>
     <tr>
@@ -37,16 +40,9 @@
         <%= f.label :default -%>
       </td>
     </tr>
-    <tr>
-      <td colspan="2">
-        <p class="foot_note">
-          * <%= t(:country_code_foot_note) %>
-        </p>
-      </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

@@ -24,9 +24,9 @@
     <%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
     <%= link_to_confirmation_window(
       '',
-      t("Are you sure?"),
+      _t("Are you sure?"),
       alchemy.admin_language_path(language),
-      :title => t("Delete"),
+      :title => _t("Delete"),
       :class => "icon destroy"
     ) -%>
     <%- end -%>
@@ -35,11 +35,11 @@
       '',
       alchemy.edit_admin_language_path(language),
       {
-        :title => t("Edit")
+        :title => _t("Edit")
       },
       {
         :class => "icon edit",
-        :title => t("Edit")
+        :title => _t("Edit")
       }
     ) -%>
     <%- end -%>

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

@@ -27,7 +27,7 @@
   <%= render_resources %>
 </table>
 <%- elsif params[:query] -%>
-<p><%= t('Nothing found') %></p>
+<p><%= _t('Nothing found') %></p>
 <%- end -%>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => @languages, :scope => alchemy %>

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

@@ -1,4 +1,4 @@
-<%- label_title = t("Create #{resource_model_name}", :default => t('Create')) -%>
+<%- label_title = _t("Create #{resource_model_name}", :default => _t('Create')) -%>
 
 <%- toolbar(
   :buttons => [

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>

data/app/views/alchemy/admin/layoutpages/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 %>
@@ -25,24 +25,24 @@
     :icon => 'add_page',
     :url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),
     :overlay_options => {
-      :title => t('Add global page'),
+      :title => _t('Add global page'),
       :size => '340x150',
       :overflow => true
     },
-    :title => t('Add global page'),
-    :label => t('Add global page'),
+    :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'),
+      :title => _t('Clipboard'),
       :size => '380x270'
     },
-    :title => t('Show clipboard'),
+    :title => _t('Show clipboard'),
     :id => "clipboard_button",
-    :label => t('Show clipboard')
+    :label => _t('Show clipboard')
   ) %>
 </div>
 <%- end -%>

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

@@ -1,6 +1,6 @@
 <div id="overlay_tab_contactform_link">
   <h2>
-    <%= t("please enter subject and mail address") %>
+    <%= _t("please enter subject and mail address") %>
   </h2>
   <table class="window_form">
     <%= hidden_field_tag(
@@ -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,12 +20,12 @@
     </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(
           "contactform_mailto",
-          options_for_select(configuration(:mailer)[:mail_addresses].map{ |a| [t('alchemy.mailer.mail_addresses.'+a[0]), a[0]] }),
+          options_for_select(configuration(:mailer)[:mail_addresses].map{ |a| [_t('alchemy.mailer.mail_addresses.'+a[0]), a[0]] }),
           :style => "width: 300px", :class => 'alchemy_selectbox'
         ) %>
       </td>
@@ -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">
@@ -52,7 +52,7 @@
     </tr>
     <tr>
       <td class="submit" colspan="2">
-        <%= link_to(t(:apply), '#', {
+        <%= link_to(_t(:apply), '#', {
           :onclick => "Alchemy.LinkOverlay.createLink('contact', jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()), jQuery('#contactform_link_title').val(), null); Alchemy.LinkOverlay.close()",
           :class => 'button'
         }) %>

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

@@ -1,17 +1,17 @@
 <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>
+          <td class="label"><%= label_tag('languages[old_lang_id]', _t('Language tree')) %></td>
           <td class="select">
             <%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "alchemy_selectbox medium_long") %>
             <%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
@@ -20,7 +20,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>
@@ -30,22 +30,23 @@
   <%- 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 %>
     <%= form.hidden_field :page_layout, :value => @language.page_layout %>
     <%= form.hidden_field :language_root, :value => true %>
     <%= form.hidden_field :parent_id, :value => Alchemy::Page.rootpage.id %>
-    <%= form.button t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
+    <%= hidden_field_tag :redirect_to, admin_pages_path %>
+    <%= form.button _t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
   <% end %>
 
   <%- end -%>
 
 <%- else -%>
 
-  <p><%= t("Actually this language does not exist. Please create this language first.") %></p>
+  <p><%= _t("Actually this language does not exist. Please create this language first.") %></p>
 
 <%- end -%>
 

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

@@ -1,8 +1,8 @@
 <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>
+    <p><%= _t(:external_link_notice_1) %></p>
+    <p><%= _t(:external_link_notice_2) %></p>
   <% end %>
   <div id="errors" class="errors">
     <ul></ul>
@@ -18,21 +18,21 @@
     </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>
     <tr>
       <td class="label long">
-        <label for="external_link_target"><%= t("Open Link in") %>:</label>
+        <label for="external_link_target"><%= _t("Open Link in") %>:</label>
       </td>
       <td class="select left">
-        <%= select_tag 'external_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+        <%= select_tag 'external_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target' %>
       </td>
     </tr>
     <tr>
       <td class="submit" colspan="2">
-        <%= link_to(t(:apply), '#', {
+        <%= link_to(_t(:apply), '#', {
           :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#external_link_target').val());",
           :class => 'button'
         }) %>

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

@@ -1,24 +1,24 @@
 <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(
           "public_filename",
           options_for_select(@attachments),
-          :class => "alchemy_selectbox full_width"
+          :class => "alchemy_selectbox"
         ) %>
       </td>
     </tr>
     <tr>
       <td class="label long">
         <label for="file_link_title">
-          <%= t("link_title") %>
+          <%= _t("link_title") %>
         </label>
       </td>
       <td class="input">
@@ -27,7 +27,7 @@
     </tr>
     <tr>
       <td class="label long">
-        <label for="file_link_target"><%= t("Open Link in") %>:</label>
+        <label for="file_link_target"><%= _t("Open Link in") %>:</label>
       </td>
       <td class="select left">
         <%= select_tag 'file_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
@@ -35,7 +35,7 @@
     </tr>
     <tr>
       <td class="submit" colspan="2">
-        <%= link_to(t(:apply), '#', {
+        <%= link_to(_t(:apply), '#', {
           :onclick => "Alchemy.LinkOverlay.createLink('file', jQuery('#public_filename').val(), jQuery('#file_link_title').val(), jQuery('#file_link_target').val()); Alchemy.LinkOverlay.close()",
           :class => 'button'
         }) %>

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

@@ -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">
@@ -14,7 +14,7 @@
     </tr>
     <tr>
       <td class="label long">
-        <label for="internal_link_title"><%= t('Title') %>:</label>
+        <label for="internal_link_title"><%= _t('Title') %>:</label>
       </td>
       <td class="input">
         <%= text_field_tag "internal_link_title", '', :class => 'thin_border auto_resize link_title' %>
@@ -22,17 +22,17 @@
     </tr>
     <tr>
       <td class="label long">
-        <label for="internal_link_target"><%= t("Open Link in") %>:</label>
+        <label for="internal_link_target"><%= _t("Open Link in") %>:</label>
       </td>
       <td class="select left">
-        <%= select_tag 'internal_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target medium' %>
+        <%= select_tag 'internal_link_target', options_for_select(Alchemy::Page.link_target_options), :class => 'alchemy_selectbox link_target' %>
       </td>
     </tr>
     <tr>
       <td class="submit" colspan="2">
         <%= hidden_field_tag(:internal_urlname) %>
         <%= hidden_field_tag(:page_anchor) %>
-        <%= link_to(t(:apply), '#', {
+        <%= link_to(_t(:apply), '#', {
           :onclick => "Alchemy.LinkOverlay.createLink('internal', jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(), jQuery('#internal_link_title').val(), jQuery('#internal_link_target').val()); Alchemy.LinkOverlay.close()",
           :class => 'button'
         }) %>

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

@@ -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

@@ -2,25 +2,25 @@
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
     <div class="sitemap_left_images">
       <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
-      <span class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %> tooltip"></span>
-      <div class="tooltip_content" style="display: none;">
-        <h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
-        <p>
-          <%= page.humanized_status %>
-        </p>
-        <p>
-          <strong><%= t("created_at") %>:</strong>
-          <%= l(page.created_at) %> von <%= page.creator %>
-        </p>
-        <p>
-          <strong><%= t("updated_at") %>:</strong>
-          <%= l(page.updated_at) %> durch <%= page.updater %>
-        </p>
-        <%- if page.locked? -%>
-        <p>
-          <%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
-        </p>
-        <%- end -%>
+      <div class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %>">
+        <div class="tooltip">
+          <h3><%= _t("page_type") %>:</h3>
+          <p><%= page.layout_display_name %></p>
+          <h3><%= _t("page_status") %>:</h3>
+          <p><%= combined_page_status(page) %></p>
+          <h3><%= _t(:created_at) %>:</h3>
+          <p><%= l(page.created_at) %></p>
+          <h3><%= _t(:created_by) %>:</h3>
+          <p><%= page.creator %></p>
+          <h3><%= _t(:updated_at) %>:</h3>
+          <p><%= l(page.updated_at) %></p>
+          <h3><%= _t(:updated_by) %>:</h3>
+          <p><%= page.updater %></p>
+          <%- if page.locked? -%>
+          <h3><%= _t("currently_edited_by") %>:</h3>
+          <p><%= page.current_editor %></p>
+          <%- end -%>
+        </div>
       </div>
     </div>
     <div class="sitemap_right_tools">
@@ -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>
@@ -91,7 +91,7 @@
     <%- if page.redirects_to_external? -%>
       <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
       <span class="redirect_url" title="<%= h page.urlname %>">
-        &raquo; <%= t('Redirects to') %>:
+        &raquo; <%= _t('Redirects to') %>:
         <%= h page.urlname %>
       </span>
     <%- else -%>
@@ -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 -%>