alchemy_cms 5.3.8 → 6.0.0.b1

data/app/views/alchemy/admin/elements/order.js.erb

@@ -6,23 +6,6 @@
     '<%= sanitize(@parent_element.preview_text.presence || '&nbsp;') %>'
   );
 <% end %>
-
-<% if @trashed_element_ids.any? %>
-
-  $('#element_area .ajax-folder').show();
-  <% element_ids = @trashed_element_ids.collect do |id|
-                     "#element_area [data-element-id=\"#{id}\"]"
-                   end.join(", ").html_safe %>
-  <% @trashed_element_ids.each do |id| %>
-  $('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
-  <% end %>
-  Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
-
-<% else %>
-
   Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
-
-<% end %>
-
   Alchemy.PreviewWindow.refresh();
 })();

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

@@ -1,7 +1,7 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
   var $errors = $('#element_<%= @element.id %>_errors');
-  $('> .element-content .content_editor', $el).removeClass('validation_failed');
+  $('> .element-content .content_editor, > .element-content .ingredient_editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
@@ -15,9 +15,10 @@
 <%- else -%>
 
   Alchemy.growl('<%= j @notice %>', 'warn');
-  $errors.html('<%= j @error_message %><ul><li><%== j @element.essence_error_messages.join("</li><li>") %></li></ul>');
+  $errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
   $errors.show();
   $('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
+  $('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
   Alchemy.Buttons.enable($el);
 
 <%- end -%>

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

@@ -0,0 +1,7 @@
+<%= alchemy_form_for [:admin, @essence_audio] do |f| %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

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

@@ -1,5 +1,4 @@
 (function($) {
-  Alchemy.ImageCropper.destroy();
   Alchemy.closeCurrentDialog();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>

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

@@ -0,0 +1,11 @@
+<%= alchemy_form_for [:admin, @essence_video] do |f| %>
+  <%= f.input :width %>
+  <%= f.input :height %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
+  <%= f.input :preload, collection: %w(auto none metadata),
+    include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb

@@ -0,0 +1,4 @@
+<%= f.input :autoplay, as: :boolean %>
+<%= f.input :controls, as: :boolean %>
+<%= f.input :loop, as: :boolean %>
+<%= f.input :muted, as: :boolean %>

data/app/views/alchemy/admin/ingredients/_file_fields.html.erb

@@ -0,0 +1,18 @@
+<% css_classes = ingredient.settings[:css_classes] %>
+
+<%= f.input :link_text %>
+<%= f.input :title %>
+<%- if css_classes.present? -%>
+  <%= f.input :css_class,
+    collection: css_classes,
+    include_blank: Alchemy.t('None'),
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- else -%>
+  <%= f.input :css_class,
+    label: Alchemy.t(:position_in_text),
+    collection: [
+      [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 -%>

data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb

@@ -0,0 +1,25 @@
+<%= f.input :caption, as: ingredient.settings[:caption_as_textarea] ? 'text' : 'string' %>
+<%= f.input :title %>
+<%= f.input :alt_tag %>
+<%- if ingredient.settings[:sizes].present? && ingredient.settings[:srcset].blank? -%>
+  <%= f.input :render_size,
+    collection: [
+      [Alchemy.t('Layout default'), ""]
+    ] + ingredient.settings[:sizes].to_a,
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- end -%>
+<%- if ingredient.settings[:css_classes].present? -%>
+  <%= f.input :css_class,
+    collection: ingredient.settings[:css_classes],
+    include_blank: Alchemy.t('None'),
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- else -%>
+  <%= f.input :css_class,
+    label: Alchemy.t(:position_in_text),
+    collection: [
+      [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 -%>

data/app/views/alchemy/admin/ingredients/_video_fields.html.erb

@@ -0,0 +1,8 @@
+<%= f.input :width %>
+<%= f.input :height %>
+<%= f.input :autoplay, as: :boolean %>
+<%= f.input :controls, as: :boolean %>
+<%= f.input :loop, as: :boolean %>
+<%= f.input :muted, as: :boolean %>
+<%= f.input :preload, collection: %w(auto none metadata),
+  include_blank: false, input_html: {class: 'alchemy_selectbox'} %>

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

@@ -0,0 +1,4 @@
+<%= alchemy_form_for @ingredient, as: :ingredient, url: alchemy.admin_ingredient_path(@ingredient) do |f| %>
+  <%= render "alchemy/admin/ingredients/#{@ingredient.partial_name}_fields", ingredient: @ingredient, f: f %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

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

@@ -1,9 +1,4 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
-  <%= f.input :page_layout,
-    collection: @page_layouts,
-    label: page_layout_label(@page),
-    include_blank: Alchemy.t('Please choose'),
-    input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>
   <div class="input string">
     <%= f.label :tag_list %>

data/app/views/alchemy/admin/nodes/_node.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded? } do %>
+<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded?, type: "node" } do %>
   <%= content_tag :div, class: [
     'sitemap_node',
     node.external? ? 'external' : 'internal',
@@ -67,7 +67,7 @@
       <% end %>
     </div>
   <% end %>
-  <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { node_id: node.id } do %>
+  <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { record_id: node.id } do %>
     <%= render partial: 'node', collection: node.children.includes(:page, :children) %>
   <% end %>
 <% end %>

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

@@ -17,6 +17,6 @@
     <%= text_field_tag "anchor_link_title", '', class: 'link_title' %>
   </div>
   <div class="submit">
-    <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'anchor' %>
+    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'anchor' } %>
   </div>
 <% end %>

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

@@ -26,6 +26,6 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'external' %>
+    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'external' } %>
   </div>
 <% end %>

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

@@ -26,6 +26,6 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'file' %>
+    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'file' } %>
   </div>
 <% end %>

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

@@ -1,14 +1,4 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
-  <% unless @page.language_root? || @page.layoutpage %>
-    <%= f.input :parent_id, required: true, input_html: { class: 'alchemy_selectbox' } %>
-  <% end %>
-
-  <%= f.input :page_layout,
-    collection: @page_layouts,
-    label: page_layout_label(@page),
-    include_blank: Alchemy.t('Please choose'),
-    input_html: {class: 'alchemy_selectbox'} %>
-
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
@@ -47,18 +37,3 @@
 
   <%= f.submit Alchemy.t(:save) %>
 <% end %>
-
-<script>
-  $('#page_parent_id').alchemyPageSelect({
-    placeholder: "<%= Alchemy.t(:search_page) %>",
-    url: "<%= alchemy.api_pages_path %>",
-    allowClear: false,
-    <% if @page.parent %>
-    initialSelection: {
-      id: <%= @page.parent.id %>,
-      text: "<%= @page.parent.name %>",
-      url_path: "<%= @page.parent.url_path %>"
-    }
-    <% end %>
-  })
-</script>

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

@@ -30,6 +30,6 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
+    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'internal' } %>
   </div>
 <% end %>

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

@@ -3,7 +3,11 @@
     <%= f.hidden_field(:parent_id) %>
   <% else %>
     <% @page.parent = @current_language.root_page %>
-    <%= f.input :parent_id, as: :string, input_html: { class: 'alchemy_selectbox' } %>
+    <%= f.input :parent_id,
+      collection: @current_language.pages.contentpages,
+      label_method: :name,
+      value_method: :id,
+      input_html: { class: "alchemy_selectbox" } %>
   <% end %>
   <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
@@ -17,18 +21,3 @@
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:create) %>
 <% end %>
-
-<script>
-  $('input[type="text"]#page_parent_id').alchemyPageSelect({
-    placeholder: "<%= Alchemy.t(:search_page) %>",
-    url: "<%= alchemy.api_pages_path %>",
-    allowClear: false,
-    <% if @page.parent %>
-    initialSelection: {
-      id: <%= @page.parent.id %>,
-      text: "<%= @page.parent.name %>",
-      url_path: "<%= @page.parent.url_path %>"
-    }
-    <% end %>
-  })
-</script>

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

@@ -1,7 +1,24 @@
-<li id="page_{{id}}" class="sitemap-item {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-page-id="{{id}}" data-folded="{{folded}}">
+<li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}">
   <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
-    <div class="sitemap_left_images">
-      <span class="page_folder"></span>
+    <div class="sitemap_left_images<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>">
+      <% unless @sorting %>
+        {{#unless root_or_leaf}}
+        <%= link_to(
+          alchemy.fold_admin_page_path(page),
+          remote: true,
+          method: :post,
+          class: "page_folder",
+          title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
+          id: "fold_button_{{id}}"
+        ) do %>
+          {{#if folded}}
+            <i class="far fa-plus-square fa-fw"></i>
+          {{else}}
+            <i class="far fa-minus-square fa-fw"></i>
+          {{/if}}
+        <% end %>
+        {{/unless}}
+      <% end %>
       {{#if definition_missing}}
         <%= page_layout_missing_warning %>
       {{else}}
@@ -14,121 +31,121 @@
               </span>
             </span>
           {{else}}
-          <span class="{{#unless root}}handle{{/unless}}">
             <i class="icon far fa-file fa-lg"></i>
-          </span>
           {{/if}}
         {{else}}
           <span class="with-hint">
             <i class="icon fas fa-ban fa-fw"></i>
             <span class="hint-bubble">
-              <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+              <%= Alchemy.t('Your user role does not allow you to edit this page') %>
             </span>
           </span>
         {{/if}}
       {{/if}}
     </div>
     <div class="sitemap_right_tools">
-      {{#if permissions.info}}
-      <div class="button_with_label sitemap_tool">
-        <%= link_to_dialog(
-          render_icon("info-circle"),
-          alchemy.info_admin_page_path(id: "__ID__"),
-          {
-            title: Alchemy.t(:page_infos),
-            size: "520x290"
-          }
-        ) %>
-        <label class="center"><%= Alchemy.t(:page_infos) %></label>
-      {{else}}
-      <div class="sitemap_tool disabled with-hint">
-        <%= render_icon("info-circle") %>
-        <span class="hint-bubble">
-          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
-        </span>
-      {{/if}}
-      </div>
-      {{#if permissions.configure}}
-      <div class="button_with_label sitemap_tool">
-        <%= link_to_dialog(
-          render_icon(:cog),
-          alchemy.configure_admin_page_path(id: "__ID__"),
-          {
-            title: Alchemy.t(:edit_page_properties),
-            size: "450x680"
-          }
-        ) -%>
-        <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
-      {{else}}
-      <div class="sitemap_tool disabled with-hint">
-        <%= render_icon(:cog) %>
-        <span class="hint-bubble">
-          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
-        </span>
-      {{/if}}
-      </div>
-      {{#if permissions.copy}}
-      <div class="button_with_label sitemap_tool">
-        <%= link_to(
-          render_icon(:copy),
-          alchemy.insert_admin_clipboard_path(
-            remarkable_type: :pages,
-            remarkable_id: "__ID__",
-          ),
-          remote: true,
-          method: :post
-        ) %>
-        <label class="center"><%= Alchemy.t(:copy_page) %></label>
-      {{else}}
-      <div class="sitemap_tool disabled with-hint">
-        <%= render_icon(:copy) %>
-        <span class="hint-bubble">
-          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
-        </span>
-      {{/if}}
-      </div>
-      {{#if permissions.destroy}}
-      <div class="button_with_label sitemap_tool">
-        <%= link_to_confirm_dialog(
-          render_icon(:minus),
-          Alchemy.t(:confirm_to_delete_page),
-          url_for(
-            controller: "pages",
-            action: "destroy",
-            id: "__ID__"
-          )
-        ) -%>
-        <label class="center"><%= Alchemy.t(:delete_page) %></label>
-      {{else}}
-      <div class="sitemap_tool disabled with-hint">
-        <%= render_icon(:minus) %>
-        <span class="hint-bubble">
-          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
-        </span>
-      {{/if}}
-      </div>
-      {{#if permissions.create}}
-      <div class="button_with_label sitemap_tool">
-        <%= link_to_dialog(
-          render_icon(:plus),
-          alchemy.new_admin_page_path(parent_id: "__ID__"),
-          {
-            title: Alchemy.t(:create_page),
-            size: "340x165",
-            overflow: true
-          }
-        ) -%>
-        <label class="left"><%= Alchemy.t(:create_page) %></label>
-      {{else}}
-      <div class="sitemap_tool disabled with-hint">
-        <%= render_icon(:plus) %>
-        <span class="hint-bubble">
-          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
-        </span>
-      {{/if}}
-      </div>
+      <%- unless @sorting -%>
+        {{#if permissions.info}}
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_dialog(
+            render_icon('info-circle'),
+            alchemy.info_admin_page_path(page),
+            {
+              title: Alchemy.t(:page_infos),
+              size: '520x290'
+            }
+          ) %>
+          <label class="center"><%= Alchemy.t(:page_infos) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon('info-circle') %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.configure}}
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_dialog(
+            render_icon(:cog),
+            alchemy.configure_admin_page_path(page),
+            {
+              title: Alchemy.t(:edit_page_properties),
+              size: '450x680'
+            }
+          ) -%>
+          <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:cog) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.copy}}
+        <div class="button_with_label sitemap_tool">
+          <%= link_to(
+            render_icon(:copy),
+            alchemy.insert_admin_clipboard_path(
+              remarkable_type: page.class.name.demodulize.underscore.pluralize,
+              remarkable_id: '__ID__',
+            ).gsub('__ID__', '{{id}}'),
+            remote: true,
+            method: 'post'
+          ) %>
+          <label class="center"><%= Alchemy.t(:copy_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:copy) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.destroy}}
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_confirm_dialog(
+            render_icon(:minus),
+            Alchemy.t(:confirm_to_delete_page),
+            url_for(
+              controller: 'pages',
+              action: 'destroy',
+              id: '__ID__'
+            ).gsub('__ID__', '{{id}}')
+          ) -%>
+          <label class="center"><%= Alchemy.t(:delete_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:minus) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+        {{#if permissions.create}}
+        <div class="button_with_label sitemap_tool">
+          <%= link_to_dialog(
+            render_icon(:plus),
+            alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
+            {
+              title: Alchemy.t(:create_page),
+              size: '340x165',
+              overflow: true
+            }
+          ) -%>
+          <label class="left"><%= Alchemy.t(:create_page) %></label>
+        {{else}}
+        <div class="sitemap_tool disabled with-hint">
+          <%= render_icon(:plus) %>
+          <span class="hint-bubble">
+            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+          </span>
+        {{/if}}
+        </div>
+      <%- end -%>
     </div>
-    <div class="page_infos">
+    <div class="page_infos" id="page_<%= page.id %>_infos">
       <span class="page_status with-hint">
         <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.public}}</span>
@@ -143,18 +160,23 @@
     </div>
     <div class="sitemap_sitename">
       {{#if permissions.edit_content}}
-        <%= link_to(
-          "{{name}}",
-          alchemy.edit_admin_page_path(id: "__ID__"),
+        <%= 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") } -%>
       {{else}}
-        <%= content_tag("span", "{{name}}", class: "sitemap_pagename_link") %>
+        <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
       {{/if}}
     </div>
   </div>
-  <ul id="page_{{id}}_children" class="children" data-parent-id="{{id}}">
+  {{#if children}}
+  <% unless @sorting %>{{#unless folded}}<% end %>
+  <ul id="page_{{id}}_children" class="level_{{level}}_children">
     {{> list}}
   </ul>
+  <% unless @sorting %>{{/unless}}<% end %>
+  {{/if}}
 </li>

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

@@ -1,14 +1,15 @@
-<h4 id="sitemap_heading">
-  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
-  <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
-  <span class="page_status"><%= Alchemy.t(:page_status) %></span>
-</h4>
-
 <div id="sitemap-wrapper">
+  <h4 id="sitemap_heading">
+    <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+    <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
+    <span class="page_status"><%= Alchemy.t(:page_status) %></span>
+  </h4>
+
+  <p class="loading"></p>
 </div>
 
 <script id="sitemap-template" type="text/x-handlebars-template">
-  <ul id="sitemap" class="list">
+  <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
     {{> list}}
   </ul>
 </script>
@@ -21,10 +22,15 @@
 
 <script type="text/javascript">
  $(function() {
-   Alchemy.currentSitemap = new Alchemy.Sitemap({
+   Alchemy.Sitemap.init({
      url: '<%= alchemy.tree_admin_pages_path %>',
-     page_root_id: <%= @page_root.id %>
+     page_root_id: <%= @page_root.id %>,
+     full: <%= full %>
+     <% if @sorting  %>
+     ,ready: function () {
+       Alchemy.PageSorter();
+     }
+     <% end %>
    });
-   Alchemy.PagePublicationFields();
  });
 </script>

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

@@ -1,7 +1,10 @@
 <script>
   // Populate custom tinymce configurations
-  <% Alchemy::Tinymce.custom_config_contents(@page).each do |content| %>
-  Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] %>"] = {
+  <% (
+    Alchemy::Tinymce.custom_config_contents(@page) +
+    Alchemy::Tinymce.custom_config_ingredients(@page)
+  ).each do |content| %>
+  Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] || content['role'] %>"] = {
     <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
     <%= k %>: <%== v.to_json %>,
     <% end %>

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

@@ -28,6 +28,18 @@
       <label><%= Alchemy.t("Flush page cache") %></label>
     </div>
   <% end %>
+  <% if can?(:sort, Alchemy::Page) %>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon(:random),
+        alchemy.sort_admin_pages_path,
+        method: :get,
+        class: "icon_button",
+        title: Alchemy.t("Sort pages")
+      ) %>
+      <label><%= Alchemy.t("Sort pages") %></label>
+    </div>
+  <% end %>
   <div class="button_with_label" id="clipboard_button">
     <%= link_to_dialog(
       render_icon(clipboard_empty?("pages") ? :clipboard : :paste),