alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,7 +1,4 @@
 <script>
-  // Holds custom tinymce configurations
-  Alchemy.Tinymce.customConfigs = {};
-
   // Populate custom tinymce configurations
   <% Alchemy::Tinymce.custom_config_contents(@page).each do |content| %>
   Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] %>"] = {

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

@@ -1,6 +1,6 @@
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#page_properties"><%= _t('Properties') %></a></li>
+    <li><a href="#page_properties"><%= Alchemy.t('Properties') %></a></li>
     <li>
       <a href="#legacy_urls" id="legacy_urls_label">
         <%= render 'alchemy/admin/legacy_page_urls/label', count: @page.legacy_urls.size %>

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

@@ -1,11 +1,11 @@
 <%= alchemy_form_for [:admin, @page] do |f| %>
   <%= f.input :page_layout,
     collection: @page_layouts,
-    label: _t(:page_type),
+    label: Alchemy.t(:page_type),
     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 :visible %>
@@ -19,7 +19,7 @@
     <% end %>
     </div>
   </div>
-  <h2><%= _t(:names) %></h2>
+  <h2><%= Alchemy.t(:names) %></h2>
   <%= f.input :name, autofocus: true %>
   <%= f.input :urlname, as: 'string' %>
   <%= f.input :title %>
@@ -29,5 +29,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/pages/edit.html.erb

@@ -1,28 +1,23 @@
 <% content_for(:title) { @page.name } %>
 
-<% content_for(:subnav_additions) do %>
-  <label><%= _t('Active Pages') %> &raquo;</label>
-  <%= render partial: 'locked_page', collection: @locked_pages %>
-<% end %>
-
 <% content_for(:toolbar) do %>
 <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) %>" data-alchemy-hotkey="alt+x">
+      <button class="icon_button" title="<%= Alchemy.t(:explain_unlocking) %>" data-alchemy-hotkey="alt+x">
         <%= render_icon('close') %>
       </button>
-      <label><%= _t(:unlock_page) %></label>
+      <label><%= Alchemy.t(:unlock_page) %></label>
     <% end %>
   </div>
   <div class="toolbar_spacer"></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="<%= Alchemy.t('Visit page') %>">
         <%= render_icon('visit_page') %>
       </button>
-      <label><%= _t("Visit page") %></label>
+      <label><%= Alchemy.t("Visit page") %></label>
     <% end %>
   </div>
   <% end %>
@@ -31,16 +26,16 @@
       render_icon('info'),
       alchemy.info_admin_page_path(@page),
       {
-        title: _t(:page_infos),
+        title: Alchemy.t(:page_infos),
         size: '520x320'
       },
       {
         class: 'icon_button',
-        title: _t(:page_infos),
+        title: Alchemy.t(:page_infos),
         'data-alchemy-hotkey' => 'alt+i'
       }
     ) %>
-    <label><%= _t(:page_infos) %></label>
+    <label><%= Alchemy.t(:page_infos) %></label>
   </div>
   <div class="button_with_label">
     <% if @page.layoutpage? %>
@@ -48,11 +43,11 @@
         render_icon('settings'),
         alchemy.edit_admin_layoutpage_path(@page),
         {
-          title: _t(:edit_page_properties),
+          title: Alchemy.t(:edit_page_properties),
           size: '450x170'
         },
         class: :icon_button,
-        title: _t(:edit_page_properties),
+        title: Alchemy.t(:edit_page_properties),
         'data-alchemy-hotkey' => 'alt+e'
       ) %>
     <% else %>
@@ -60,29 +55,29 @@
         render_icon('settings'),
         alchemy.configure_admin_page_path(@page),
         {
-          title: _t(:edit_page_properties),
+          title: Alchemy.t(:edit_page_properties),
           size: '450x720'
         },
         class: :icon_button,
-        title: _t(:edit_page_properties),
+        title: Alchemy.t(:edit_page_properties),
         'data-alchemy-hotkey' => 'alt+e'
       ) %>
     <% end %>
-    <label><%= _t(:page_properties) %></label>
+    <label><%= Alchemy.t(:page_properties) %></label>
   </div>
   <% if can?(:publish, @page) && !@page.layoutpage? %>
     <div class="button_with_label">
       <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
-        <%= button_tag class: 'icon_button', title: _t(:explain_publishing) do %>
+        <%= button_tag class: 'icon_button', title: Alchemy.t(:explain_publishing) do %>
           <%= render_icon('publish') %>
         <% end %>
-        <label><%= _t("Publish page") %></label>
+        <label><%= Alchemy.t("Publish page") %></label>
       <% end %>
     </div>
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="select_with_label">
-    <label><%= _t(:preview_size) %></label>
+    <label><%= Alchemy.t(:preview_size) %></label>
     <%= select_tag 'preview_size',
       preview_sizes_for_select,
       class: 'alchemy_selectbox medium' %>
@@ -90,26 +85,26 @@
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
     <%= link_to render_icon(:reload), '#', {
-      title: _t('Reload Preview'),
+      title: Alchemy.t('Reload Preview'),
       class: 'icon_button',
       id: 'reload_preview_button'
     } %>
-    <label><%= _t('Reload Preview') %></label>
+    <label><%= Alchemy.t('Reload Preview') %></label>
   </div>
 </div>
 <div class="toolbar_buttons right">
   <div class="button_with_label" id="element_window_button">
     <%= link_to render_icon(:element_window), '', {
-      title: _t('Hide Elements'),
+      title: Alchemy.t(:hide_elements),
       class: 'icon_button'
     } %>
-    <label><%= _t('Hide Elements') %></label>
+    <label><%= Alchemy.t(:hide_elements) %></label>
   </div>
 </div>
 <% end %>
 
 <% content_for :javascripts do %>
-<% if Alchemy::Tinymce.custom_config_contents(@page).any? %>
+<% if Alchemy::Tinymce.custom_config_contents(@page).present? %>
   <%= render 'tinymce_custom_config' %>
 <% end %>
 <script type="text/javascript" charset="utf-8">
@@ -124,46 +119,46 @@
     Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>');
     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) %>',
-        ok_label: '<%= _t("Yes") %>',
-        cancel_label: '<%= _t("No") %>',
-        hideElements: '<%= _t("Hide Elements") %>',
-        showElements: '<%= _t("Show Elements") %>'
+        title: '<%= Alchemy.t("Elements") %>',
+        dirtyTitle: '<%= Alchemy.t("Warning!") %>',
+        dirtyMessage: '<%= Alchemy.t(:element_dirty_close_window_notice) %>',
+        ok_label: '<%= Alchemy.t("Yes") %>',
+        cancel_label: '<%= Alchemy.t("No") %>',
+        hideElements: '<%= Alchemy.t(:hide_elements) %>',
+        showElements: '<%= Alchemy.t(:show_elements) %>'
       },
       toolbarButtons: [
         {
-          title: '<%= _t("New Element") %>',
-          label: '<%= _t("New Element") %>',
+          title: '<%= Alchemy.t("New Element") %>',
+          label: '<%= Alchemy.t("New Element") %>',
           hotkey: 'alt+n',
           iconClass: 'new_element',
           onClick: function() {
             Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_id: @page.id) %>', {
-              title: '<%= _t("New Element") %>',
+              title: '<%= Alchemy.t("New Element") %>',
               size: '320x125'
             });
           }
         },
         {
-          title: '<%= _t("Clipboard") %>',
-          label: '<%= _t("Show clipboard") %>',
+          title: '<%= Alchemy.t("Clipboard") %>',
+          label: '<%= Alchemy.t("Show clipboard") %>',
           iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
             Alchemy.openDialog('<%= alchemy.admin_clipboard_path(remarkable_type: "elements") %>', {
-              title :'<%= _t("Clipboard") %>',
-              size: '380x305'
+              title :'<%= Alchemy.t("Clipboard") %>',
+              size: '400x305'
             });
           }
         },
         {
-          title: '<%= _t("Show trash") %>',
-          label: '<%= _t("Show trash") %>',
+          title: '<%= Alchemy.t("Show trash") %>',
+          label: '<%= Alchemy.t("Show trash") %>',
           iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
           buttonId: 'element_trash_button',
           onClick: function() {
-            Alchemy.TrashWindow.open(<%= @page.id %>, '<%= _t("Trash") %>');
+            Alchemy.TrashWindow.open(<%= @page.id %>, '<%= Alchemy.t("Trash") %>');
           }
         }
       ]
@@ -171,12 +166,12 @@
       Alchemy.ImageLoader('#element_area');
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
-      Alchemy.SelectBox('.element_editor');
+      Alchemy.SelectBox('.element-editor');
       Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
       $('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
       Alchemy.ElementDirtyObserver('#element_area');
       if (window.location.hash) {
-        $(window.location.hash).trigger('Alchemy.SelectElementEditor');
+        $(window.location.hash).trigger('FocusElementEditor.Alchemy');
       }
     });
 

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

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

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

@@ -1,3 +1,2 @@
-$('#page_<%= @page.id -%>').replaceWith('<%= j render("page", page: @page) %>');
-Alchemy.watchForDialogs('#page_<%= @page.id %>');
-Alchemy.Spinner.watch('#page_<%= @page.id %>');
+$('#fold_button_<%= @page.id %>').css('background', 'none');
+Alchemy.Sitemap.fetch(<%= @page.id %>);

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

@@ -1,10 +1,3 @@
-<% if @locked_pages.present? %>
-  <% content_for(:subnav_additions) do %>
-    <label><%= _t('Active Pages') %> &raquo;</label>
-    <%= render partial: 'locked_page', collection: @locked_pages %>
-  <% end %>
-<% end %>
-
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
@@ -17,9 +10,9 @@
       :remote => true,
       :method => :post,
       :class => 'icon_button please_wait',
-      :title => _t('Flush page cache')
+      :title => Alchemy.t('Flush page cache')
     ) %>
-    <label><%= _t('Flush page cache') %></label>
+    <label><%= Alchemy.t('Flush page cache') %></label>
   </div>
   <% end %>
   <% if can?(:sort, Alchemy::Page) %>
@@ -31,9 +24,9 @@
       :method => :get,
       :remote => true,
       :class => 'icon_button please_wait',
-      :title => _t('Sort pages')
+      :title => Alchemy.t('Sort pages')
     ) %>
-    <label><%= _t('Sort pages') %></label>
+    <label><%= Alchemy.t('Sort pages') %></label>
   </div>
   <% end %>
   <div class="button_with_label" id="clipboard_button">
@@ -41,24 +34,24 @@
       render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
       alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
       {
-        :title => _t('Clipboard'),
+        :title => Alchemy.t('Clipboard'),
         :size => '380x305'
       },
       :class => 'icon_button',
-      :title => _t('Show clipboard')
+      :title => Alchemy.t('Show clipboard')
     ) %>
-    <label><%= _t('Show clipboard') %></label>
+    <label><%= Alchemy.t('Show clipboard') %></label>
   </div>
 </div>
 <div class="js_filter_field_box">
   <%= text_field_tag 'filter', '',
     class: 'thin_border js_filter_field',
     id: 'search_field',
-    placeholder: _t(:search) %>
+    placeholder: Alchemy.t(:search) %>
   <%= render_icon :search %>
   <%= link_to('', '#', {
     class: "js_filter_field_clear",
-    title: _t(:click_to_show_all)
+    title: Alchemy.t(:click_to_show_all)
   }) %>
 </div>
 <% end %>
@@ -69,22 +62,22 @@
   <div id="sort_panel" style="display: none">
     <div class="info">
       <%= render_icon('info') %>
-      <%= _t(:explain_sitemap_dragndrop_sorting) %>
+      <%= Alchemy.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( Alchemy.t(:cancel), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
+      <%= submit_tag( Alchemy.t('save order'), :id => 'save_page_order', :class => 'button' ) %>
     </div>
   </div>
 
   <h1 id="page_filter_result"></h1>
 
   <h2 id="sitemap_heading">
-    <span class="page_name"><%= _t('Name') %></span>
-    <span class="page_infos"><%= _t('Status') %></span>
+    <span class="page_name"><%= Alchemy.t('Name') %></span>
+    <span class="page_infos"><%= Alchemy.t('Status') %></span>
   </h2>
 
-  <%= render :partial => 'sitemap' %>
+  <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>
 
 <% elsif can?(:create, Alchemy::Page) %>
 

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

@@ -6,8 +6,8 @@
   <% end %>
   <div class="value">
     <label>
-      <% if @page.layout_description.blank? %>
-        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+      <% if @page.definition.blank? %>
+        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
       <% end %>
       <%= Alchemy::Page.human_attribute_name(:page_layout) %>
     </label>
@@ -23,20 +23,20 @@
   <% end %>
   </div>
   <div class="value">
-    <label><%= _t(:page_status) %></label>
+    <label><%= Alchemy.t(:page_status) %></label>
     <p><%= combined_page_status(@page) %></p>
   </div>
   <div class="value">
-    <label><%= _t(:page_was_created) %></label>
-    <p><%= _t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
+    <label><%= Alchemy.t(:page_was_created) %></label>
+    <p><%= Alchemy.t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
   </div>
   <div class="value">
-    <label><%= _t(:page_was_updated) %></label>
-    <p><%= _t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
+    <label><%= Alchemy.t(:page_was_updated) %></label>
+    <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
   </div>
   <% if @page.locked? %>
   <div class="value">
-    <label><%= _t(:currently_edited_by) %></label>
+    <label><%= Alchemy.t(:currently_edited_by) %></label>
     <p><%= @page.locker_name %></p>
   </div>
   <% end %>

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

@@ -1,8 +1,8 @@
 <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"><%= Alchemy.t('link_overlay_tab_label.internal') %></a></li>
+    <li><a href="#overlay_tab_external_link"><%= Alchemy.t('link_overlay_tab_label.external') %></a></li>
+    <li><a href="#overlay_tab_file_link"><%= Alchemy.t('link_overlay_tab_label.file') %></a></li>
   </ul>
   <div id="overlay_tab_internal_link">
     <%= render partial: 'internal_link' %>

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

@@ -1,3 +1,3 @@
 <div>
-  <p><%= _t("page_states.locked.true") %></p>
+  <p><%= Alchemy.t("page_states.locked.true") %></p>
 </div>

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

@@ -3,8 +3,8 @@
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#create_page_tab"><%= _t('New page') %></a></li>
-    <li><a href="#paste_page_tab"><%= _t('Paste from clipboard') %></a></li>
+    <li><a href="#create_page_tab"><%= Alchemy.t('New page') %></a></li>
+    <li><a href="#paste_page_tab"><%= Alchemy.t('Paste from clipboard') %></a></li>
   </ul>
   <div id="create_page_tab">
     <%= render 'new_page_form' %>
@@ -13,13 +13,13 @@
     <%= alchemy_form_for [:admin, @page] do |f| %>
       <%= f.hidden_field(:parent_id) %>
       <div class="input select">
-        <label for="paste_from_clipboard" class="control-label"><%= _t("Page") %></label>
+        <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Page") %></label>
         <%= select_tag 'paste_from_clipboard',
           clipboard_select_tag_options(@clipboard_items),
           class: 'alchemy_selectbox' %>
       </div>
       <%= f.input :name %>
-      <%= f.submit _t(:paste) %>
+      <%= f.submit Alchemy.t(:paste) %>
     <% end %>
   </div>
 </div>

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

@@ -1,5 +1,4 @@
-$('#sitemap').replaceWith('<%= j render("sitemap") %>');
+$('#sitemap').replaceWith('<%= j render('sitemap', page_partial: 'page', full: true) %>');
 $('#sort_panel').show();
 $('#sitemap_heading').css({'padding-top': 102});
-Alchemy.PageSorter.init();
 Alchemy.pleaseWaitOverlay(false);