alchemy_cms 5.3.1 → 6.0.0.b1

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),

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

@@ -56,23 +56,44 @@
     <% end %>
     <label><%= Alchemy.t(:page_properties) %></label>
   </div>
-  <% if can?(:publish, @page) %>
-    <div class="button_with_label">
-      <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
-        <%= button_tag class: 'icon_button', title: Alchemy.t(:explain_publishing) do %>
-          <%= render_icon('cloud-upload-alt') %>
-        <% end %>
-        <label><%= Alchemy.t("Publish page") %></label>
+  <div class="button_with_label">
+    <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
+      <%= button_tag class: 'icon_button', disabled: cannot?(:publish, @page) do %>
+        <%= render_icon('cloud-upload-alt') %>
       <% end %>
-    </div>
-  <% end %>
+      <label>
+        <% if @page.language.public? %>
+          <%= Alchemy.t(:explain_publishing) %>
+        <% elsif @page.editable_by?(current_alchemy_user) %>
+          <%= Alchemy.t(:publish_page_language_not_public) %>
+        <% else %>
+          <%= Alchemy.t(:publish_page_not_allowed) %>
+        <% end %>
+      </label>
+    <% end %>
+  </div>
   <% unless @page.layoutpage? %>
     <div class="button_with_label">
-      <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
-        <%= button_tag class: 'icon_button', disabled: !@page.public? do %>
+      <% if @page.public? %>
+        <%= link_to show_page_url(
+              urlname: @page.urlname,
+              locale: prefix_locale? ? @page.language_code : nil,
+              host: @page.site.host == "*" ? request.host : @page.site.host,
+            ),
+            title: Alchemy.t("Visit page"),
+            data: { turbolinks: false },
+            target: "_blank",
+            class: 'icon_button' do %>
           <%= render_icon('external-link-alt') %>
         <% end %>
         <label><%= Alchemy.t("Visit page") %></label>
+      <% else %>
+        <%= content_tag "a",
+            title: Alchemy.t(:cannot_visit_unpublic_page),
+            class: 'disabled icon_button' do %>
+          <%= render_icon('external-link-alt') %>
+        <% end %>
+        <label><%= Alchemy.t(:cannot_visit_unpublic_page) %></label>
       <% end %>
     </div>
   <% end %>
@@ -128,14 +149,14 @@
 <script type="text/javascript" charset="utf-8">
 
   $(function() {
-    $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
+    $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
       var not_dirty = Alchemy.checkPageDirtyness(this);
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
       return not_dirty;
     });
-    Alchemy.PagePublicationFields();
+    Alchemy.Sitemap.watchPagePublicationState();
     Alchemy.PageLeaveObserver();
-    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_id: @page.id) %>', {
+    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_version_id: @page_version.id) %>', {
       texts: {
         title: '<%= Alchemy.t("Elements") %>',
         dirtyTitle: '<%= Alchemy.t("Warning!") %>',
@@ -152,7 +173,7 @@
           hotkey: 'alt+n',
           iconClass: 'plus',
           onClick: function() {
-            Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_id: @page.id) %>', {
+            Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_version_id: @page_version.id) %>', {
               title: '<%= Alchemy.t("New Element") %>',
               size: '320x125'
             });
@@ -169,15 +190,6 @@
               size: '400x305'
             });
           }
-        },
-        {
-          title: '<%= Alchemy.t("Show trash") %>',
-          label: '<%= Alchemy.t("Show trash") %>',
-          iconClass: 'trash-alt<%= trash_empty?("elements") ? "" : " full" %>',
-          buttonId: 'element_trash_button',
-          onClick: function() {
-            Alchemy.TrashWindow.open(<%= @page.id %>, '<%= Alchemy.t("Trash") %>');
-          }
         }
       ]
     }, function() {
@@ -185,7 +197,7 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
-      Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
+      Alchemy.Tinymce.init(<%= (@page.richtext_contents_ids + @page.richtext_ingredients_ids).to_json %>);
       $('#fixed-elements').tabs().tabs('paging', {
         follow: true,
         followOnSelect: true,

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

@@ -0,0 +1,2 @@
+$('#fold_button_<%= @page.id %>').css('background', 'none');
+Alchemy.Sitemap.fetch(<%= @page.id %>);

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

@@ -37,7 +37,7 @@
   <% else %>
     <% if @page_root %>
       <h2 id="page_filter_result"></h2>
-      <%= render "sitemap", page_partial: "page" %>
+      <%= render "sitemap", page_partial: "page", full: !!@sorting %>
     <% elsif can?(:create, Alchemy::Page) %>
       <%= render partial: "create_language_form" %>
     <% else %>

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

@@ -0,0 +1,19 @@
+<% content_for :toolbar do %>
+  <div class="button_with_label">
+    <%= link_to alchemy.admin_pages_path, class: 'icon_button' do %>
+      <%= render_icon 'angle-double-left' %>
+    <% end %>
+    <label><%= Alchemy.t(:cancel) %></label>
+  </div>
+<% end %>
+
+<div id="sort_panel">
+  <%= render_message do %>
+    <%= Alchemy.t(:explain_sitemap_dragndrop_sorting) %>
+  <% end %>
+  <div class="buttons">
+    <%= button_tag Alchemy.t('save order'), id: 'save_page_order' %>
+  </div>
+</div>
+
+<%= render 'sitemap', page_partial: 'page', full: true %>

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

@@ -13,13 +13,6 @@
   Alchemy.growl("<%= j @notice %>");
   Alchemy.closeCurrentDialog();
 
-<% elsif @page.parent_id != @old_parent_id -%>
-
-  Alchemy.closeCurrentDialog(function() {
-    Alchemy.growl("<%= j @notice %>");
-    Alchemy.currentSitemap.load(<%= @page.get_language_root.id %>);
-  });
-
 <% else -%>
 
   if (page) {

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -3,8 +3,7 @@
       size: @size,
     }.merge(search_filter_params.except(:q))
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
-  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id, id: nil) %>
-  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id, id: nil) %>
+  <%= hidden_field_tag :form_field_id, @form_field_id %>
   <div class="search_field">
     <button type="submit">
       <%= render_icon('search') %>
@@ -15,8 +14,7 @@
       id: nil %>
     <%= link_to render_icon(:times, size: 'xs'), url_for({
         action: 'index',
-        element_id: @element.blank? ? '' : @element.id,
-        content_id: @content.blank? ? '' : @content.id,
+        form_field_id: @form_field_id,
         size: @size,
         overlay: true
       }.merge(search_filter_params.except(:q))),