RubyGems - alchemy_cms - Versions diffs - 3.2.1 → 3.3.0.rc1 - Mend

alchemy_cms 3.2.1 → 3.3.0.rc1

Files changed (556) hide show

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

@@ -5,7 +5,7 @@
   <% end %>
 <% else %>
   <%= render_message do %>
-    <%= simple_format _t(:explain_cropping) %>
+    <%= simple_format Alchemy.t(:explain_cropping) %>
   <% end %>
   <div class="thumbnail_background">
     <%= image_tag(
@@ -22,8 +22,8 @@
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag :content_id, @content.id %>
-    <%= f.button "#{render_icon(:true)} #{_t(:apply)}".html_safe, class: 'with_icon' %>
-    <%= link_to _t('Reset Imagemask'), '#', {
+    <%= f.button "#{render_icon(:true)} #{Alchemy.t(:apply)}".html_safe, class: 'with_icon' %>
+    <%= link_to Alchemy.t('Reset Imagemask'), '#', {
       onclick: 'Alchemy.ImageCropper.reset(); return false',
       class: 'reset_mask'
     } %>

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

@@ -6,23 +6,23 @@
   <%= f.input :alt_tag %>
   <%- if @options[:sizes].present? -%>
     <%= f.input :render_size,
-      collection: [[_t('Layout default'), @options[:image_size]]] + @options[:sizes].to_a,
+      collection: [[Alchemy.t('Layout default'), @options[:image_size]]] + @options[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>
   <%- if @options[:css_classes].present? -%>
     <%= f.input :css_class,
       collection: @options[:css_classes],
-      include_blank: _t('None'),
+      include_blank: Alchemy.t('None'),
       input_html: {class: 'alchemy_selectbox'} %>
   <%- else -%>
     <%= f.input :css_class,
-      label: _t(:position_in_text),
+      label: Alchemy.t(:position_in_text),
       collection: [
-        [_t(:above), "no_float"],
-        [_t(:left), "left"],
-        [_t(:right), "right"]
-      ], include_blank: _t("Layout default"), input_html: {class: 'alchemy_selectbox'} %>
+        [Alchemy.t(:above), "no_float"],
+        [Alchemy.t(:left), "left"],
+        [Alchemy.t(:right), "right"]
+      ], include_blank: Alchemy.t("Layout default"), input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1,7 +1,16 @@
 <%= alchemy_form_for [alchemy, :admin, @language] do |f| %>
   <%= f.input :name, autofocus: true %>
-  <%= f.input :language_code, placeholder: _t(:language_code_placeholder) %>
-  <%= f.input :country_code, as: 'string', placeholder: _t(:country_code_placeholder), hint: _t(:country_code_foot_note) %>
+  <%= f.input :language_code, placeholder: Alchemy.t(:language_code_placeholder) %>
+  <%= f.input :country_code,
+    as: 'string',
+    placeholder: Alchemy.t(:country_code_placeholder),
+    hint: Alchemy.t(:country_code_foot_note) %>
+  <% if @language.errors[:locale].present? || @language.locale.present? %>
+    <%= f.input :locale,
+      collection: @language.matching_locales.presence || ::I18n.available_locales,
+      selected: @language.locale || @language.language_code || ::I18n.default_locale.to_s,
+      input_html: {class: 'alchemy_selectbox'} %>
+  <% end %>
   <%= f.input :frontpage_name %>
   <%= f.input :page_layout,
     collection: Alchemy::PageLayout.all,
@@ -10,5 +19,5 @@
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :public %>
   <%= f.input :default %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/languages/_language.html.erb CHANGED

@@ -8,6 +8,12 @@
   <td>
     <%= language.country_code %>
   </td>
+  <td>
+    <%= language.code %>
+  </td>
+  <td>
+    <%= language.locale %>
+  </td>
   <td>
     <%= language.frontpage_name %>
   </td>
@@ -29,12 +35,12 @@
       '',
       alchemy.edit_admin_language_path(language),
       {
-        title: _t("Edit"),
+        title: Alchemy.t("Edit"),
         size: "430x415"
       },
       {
         class: "icon edit",
-        title: _t("Edit")
+        title: Alchemy.t("Edit")
       }
     ) -%>
   <%- end -%>

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

@@ -3,13 +3,19 @@
   <thead>
     <tr>
       <th>
-        <%= sortable_column(Alchemy::Language.human_attribute_name(:name), column: :name) %>
+        <%= sort_link @query, :name, hide_indicator: true %>
       </th>
       <th>
-        <%= sortable_column(Alchemy::Language.human_attribute_name(:language_code), column: :language_code) %>
+        <%= sort_link @query, :language_code, hide_indicator: true %>
       </th>
       <th>
-        <%= sortable_column(Alchemy::Language.human_attribute_name(:country_code), column: :country_code) %>
+        <%= sort_link @query, :country_code, hide_indicator: true %>
+      </th>
+      <th>
+        <%= Alchemy::Language.human_attribute_name(:code) %>
+      </th>
+      <th>
+        <%= Alchemy::Language.human_attribute_name(:locale) %>
       </th>
       <th>
         <%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
@@ -30,8 +36,8 @@
     <%= render_resources %>
   </tbody>
 </table>
-<%- elsif params[:query] -%>
-<p><%= _t('Nothing found') %></p>
+<%- elsif params[:q].present? -%>
+<p><%= Alchemy.t('Nothing found') %></p>
 <%- end -%>
 <%= paginate @languages, theme: 'alchemy' %>

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

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

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

@@ -1,8 +1,8 @@
 <li class="page_level_<%= layoutpage.level %>" id="page_<%= layoutpage.id %>">
   <div class="sitemap_page<%= layoutpage.locked ? ' locked' : '' %>">
     <div class="sitemap_left_images">
-    <% if layoutpage.layout_description.blank? %>
-      <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+    <% if layoutpage.definition.blank? %>
+      <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
     <% else %>
       <%= render_icon(:page) %>
     <% end %>
@@ -13,11 +13,11 @@
         render_icon('configure_page'),
         alchemy.edit_admin_layoutpage_path(layoutpage),
         {
-          title: _t(:edit_page_properties),
+          title: Alchemy.t(:edit_page_properties),
           size: '410x170'
         },
         class: 'sitemap_tool',
-        title: _t(:edit_page_properties)
+        title: Alchemy.t(:edit_page_properties)
       ) -%>
       <%- end -%>
       <span class="sitemap_sitetools">
@@ -31,13 +31,13 @@
           remote: true,
           method: 'post',
           class: "sitemap_tool",
-          title: _t(:copy_page)
+          title: Alchemy.t(:copy_page)
         ) %>
       <%- end -%>
       <%- if can?(:destroy, layoutpage) -%>
         <%= link_to_confirm_dialog(
           render_icon('delete_page'),
-          _t(:confirm_to_delete_page),
+          Alchemy.t(:confirm_to_delete_page),
           url_for(
             controller: 'pages',
             action: 'destroy',
@@ -45,7 +45,7 @@
           ),
           {
             class: "sitemap_tool",
-            title: _t(:delete_page)
+            title: Alchemy.t(:delete_page)
           }
         ) -%>
       <%- end -%>
@@ -55,7 +55,7 @@
       <%= link_to(
         layoutpage.name,
         alchemy.edit_admin_page_path(layoutpage),
-        title: _t(:edit_page),
+        title: Alchemy.t(:edit_page),
         class: "sitemap_pagename_link #{cycle('even', 'odd')}"
       ) -%>
     </div>

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

@@ -1,7 +1,7 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
   <%= f.input :page_layout,
     collection: @page_layouts,
-    label: @page.layout_description.blank? ? (%(<span class="inline warning icon" title="#{ _t(:page_layout_description_missing) }"></span>&nbsp;) + _t(:page_type)).html_safe : _t(:page_type),
+    label: @page.definition.blank? ? (%(<span class="inline warning icon" title="#{ Alchemy.t(:page_definition_missing) }"></span>&nbsp;) + Alchemy.t(:page_type)).html_safe : Alchemy.t(:page_type),
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>
@@ -11,5 +11,5 @@
       <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
     </div>
   <% end %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1,10 +1,3 @@
-<% if @locked_pages.present? %>
-  <% content_for(:subnav_additions) do %>
-    <label><%= _t('Active Pages') %> &raquo;</label>
-    <%= render partial: 'alchemy/admin/pages/locked_page', collection: @locked_pages %>
-  <% end %>
-<% end %>
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render partial: 'alchemy/admin/partials/language_tree_select' %>
@@ -14,24 +7,24 @@
     url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
     hotkey: 'alt+n',
     dialog_options: {
-      title: _t('Add global page'),
+      title: Alchemy.t('Add global page'),
       size: '340x170',
       overflow: true
     },
-    title: _t('Add global page'),
-    label: _t('Add global page'),
+    title: Alchemy.t('Add global page'),
+    label: Alchemy.t('Add global page'),
     if_permitted_to: [:create, Alchemy::Page]
   ) %>
   <%= toolbar_button(
     icon: "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
     url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
     dialog_options: {
-      title: _t('Clipboard'),
+      title: Alchemy.t('Clipboard'),
       size: '380x270'
     },
-    title: _t('Show clipboard'),
+    title: Alchemy.t('Show clipboard'),
     id: "clipboard_button",
-    label: _t('Show clipboard')
+    label: Alchemy.t('Show clipboard')
   ) %>
 </div>
 <% end %>

data/app/views/alchemy/admin/leave.html.erb CHANGED

@@ -1,11 +1,11 @@
 <%= render_message do %>
-  <%= _t("You are about to leave Alchemy") %>
+  <%= Alchemy.t("You are about to leave Alchemy") %>
 <% end %>
 <p class="buttons">
-  <label><%= _t("Do you want to") %></label>
-  <%= link_to _t('stay logged in'), alchemy.root_path, class: 'button' %>
+  <label><%= Alchemy.t("Do you want to") %></label>
+  <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button' %>
 </p>
 <%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
-  <label><%= _t('or to completely') %></label>
-  <%= button_tag _t(:logout), autofocus: true %>
+  <label><%= Alchemy.t('or to completely') %></label>
+  <%= button_tag Alchemy.t(:logout), autofocus: true %>
 <% end %>

data/app/views/alchemy/admin/legacy_page_urls/_form.html.erb CHANGED

@@ -1,5 +1,5 @@
 <%= alchemy_form_for [:admin, @legacy_page_url ||= Alchemy::LegacyPageUrl.new] do |f| %>
   <%= hidden_field_tag :page_id, @page.id %>
   <%= f.input :urlname %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb CHANGED

@@ -3,11 +3,11 @@
   <td class="tools">
     <%= link_to_dialog render_icon(:edit),
       edit_admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
-      {size: '400x125', title: _t('Edit link')},
-      {title: _t(:edit)} %>
+      {size: '400x125', title: Alchemy.t('Edit link')},
+      {title: Alchemy.t(:edit)} %>
     <%= link_to_confirm_dialog render_icon(:destroy),
-      _t('Are you sure?'),
+      Alchemy.t('Are you sure?'),
       admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
-      {title: _t(:remove)} %>
+      {title: Alchemy.t(:remove)} %>
   </td>
 </tr>

data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb CHANGED

@@ -13,7 +13,7 @@
     <div class="right-column">
       <button class="with_icon">
         <%= render_icon(:create) %>
-        <%= _t(:add) %>
+        <%= Alchemy.t(:add) %>
       </button>
     </div>
   </div>

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

@@ -1,21 +1,21 @@
 <% if root = Alchemy::Page.rootpage %>
 <div id="create_language_tree_form">
   <%= render_message do %>
-    <h2><%= _t(:language_does_not_exist) %></h2>
+    <h2><%= Alchemy.t(:language_does_not_exist) %></h2>
   <% end %>
 <%- if @language -%>
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
-      <h3><%= _t(:copy_language_tree_heading) %></h3>
-      <p><%= _t(:want_to_make_copy_of_existing_language) %></p>
+      <h3><%= Alchemy.t(:copy_language_tree_heading) %></h3>
+      <p><%= Alchemy.t(:want_to_make_copy_of_existing_language) %></p>
       <div class="input select">
-        <%= label_tag('languages[old_lang_id]', _t('Language tree'), class: 'control-label') %>
+        <%= label_tag('languages[old_lang_id]', Alchemy.t('Language tree'), class: 'control-label') %>
         <%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), class: "alchemy_selectbox") %>
         <%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
       </div>
       <div class="submit">
-        <%= button_tag _t(:copy) %>
+        <%= button_tag Alchemy.t(:copy) %>
       </div>
     <% end %>
   <%- end -%>
@@ -23,8 +23,8 @@
   <%- if params[:action] == "index" -%>
   <%= form_for([:admin, Alchemy::Page.new]) do |form| %>
-    <h3><%= _t(:create_language_tree_heading) %></h3>
-    <p><%= _t(:want_to_create_new_language) %></p>
+    <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
+    <p><%= Alchemy.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 %>
@@ -33,7 +33,7 @@
     <%= form.hidden_field :parent_id, value: root.id %>
     <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
     <div class="submit">
-      <%= form.button _t("create_tree_as_new_language", language: @language.name), autofocus: true %>
+      <%= form.button Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
     </div>
   <% end %>
@@ -41,7 +41,7 @@
 <%- else -%>
-  <p><%= _t("Actually this language does not exist. Please create this language first.") %></p>
+  <p><%= Alchemy.t("Actually this language does not exist. Please create this language first.") %></p>
 <%- end -%>

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

@@ -1,8 +1,8 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= _t(:enter_external_link) %></h2>
-    <p><%= _t(:external_link_notice_1) %></p>
-    <p><%= _t(:external_link_notice_2) %></p>
+    <h2><%= Alchemy.t(:enter_external_link) %></h2>
+    <p><%= Alchemy.t(:external_link_notice_1) %></p>
+    <p><%= Alchemy.t(:external_link_notice_2) %></p>
   <% end %>
   <div id="errors" class="errors">
     <ul></ul>
@@ -13,19 +13,19 @@
   </div>
   <div class="input text">
     <label for="external_link_title" class="control-label">
-      <%= _t(:link_title) %>
+      <%= Alchemy.t(:link_title) %>
     </label>
     <%= text_field_tag "external_link_title", '', class: 'link_title' %>
   </div>
   <div class="input select">
     <label for="external_link_target" class="control-label">
-      <%= _t("Open Link in") %>
+      <%= Alchemy.t("Open Link in") %>
     </label>
     <%= select_tag 'external_link_target',
       options_for_select(Alchemy::Page.link_target_options),
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= link_to _t(:apply), '#', class: 'create-link button', 'data-link-type' => 'external' %>
+    <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'external' %>
   </div>
 <% end %>

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

@@ -1,31 +1,31 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= _t(:choose_file_to_link) %></h2>
+    <h2><%= Alchemy.t(:choose_file_to_link) %></h2>
   <% end %>
   <div class="input select">
     <label for="public_filename" class="control-label">
-      <%= _t(:file) %>
+      <%= Alchemy.t(:file) %>
     </label>
     <%= select_tag "public_filename",
       options_for_select(@attachments),
-      prompt: _t('Please choose'),
+      prompt: Alchemy.t('Please choose'),
       class: "alchemy_selectbox" %>
   </div>
   <div class="input text">
     <label for="file_link_title" class="control-label">
-      <%= _t(:link_title) %>
+      <%= Alchemy.t(:link_title) %>
     </label>
     <%= text_field_tag "file_link_title", '', class: 'link_title' %>
   </div>
   <div class="input select">
     <label for="file_link_target" class="control-label">
-      <%= _t("Open Link in") %>
+      <%= Alchemy.t("Open Link in") %>
     </label>
     <%= select_tag 'file_link_target',
       options_for_select(Alchemy::Page.link_target_options),
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= link_to _t(:apply), '#', class: 'create-link button', 'data-link-type' => 'file' %>
+    <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'file' %>
   </div>
 <% end %>

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

@@ -5,7 +5,7 @@
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
   <div class="input check_boxes">
-    <label class="control-label"><%= _t(:page_status) %></label>
+    <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
       <label class="checkbox">
         <%= f.check_box :public %>
@@ -27,14 +27,14 @@
     <% end %>
     </div>
   </div>
-  <h2><%= _t(:names) %></h2>
+  <h2><%= Alchemy.t(:names) %></h2>
   <%= f.input :name, autofocus: true %>
   <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
-  <h2><%= _t(:meta_data) %></h2>
+  <h2><%= Alchemy.t(:meta_data) %></h2>
   <div class="input check_boxes">
-    <label class="control-label"><%= _t(:search_engines) %></label>
+    <label class="control-label"><%= Alchemy.t(:search_engines) %></label>
     <div class="control_group">
       <label class="checkbox">
         <%= f.check_box :robot_index %>
@@ -51,12 +51,12 @@
     input_html: {'data-alchemy-char-counter' => 160} %>
   <%= f.input :meta_keywords,
     as: 'text',
-    hint: _t('pages.update.comma_seperated') %>
+    hint: Alchemy.t('pages.update.comma_seperated') %>
   <% if @page.taggable? %>
     <div class="input string">
       <%= f.label :tag_list %>
       <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
     </div>
   <% end %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>