alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,33 +1,31 @@
 <%= form_tag do %>
   <%= render_message do %>
-    <h2><%= _t(:internal_link_headline) %></h2>
-    <p><%= _t(:internal_link_page_elements_explanation) %></p>
-    <p><%= _t(:internal_link_page_anchors_explanation) %></p>
+    <h2><%= Alchemy.t(:internal_link_headline) %></h2>
+    <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
+    <p><%= Alchemy.t(:internal_link_page_anchors_explanation) %></p>
   <% end %>
   <div id="page_selector_container">
     <% if @page_root %>
-    <ul id="sitemap">
-      <%= render partial: 'page_for_links', object: @page_root, locals: {area_name: @area_name} %>
-    </ul>
+      <%= render 'sitemap', page_partial: 'page_for_links', full: true %>
     <% end %>
   </div>
   <div class="input select">
     <label for="internal_anchor" class="control-label">
-      <%= _t(:anchor) %>
+      <%= Alchemy.t(:anchor) %>
     </label>
     <%= select_tag(:internal_anchor,
-      options_for_select([[_t('Please choose'), '']]),
+      options_for_select([[Alchemy.t('Please choose'), '']]),
       class: 'alchemy_selectbox') %>
   </div>
   <div class="input text">
     <label for="internal_link_title" class="control-label">
-      <%= _t(:link_title) %>
+      <%= Alchemy.t(:link_title) %>
     </label>
     <%= text_field_tag "internal_link_title", '', class: 'link_title' %>
   </div>
   <div class="input select">
     <label for="internal_link_target" class="control-label">
-      <%= _t("Open Link in") %>
+      <%= Alchemy.t("Open Link in") %>
     </label>
     <%= select_tag 'internal_link_target',
       options_for_select(Alchemy::Page.link_target_options),
@@ -36,6 +34,6 @@
   <div class="submit">
     <%= hidden_field_tag(:internal_urlname) %>
     <%= hidden_field_tag(:page_anchor) %>
-    <%= link_to _t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
+    <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= render_message do %>
-  <p><%== _t(:legacy_url_info_text) %></p>
+  <p><%== Alchemy.t(:legacy_url_info_text) %></p>
 <% end %>
 
 <table class="list" id="legacy_page_urls">
@@ -12,12 +12,12 @@
   <%= render partial: 'alchemy/admin/legacy_page_urls/legacy_page_url',
     collection: @page.legacy_urls %>
   <tr class="even" id="no_page_links_notice" style="display: <%= @page.legacy_urls.any? ? 'none' : 'table-row' %>">
-    <td><%= _t('No page links for this page found') %></td>
+    <td><%= Alchemy.t('No page links for this page found') %></td>
     <td class="tools"></td>
   </tr>
 </table>
 
 <fieldset>
-  <legend><%= _t('Add page link') %></legend>
+  <legend><%= Alchemy.t('Add page link') %></legend>
   <%= render 'alchemy/admin/legacy_page_urls/new' %>
 </fieldset>

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

@@ -1,10 +1,10 @@
 <% if @page == locked_page %>
-  <%= render 'page_status' %>
+  <%= render 'page_status', page: @page %>
 <% else %>
   <div class="subnavi_tab wide" id="locked_page_<%= locked_page.id %>">
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
-      <% if locked_page.layout_description.blank? %>
-        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+      <% if locked_page.definition.blank? %>
+        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
       <% end %>
       <span class="page_name" title="<%= locked_page.name %>">
         <%= truncate locked_page.name, length: 15 %>
@@ -16,7 +16,7 @@
       <%- end -%>
     <% end %>
     <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
-      <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
+      <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
         <%= render_icon('close small') %>
       </button>
     <% end %>

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

@@ -3,9 +3,9 @@
   <%= f.hidden_field(:layoutpage) %>
   <%= f.input :page_layout,
     collection: @page_layouts,
-    label: _t(:page_type),
+    label: Alchemy.t(:page_type),
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name %>
-  <%= f.submit _t(:create) %>
+  <%= f.submit Alchemy.t(:create) %>
 <% end %>

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

@@ -1,112 +1,127 @@
-<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>" data-slug="<%= page.slug %>" data-restricted="<%= page.restricted? %>" data-visible="<%= page.visible? %>" data-external="<%= page.redirects_to_external? %>">
-  <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
+<li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-visible="{{visible}}" data-external="{{redirects_to_external}}">
+  <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
     <div class="sitemap_left_images">
-      <%= sitemap_folder_link(page) unless page.level == 1 || page.children.blank? || @sorting %>
-      <% if page.layout_description.blank? %>
-        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
-      <% else %>
-        <div class="page icon <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
+      <% unless @sorting %>
+        {{#unless root_or_leaf}}
+        <%= link_to(
+          '',
+          alchemy.fold_admin_page_path(page),
+          remote: true,
+          method: :post,
+          class: "page_folder {{#if folded}}folded{{else}}collapsed{{/if}} spinner",
+          title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
+          id: "fold_button_{{id}}"
+        )
+        %>
+        {{/unless}}
       <% end %>
+      {{#if definition_missing}}
+        <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+      {{else}}
+        <div class="page icon<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>"></div>
+      {{/if}}
     </div>
     <div class="sitemap_right_tools">
-    <%- unless @sorting -%>
-      <%- if can?(:info, page) -%>
+      <%- unless @sorting -%>
+        {{#if permissions.info}}
         <%= link_to_dialog(
           render_icon('info'),
           alchemy.info_admin_page_path(page),
           {
-            title: _t(:page_infos),
+            title: Alchemy.t(:page_infos),
             size: '520x290'
           },
           {
-            title: _t(:page_infos),
+            title: Alchemy.t(:page_infos),
             class: 'sitemap_tool'
           }
-        ) %>
-      <%- end -%>
-      <%- if can?(:configure, page) -%>
+          ) %>
+        {{/if}}
+        {{#if permissions.configure}}
         <%= link_to_dialog(
           render_icon('configure_page'),
           alchemy.configure_admin_page_path(page),
           {
-            title: _t(:edit_page_properties),
+            title: Alchemy.t(:edit_page_properties),
             size: page.redirects_to_external? ? '450x330' : '450x720'
           },
-          title: _t(:edit_page_properties),
+          title: Alchemy.t(:edit_page_properties),
           class: 'sitemap_tool'
         ) -%>
-      <%- end -%>
-      <span class="sitemap_sitetools">
-      <%- if can?(:copy, page) -%>
-        <%= link_to(
-          render_icon("copy_page"),
-          alchemy.insert_admin_clipboard_path(
-            remarkable_type: page.class.name.demodulize.underscore.pluralize,
-            remarkable_id: page.id
-          ),
-          remote: true,
-          method: 'post',
-          title: _t(:copy_page),
-          class: 'sitemap_tool'
-        ) %>
-      <%- end -%>
-      <%- if can?(:destroy, page) -%>
-        <%= link_to_confirm_dialog(
-          render_icon('delete_page'),
-          _t(:confirm_to_delete_page),
-          url_for(
-            controller: 'pages',
-            action: 'destroy',
-            id: page.id
-          ),
-          {
-            title: _t(:delete_page),
+        {{/if}}
+        <span class="sitemap_sitetools">
+          {{#if permissions.copy}}
+          <%= link_to(
+            render_icon("copy_page"),
+            alchemy.insert_admin_clipboard_path(
+              remarkable_type: page.class.name.demodulize.underscore.pluralize,
+              remarkable_id: '__ID__',
+            ).gsub('__ID__', '{{id}}'),
+            remote: true,
+            method: 'post',
+            title: Alchemy.t(:copy_page),
             class: 'sitemap_tool'
-          }
-        ) -%>
-      <%- end -%>
-      <%- if can?(:create, Alchemy::Page) -%>
-        <%= link_to_dialog(
-          render_icon('add_page'),
-          alchemy.new_admin_page_path(parent_id: page.id),
-          {
-            title: _t(:create_page),
-            size: '340x165',
-            overflow: true
-          },
-          title: _t(:create_page),
-          class: 'sitemap_tool'
-        ) -%>
+          ) %>
+          {{/if}}
+          {{#if permissions.destroy}}
+          <%= link_to_confirm_dialog(
+            render_icon('delete_page'),
+            Alchemy.t(:confirm_to_delete_page),
+            url_for(
+              controller: 'pages',
+              action: 'destroy',
+              id: '__ID__'
+            ).gsub('__ID__', '{{id}}'),
+            {
+              title: Alchemy.t(:delete_page),
+              class: 'sitemap_tool'
+            }
+          ) -%>
+          {{/if}}
+          {{#if permissions.create}}
+          <%= link_to_dialog(
+            render_icon('add_page'),
+            alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
+            {
+              title: Alchemy.t(:create_page),
+              size: '340x165',
+              overflow: true
+            },
+            title: Alchemy.t(:create_page),
+            class: 'sitemap_tool'
+          ) -%>
+          {{/if}}
+        </span>
       <%- end -%>
-      </span>
-    <%- end -%>
     </div>
     <div class="page_infos" id="page_<%= page.id %>_infos">
-      <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 class="page_status {{#unless public}}not_{{/unless}}public" title="{{status_titles.public}}"></span>
+      <span class="page_status {{#unless visible}}not_{{/unless}}visible" title="{{status_titles.visible}}"></span>
+      <span class="page_status {{#unless restricted}}not_{{/unless}}restricted" title="{{status_titles.restricted}}"></span>
     </div>
     <div class="sitemap_sitename">
-    <%- if page.redirects_to_external? -%>
-      <span class="sitemap_pagename_link inactive"><%= page.name %></span>
-      <span class="redirect_url" title="<%= h page.urlname %>">
-        &raquo; <%= _t('Redirects to') %>:
-        <%= h page.external_urlname %>
+      {{#if redirects_to_external}}
+      <span class="sitemap_pagename_link inactive">{{ name }}</span>
+      <span class="redirect_url" title="{{urlname}}">
+        &raquo; <%= Alchemy.t('Redirects to') %>:
+        {{ external_urlname }}
       </span>
-    <%- else -%>
-      <%= link_to_unless(
-        @sorting,
-        page.name,
-        alchemy.edit_admin_page_path(page),
-        title: _t(:edit_page),
-        class: "sitemap_pagename_link"
-      ) { content_tag('span', page.name, class: "sitemap_pagename_link") } -%>
-    <%- end -%>
+      {{else}}
+        <%= link_to_unless(
+          @sorting,
+          '{{name}}',
+          alchemy.edit_admin_page_path(page),
+          title: Alchemy.t(:edit_page),
+          class: "sitemap_pagename_link"
+        ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
+      {{/if}}
     </div>
   </div>
-  <%- if @sorting || (!page.folded?(current_alchemy_user) && !page.children.empty?) -%>
-  <ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
-    <%= render partial: 'page', collection: page.children %>
+  {{#if children}}
+  <% unless @sorting %>{{#unless folded}}<% end %>
+  <ul id="page_{{id}}_children" class="level_{{level}}_children">
+    {{> list}}
   </ul>
-  <%- end -%>
+  <% unless @sorting %>{{/unless}}<% end %>
+  {{/if}}
 </li>

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

@@ -4,42 +4,42 @@
       <%= render_icon(:page) %>
     </div>
     <div class="sitemap_right_tools">
-      <% unless page_for_links.redirects_to_external? %>
+      {{#unless redirects_to_external}}
         <%= link_to '',
-          alchemy.list_admin_elements_path(page_id: page_for_links.id),
+          alchemy.list_admin_elements_path(page_id: '__ID__').gsub('__ID__', '{{id}}'),
           remote: true,
           data: {
-            'page-id' => page_for_links.id,
-            url: @url_prefix + page_for_links.urlname
+            'page-id' => '{{id}}',
+            url: @url_prefix + '{{urlname}}'
           },
           class: "show_elements_to_link",
-          title: _t(:show_elements_from_page)
+          title: Alchemy.t(:show_elements_from_page)
         %>
-      <% end %>
+      {{/unless}}
     </div>
     <div class="page_infos">
-      <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>
+      <span class="page_status {{#unless public}}not_{{/unless}}public" title="{{status_titles.public}}"></span>
+      <span class="page_status {{#unless visible}}not_{{/unless}}visible" title="{{status_titles.visible}}"></span>
+      <span class="page_status {{#unless restricted}}not_{{/unless}}restricted" title="{{status_titles.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? %>
-        <span class="sitemap_pagename_link inactive"><%= page_for_links.name %></span>
-      <% else %>
-        <%= link_to(page_for_links.name, '', {
+    <div class="sitemap_sitename" id="sitemap_sitename_{{id}}" name="/<%= "#{Alchemy::Language.current.code}/" if multi_language? %>{{urlname}}">
+      {{#if redirects_to_external}}
+        <span class="sitemap_pagename_link inactive">{{ name }}</span>
+      {{else}}
+        <%= link_to('{{ name }}', '', {
           data: {
-            'page-id' => page_for_links.id,
-            url: @url_prefix + page_for_links.urlname
+            'page-id' => '{{id}}',
+            url: @url_prefix + '{{urlname}}'
           },
-          title: _t('page_for_links.choose_page', name: page_for_links.name),
+          title: Alchemy.t('page_for_links.choose_page', name: '{{name}}'),
           class: "sitemap_pagename_link"
         }) %>
-      <% end %>
+      {{/if}}
     </div>
   </div>
-  <% if page_for_links.children.present? %>
-    <ul id="page_<%= page_for_links.id %>_children">
-      <%= render partial: 'page_for_links', collection: page_for_links.children, locals: {area_name: @area_name} %>
+  {{#if children}}
+    <ul id="page_{{id}}_children">
+      {{> list}}
     </ul>
-  <% end %>
+  {{/if}}
 </li>

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

@@ -0,0 +1,12 @@
+<%= content_tag 'span', '', class: [
+  'page_status',
+  page.public? ? 'public' : 'not_public'
+], title: page.status_title(:public) %>
+<%= content_tag 'span', '', class: [
+  'page_status',
+  page.visible? ? 'visible' : 'not_visible'
+], title: page.status_title(:visible) %>
+<%= content_tag 'span', '', class: [
+  'page_status',
+  page.restricted? ? 'restricted' : 'not_restricted'
+], title: page.status_title(:restricted) %>

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

@@ -1,14 +1,12 @@
-<div class="page_status_and_name" id="page_<%= @page.id %>_status">
-  <% if @page.layout_description.blank? %>
-    <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+<div class="page_status_and_name" id="page_<%= page.id %>_status">
+  <% if page.definition.blank? %>
+    <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
   <% end %>
-  <span class="page_name"><%= @page.name %></span>
+  <span class="page_name"><%= page.name %></span>
   <%- if multi_language? -%>
-    <span class="page_language" title="<%= @page.language.name %>">
-      <%= @page.language_code %>
+    <span class="page_language" title="<%= page.language.name %>">
+      <%= page.language_code %>
     </span>
   <%- end -%>
-  <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>
+  <%= render 'alchemy/admin/pages/page_infos', page: page %>
 </div>

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

@@ -1,8 +1,37 @@
-<ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
-  <%= render :partial => 'page', :object => @page_root %>
-</ul>
+<div id="sitemap-wrapper">
+  <p class="loading"></p>
+</div>
+
+<script id="sitemap-template" type="text/x-handlebars-template">
+  <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
+    {{> list}}
+  </ul>
+</script>
+
+<script id="sitemap-list" type="text/x-handlebars-template">
+  {{#each children}}
+  <%= render partial: page_partial, object: @page_root %>
+  {{/each}}
+</script>
+
 <script type="text/javascript">
-  $(function() {
-    Alchemy.Sitemap.init();
-  });
+ $(function() {
+   Alchemy.Sitemap.init({
+     url: '<%= alchemy.tree_admin_pages_path %>',
+     page_root_id: <%= @page_root.id %>,
+     full: <%= full %>
+     <% if @sorting  %>
+     ,ready: function () {
+       Alchemy.PageSorter.init();
+     }
+     <% elsif action_name == 'link' %>
+     ,spinner: Alchemy.Spinner.small(),
+     ready: function () {
+       if (Alchemy.currentDialog()) {
+         Alchemy.currentDialog().attachTreeEvents();
+       }
+     }
+     <% end %>
+   });
+ });
 </script>