alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

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

@@ -1,26 +1,14 @@
-<% content_for(:subnav_additions) do %>
-  <% unless @locked_pages.blank? %>
+<% if @locked_pages.present? %>
+  <% content_for(:subnav_additions) do %>
     <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 %>
-      <span class="page_name" title="<%= page.name %>">
-        <%= truncate page.name, length: 15 %>
-      </span>
-      <% end %>
-      <%= form_tag(alchemy.unlock_admin_page_path(page), remote: true) do %>
-        <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
-          <%= render_icon('close small') %>
-        </button>
-      <% end %>
-    </div>
-    <% end %>
+    <%= 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' %>
+  <div class="toolbar_spacer"></div>
   <%= toolbar_button(
     icon: 'add_page',
     url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),

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

@@ -0,0 +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) %>
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/_label.html.erb

@@ -0,0 +1 @@
+(<%= count %>) <%= Alchemy::LegacyPageUrl.model_name.human(count: count) %>

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

@@ -0,0 +1,13 @@
+<tr class="even" id="<%= dom_id(legacy_page_url) %>">
+  <td class="name"><%= legacy_page_url.urlname %></td>
+  <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)} %>
+    <%= link_to_confirm_dialog render_icon(:destroy),
+      _t('Are you sure?'),
+      admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
+      {title: _t(:remove)} %>
+  </td>
+</tr>

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

@@ -0,0 +1,20 @@
+<%= alchemy_form_for [:admin, @legacy_page_url ||= @page.legacy_urls.build],
+  id: 'new_legacy_page_url' do |f| %>
+  <% if @legacy_page_url.errors.any? %>
+    <%= render_message :error do %>
+      <%= @legacy_page_url.errors.full_messages.join %>
+    <% end %>
+  <% end %>
+  <%= hidden_field_tag :page_id, @page.id %>
+  <div class="inline-input">
+    <div class="left-column">
+      <%= f.text_field :urlname, placeholder: Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
+    </div>
+    <div class="right-column">
+      <button class="with_icon">
+        <%= render_icon(:create) %>
+        <%= _t(:add) %>
+      </button>
+    </div>
+  </div>
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/create.js.erb

@@ -0,0 +1,10 @@
+<% if @legacy_page_url.valid? %>
+  $('.error.message', '#new_legacy_page_url').remove();
+  $('#legacy_urls_label').text('<%=j render("label", count: @page.legacy_urls.size) %>');
+  $('#legacy_page_url_urlname').val('');
+  $('#no_page_links_notice').hide();
+  $('#legacy_page_urls').append('<%=j render "legacy_page_url", legacy_page_url: @legacy_page_url %>');
+  Alchemy.watchForDialogs('#<%= dom_id(@legacy_page_url) %>');
+<% else %>
+  $('#new_legacy_page_url').replaceWith('<%=j render("new") %>');
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/destroy.js.erb

@@ -0,0 +1,6 @@
+$('#legacy_urls_label').text('<%=j render("label", count: @page.legacy_urls.size) %>');
+$('#<%= dom_id(@legacy_page_url) %>').remove();
+Alchemy.pleaseWaitOverlay(false);
+<% if @page.legacy_urls.size == 0 %>
+$('#no_page_links_notice').show();
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/update.js.erb

@@ -0,0 +1,2 @@
+Alchemy.closeCurrentDialog();
+$('td.name', '#<%= dom_id(@legacy_page_url) %>').text('<%= @legacy_page_url.urlname %>');

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

@@ -0,0 +1,58 @@
+<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <div class="input check_boxes">
+    <label class="control-label"><%= _t(:page_status) %></label>
+    <div class="control_group">
+      <label class="checkbox">
+        <%= f.check_box :public %>
+        <%= f.object.class.human_attribute_name :public %>
+      </label>
+      <label class="checkbox">
+        <%= f.check_box :visible %>
+        <%= f.object.class.human_attribute_name :visible %>
+      </label>
+      <label class="checkbox">
+        <%= f.check_box :restricted %>
+        <%= f.object.class.human_attribute_name :restricted %>
+      </label>
+    <% if configuration(:sitemap)['show_flag'] %>
+      <label class="checkbox">
+        <%= f.check_box :sitemap %>
+        <%= f.object.class.human_attribute_name :sitemap %>
+      </label>
+    <% end %>
+    </div>
+  </div>
+  <h2><%= _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>
+  <div class="input check_boxes">
+    <label class="control-label"><%= _t(:search_engines) %></label>
+    <div class="control_group">
+      <label class="checkbox">
+        <%= f.check_box :robot_index %>
+        <%= f.object.class.human_attribute_name :robot_index %>
+      </label>
+      <label class="checkbox">
+        <%= f.check_box :robot_follow %>
+        <%= f.object.class.human_attribute_name :robot_follow %>
+      </label>
+    </div>
+  </div>
+  <%= f.input :meta_description,
+    as: 'text',
+    input_html: {'data-alchemy-char-counter' => 160} %>
+  <%= f.input :meta_keywords,
+    as: 'text',
+    hint: _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) %>
+<% end %>

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

@@ -1,6 +1,8 @@
 <%= 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>
   <% end %>
   <div id="page_selector_container">
     <% if @page_root %>
@@ -9,11 +11,13 @@
     </ul>
     <% end %>
   </div>
-  <div class="input text">
-    <label for="internal_urlname" class="control-label">
-      <%= _t(:url) %>
+  <div class="input select">
+    <label for="internal_anchor" class="control-label">
+      <%= _t(:anchor) %>
     </label>
-    <%= text_field_tag(:internal_urlname) %>
+    <%= select_tag(:internal_anchor,
+      options_for_select([[_t('Please choose'), '']]),
+      class: 'alchemy_selectbox') %>
   </div>
   <div class="input text">
     <label for="internal_link_title" class="control-label">
@@ -30,6 +34,7 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <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' %>
   </div>

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

@@ -0,0 +1,23 @@
+<%= render_message do %>
+  <p><%== _t(:legacy_url_info_text) %></p>
+<% end %>
+
+<table class="list" id="legacy_page_urls">
+  <tr>
+    <th class="name">
+      <%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
+    </th>
+    <th class="tools"></th>
+  </tr>
+  <%= 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 class="tools"></td>
+  </tr>
+</table>
+
+<fieldset>
+  <legend><%= _t('Add page link') %></legend>
+  <%= render 'alchemy/admin/legacy_page_urls/new' %>
+</fieldset>

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

@@ -0,0 +1,21 @@
+<% if @page == locked_page %>
+  <%= render 'page_status' %>
+<% else %>
+  <div class="subnavi_tab wide" id="locked_page_<%= locked_page.id %>">
+    <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
+      <span class="page_name" title="<%= locked_page.name %>">
+        <%= truncate locked_page.name, length: 15 %>
+      </span>
+      <%- if multi_language? -%>
+        <span class="page_language" title="<%= locked_page.language.name %>">
+          <%= locked_page.language_code %>
+        </span>
+      <%- end -%>
+    <% end %>
+    <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
+      <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
+        <%= render_icon('close small') %>
+      </button>
+    <% end %>
+  </div>
+<% end %>

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

@@ -26,7 +26,7 @@
           alchemy.configure_admin_page_path(page),
           {
             title: _t(:edit_page_properties),
-            size: page.redirects_to_external? ? '410x330' : '410x660'
+            size: page.redirects_to_external? ? '450x330' : '450x720'
           },
           title: _t(:edit_page_properties),
           class: 'sitemap_tool'
@@ -87,7 +87,7 @@
       <span class="sitemap_pagename_link inactive"><%= page.name %></span>
       <span class="redirect_url" title="<%= h page.urlname %>">
         &raquo; <%= _t('Redirects to') %>:
-        <%= h page.urlname %>
+        <%= h page.external_urlname %>
       </span>
     <%- else -%>
       <%= link_to_unless(

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

@@ -1,9 +1,11 @@
-<span class="page_status_and_name" id="page_<%= @page.id %>_status">
-    <span class="page_name"><%= @page.name %></span>
-    <%- if multi_language? -%>
-    <span class="page_language"><%= @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>
-</span>
+<div class="page_status_and_name" id="page_<%= @page.id %>_status">
+  <span class="page_name"><%= @page.name %></span>
+  <%- if multi_language? -%>
+    <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>
+</div>

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

@@ -0,0 +1,13 @@
+<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'] %>"] = {
+    <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
+    <%= k %>: <%== v.to_json %>,
+    <% end %>
+  };
+  <% end %>
+</script>

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

@@ -1,57 +1,16 @@
-<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
-  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
-  <% unless @page.layoutpage %>
-    <div class="input check_boxes">
-      <label class="control-label"><%= _t(:page_status) %></label>
-      <div class="control_group">
-        <label class="checkbox">
-          <%= f.check_box :public %>
-          <%= f.object.class.human_attribute_name :public %>
-        </label>
-        <label class="checkbox">
-          <%= f.check_box :visible %>
-          <%= f.object.class.human_attribute_name :visible %>
-        </label>
-        <label class="checkbox">
-          <%= f.check_box :restricted %>
-          <%= f.object.class.human_attribute_name :restricted %>
-        </label>
-      <% if configuration(:sitemap)['show_flag'] %>
-        <label class="checkbox">
-          <%= f.check_box :sitemap %>
-          <%= f.object.class.human_attribute_name :sitemap %>
-        </label>
-      <% end %>
-      </div>
-    </div>
-    <h2><%= _t(:names) %></h2>
-  <% end %>
-  <%= f.input :name, autofocus: true %>
-  <% unless @page.layoutpage %>
-    <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
-    <%= f.input :title %>
-    <h2><%= _t(:meta_data) %></h2>
-    <div class="input check_boxes">
-      <label class="control-label"><%= _t(:search_engines) %></label>
-      <div class="control_group">
-        <label class="checkbox">
-          <%= f.check_box :robot_index %>
-          <%= f.object.class.human_attribute_name :robot_index %>
-        </label>
-        <label class="checkbox">
-          <%= f.check_box :robot_follow %>
-          <%= f.object.class.human_attribute_name :robot_follow %>
-        </label>
-      </div>
-    </div>
-    <%= f.input :meta_description, as: 'text' %>
-    <%= f.input :meta_keywords, as: 'text', hint: _t('pages.update.comma_seperated') %>
-  <% end %>
-  <% 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) %>
-<% end %>
+<div id="overlay_tabs">
+  <ul>
+    <li><a href="#page_properties"><%= _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 %>
+      </a>
+    </li>
+  </ul>
+  <div id="page_properties">
+    <%= render 'form' %>
+  </div>
+  <div id="legacy_urls">
+    <%= render 'legacy_urls' %>
+  </div>
+</div>

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

@@ -2,24 +2,7 @@
 
 <% content_for(:subnav_additions) do %>
   <label><%= _t('Active Pages') %> &raquo;</label>
-  <% @locked_pages.each do |page| %>
-  <% if @page == page %>
-  <%= render partial: 'page_status' %>
-  <% else %>
-  <div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
-    <%= link_to alchemy.edit_admin_page_path(page) do %>
-    <span class="page_name" title="<%= page.name %>">
-      <%= truncate page.name, length: 15 %>
-    </span>
-    <% end %>
-    <%= form_tag(alchemy.unlock_admin_page_path(page), remote: true) do %>
-      <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
-        <%= render_icon('close small') %>
-      </button>
-    <% end %>
-  </div>
-  <% end %>
-  <% end %>
+  <%= render partial: 'locked_page', collection: @locked_pages %>
 <% end %>
 
 <% content_for(:toolbar) do %>
@@ -32,6 +15,7 @@
       <label><%= _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 %>
@@ -59,17 +43,31 @@
     <label><%= _t(:page_infos) %></label>
   </div>
   <div class="button_with_label">
-    <%= link_to_dialog(
-      render_icon('settings'),
-      alchemy.configure_admin_page_path(@page),
-      {
+    <% if @page.layoutpage? %>
+      <%= link_to_dialog(
+        render_icon('settings'),
+        alchemy.edit_admin_layoutpage_path(@page),
+        {
+          title: _t(:edit_page_properties),
+          size: '450x170'
+        },
+        class: :icon_button,
         title: _t(:edit_page_properties),
-        size: @page.layoutpage? ? '410x150' : '410x660'
-      },
-      class: :icon_button,
-      title: _t(:edit_page_properties),
-      'data-alchemy-hotkey' => 'alt+e'
-    ) %>
+        'data-alchemy-hotkey' => 'alt+e'
+      ) %>
+    <% else %>
+      <%= link_to_dialog(
+        render_icon('settings'),
+        alchemy.configure_admin_page_path(@page),
+        {
+          title: _t(:edit_page_properties),
+          size: '450x720'
+        },
+        class: :icon_button,
+        title: _t(:edit_page_properties),
+        'data-alchemy-hotkey' => 'alt+e'
+      ) %>
+    <% end %>
     <label><%= _t(:page_properties) %></label>
   </div>
   <% if configuration(:cache_pages) && !@page.layoutpage? %>
@@ -83,10 +81,13 @@
   </div>
   <% end %>
   <div class="toolbar_spacer"></div>
-  <div class="button_with_label">
-    <%= select_tag('preview_size', preview_sizes_for_select, class: 'alchemy_selectbox medium') %>
+  <div class="select_with_label">
     <label><%= _t(:preview_size) %></label>
+    <%= select_tag 'preview_size',
+      preview_sizes_for_select,
+      class: 'alchemy_selectbox medium' %>
   </div>
+  <div class="toolbar_spacer"></div>
   <div class="button_with_label">
     <%= link_to render_icon(:reload), '#', {
       title: _t('Reload Preview'),
@@ -97,6 +98,35 @@
   </div>
 </div>
 <div class="toolbar_buttons right">
+  <% if can?(:create, Alchemy::Element) %>
+  <div class="button_with_label" id="clipboard_button">
+    <%= link_to_dialog(
+      render_icon("clipboard#{clipboard_empty?('elements') ? '' : ' full'}"),
+      alchemy.admin_clipboard_path(remarkable_type: "elements"),
+      {
+        title: _t('Clipboard'),
+        size: '380x305'
+      },
+      {
+        title: _t('Show clipboard'),
+        class: 'icon_button'
+      }
+    ) %>
+    <label><%= _t('Show clipboard') %></label>
+  </div>
+  <% end %>
+  <div class="button_with_label" id="element_trash_button">
+    <%= link_to(
+      render_icon("trash#{trash_empty?('elements') ? '' : ' full'}"),
+      '',
+      {
+        title: _t('Show trash'),
+        onclick: "Alchemy.TrashWindow.open(#{@page.id}, '#{_t('Trash')}'); return false",
+        class: 'icon_button'
+      }
+    ) %>
+    <label><%= _t('Show trash') %></label>
+  </div>
   <div class="button_with_label" id="element_window_button">
     <%= link_to render_icon(:element_window), '', {
       title: _t('Hide Elements'),
@@ -108,6 +138,9 @@
 <% end %>
 
 <% content_for :javascripts do %>
+<% if Alchemy::Tinymce.custom_config_contents(@page).any? %>
+  <%= render 'tinymce_custom_config' %>
+<% end %>
 <script type="text/javascript" charset="utf-8">
 
   $(function() {
@@ -127,42 +160,7 @@
         cancel_label: '<%= _t("No") %>',
         hideElements: '<%= _t("Hide Elements") %>',
         showElements: '<%= _t("Show Elements") %>'
-      },
-      toolbarButtons: [
-        {
-          title: '<%= _t("New Element") %>',
-          label: '<%= _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") %>',
-              size: '320x125'
-            });
-          }
-        },
-        {
-          title: '<%= _t("Clipboard") %>',
-          label: '<%= _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: '<%= _t("Show trash") %>',
-          label: '<%= _t("Show trash") %>',
-          iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
-          buttonId: 'element_trash_button',
-          onClick: function() {
-            Alchemy.TrashWindow.open(<%= @page.id %>, '<%= _t("Trash") %>');
-          }
-        }
-      ]
+      }
     }, function() {
       Alchemy.ImageLoader('#element_area');
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');