alchemy_cms 6.0.0.pre.rc5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380b59193f2297abbf578f48a662afd797a678edd9948b5967a5df870df20b5f
-  data.tar.gz: e36993e934138b801ce941d7a3b272790b41dde673f1cbded7e874cba637dd8d
+  metadata.gz: f1db98328d1be1d96ee705e68f64b757f33d0997e4f622626ca86e4e42511079
+  data.tar.gz: 563c9f02b864e170ac88a9d3f405c61b46da38fec41d0f4dfba0ff0c179407ba
 SHA512:
-  metadata.gz: '01489e9bf191e8ba5f42d19dfc93336d318744c41ccf6764625ebf787b8f2f030d219829be4b3b5830db93699e681883217909d8239ca023323469c95b7aab28'
-  data.tar.gz: 33599581bdff5315660e260562179f7e9b12ef9269dd50aeba7e5e52cdcb8bf5db5188bb86cb8cc60b53a0346d6c0bf8fe336c5eef234aec54a6110f7d5386b8
+  metadata.gz: 524ab50512e3a7c377f3619f20c6ec812e1c12a933b94fb56d8bbc5b94b843cd9708451b77b96af8be7776bb0c733c90af549da76820109a0163a0338b8599dc
+  data.tar.gz: 7c8346e5b07d35e2ef471cb90aff4fe8e62e2050ef13d03436cb2492e0cb5a6d9a2003eefa0f4f55d0a61cfdcbda48596788956908964c71333ca0ebdfa1565d

data/.github/workflows/ci.yml

@@ -9,20 +9,28 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - '6.0'
-          - '6.1'
+          - "6.0"
+          - "6.1"
+          - "7.0"
         ruby:
-          - '2.6.8'
-          - '2.7.4'
-          - '3.0.2'
+          - "2.6"
+          - "2.7"
+          - "3.0"
         database:
           - mysql
           - postgresql
+        exclude:
+          - rails: "7.0"
+            ruby: "2.6"
+            database: mysql
+          - rails: "7.0"
+            ruby: "2.6"
+            database: postgresql
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user
       DB_PASSWORD: password
-      DB_HOST: '127.0.0.1'
+      DB_HOST: "127.0.0.1"
       RAILS_ENV: test
       RAILS_VERSION: ${{ matrix.rails }}
     services:
@@ -32,11 +40,11 @@ jobs:
           POSTGRES_USER: alchemy_user
           POSTGRES_PASSWORD: password
           POSTGRES_DB: alchemy_cms_dummy_test
-        ports: ['5432:5432']
+        ports: ["5432:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       mysql:
         image: mysql:latest
-        ports: ['3306:3306']
+        ports: ["3306:3306"]
         env:
           MYSQL_USER: alchemy_user
           MYSQL_PASSWORD: password

data/.github/workflows/stale.yml

@@ -2,16 +2,30 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
 
 jobs:
   stale:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue has not seen any activity in a long time. If the issue described still exists in recent versions of Alchemy, please open a new issue or preferably open a PR with a fix. Thanks for reporting.'
-        stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest main if you want to continue working on this. Thanks for the contribution.'
+      - uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: |
+            This issue has not seen any activity in a long time.
+            Please create a pull request with a fix or ask someone of the community if they can help.
+            This issue will be closed in 7 days if no further activity happens.
+          close-issue-message: |
+            This issue has not seen any activity in a long time.
+            If the issue described still exists in recent versions of Alchemy,
+            please open a new issue with. Thanks for reporting.
+          stale-pr-message: |
+            This pull request has not seen any activiy in a long time.
+            Probably because of missing tests or a necessary rebase.
+            This PR will be closed in 7 days if no further activity happens.
+          close-pr-message: |
+            This pull request has not seen any activiy in a long time.
+            Probably because of missing tests or a necessary rebase.
+            Please open a new PR to latest main if you want to continue working on this.
+            Thanks for the contribution.

data/.gitignore

@@ -33,7 +33,6 @@ spec/dummy/uploads/
 .ruby-gemset
 .ruby-version
 .env
-.rspec
 node_modules
 yarn-error.log
 yarn-debug.log*

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+## 6.0.0 (2022-04-11)
+
+- [ruby - main] Allow ransack version 3.0.1 [#2287](https://github.com/AlchemyCMS/alchemy_cms/pull/2287) ([depfu](https://github.com/apps/depfu))
+- Fix image loader [#2285](https://github.com/AlchemyCMS/alchemy_cms/pull/2285) ([tvdeyen](https://github.com/tvdeyen))
+- Don't delete locals in render_element so they can be used by all elements in render_elements [#2283](https://github.com/AlchemyCMS/alchemy_cms/pull/2283) ([dbwinger](https://github.com/dbwinger))
+- Don't hardcode URLs in Javascript  [#2282](https://github.com/AlchemyCMS/alchemy_cms/pull/2282) ([dssjoblom](https://github.com/dssjoblom))
+- [ruby - main] Allow ransack 3.0.0 [#2278](https://github.com/AlchemyCMS/alchemy_cms/pull/2278) ([depfu](https://github.com/apps/depfu))
+- Show site and language name on page select in Link dialog [#2276](https://github.com/AlchemyCMS/alchemy_cms/pull/2276) ([dbwinger](https://github.com/dbwinger))
+- Allow webp as image file format [#2274](https://github.com/AlchemyCMS/alchemy_cms/pull/2274) ([tvdeyen](https://github.com/tvdeyen))
+- Rails 7 Support [#2225](https://github.com/AlchemyCMS/alchemy_cms/pull/2225) ([tvdeyen](https://github.com/tvdeyen))
+- Support AR enums in resource models [#2210](https://github.com/AlchemyCMS/alchemy_cms/pull/2210) ([robinboening](https://github.com/robinboening))
+
+## 6.0.0-rc7 (2022-03-28)
+
+- fix(Sitemap): Use response data [#2272](https://github.com/AlchemyCMS/alchemy_cms/pull/2272) ([tvdeyen](https://github.com/tvdeyen))
+- Revert "Ajax: Send method override" [#2271](https://github.com/AlchemyCMS/alchemy_cms/pull/2271) ([tvdeyen](https://github.com/tvdeyen))
+- ImageLoader: Add error handling [#2270](https://github.com/AlchemyCMS/alchemy_cms/pull/2270) ([tvdeyen](https://github.com/tvdeyen))
+- Check presence of page_public checkbox [#2269](https://github.com/AlchemyCMS/alchemy_cms/pull/2269) ([afdev82](https://github.com/afdev82))
+- Use lodash-es instead of lodash [#2268](https://github.com/AlchemyCMS/alchemy_cms/pull/2268) ([afdev82](https://github.com/afdev82))
+- CI: Update stale workflow [#2267](https://github.com/AlchemyCMS/alchemy_cms/pull/2267) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to skip db:create during install task [#2266](https://github.com/AlchemyCMS/alchemy_cms/pull/2266) ([tvdeyen](https://github.com/tvdeyen))
+- CI: Fix mysql builds [#2263](https://github.com/AlchemyCMS/alchemy_cms/pull/2263) ([tvdeyen](https://github.com/tvdeyen))
+- Fix new Sitemap [#2262](https://github.com/AlchemyCMS/alchemy_cms/pull/2262) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Allow ransack version 2.6.0 [#2259](https://github.com/AlchemyCMS/alchemy_cms/pull/2259) ([depfu](https://github.com/apps/depfu))
+- Allow all pages in API again [#2258](https://github.com/AlchemyCMS/alchemy_cms/pull/2258) ([tvdeyen](https://github.com/tvdeyen))
+- Fix setting default value of ingredients [#2257](https://github.com/AlchemyCMS/alchemy_cms/pull/2257) ([tvdeyen](https://github.com/tvdeyen))
+- Eager load in PageTree serializer [#2256](https://github.com/AlchemyCMS/alchemy_cms/pull/2256) ([tvdeyen](https://github.com/tvdeyen))
+- Revert "Merge pull request #2203 from tvdeyen/switch-to-cuprite" [#2255](https://github.com/AlchemyCMS/alchemy_cms/pull/2255) ([tvdeyen](https://github.com/tvdeyen))
+- [js] New version of flatpickr (4.6.10) broke the build [#2254](https://github.com/AlchemyCMS/alchemy_cms/pull/2254) ([depfu](https://github.com/apps/depfu))
+- New sortable page tree [#2252](https://github.com/AlchemyCMS/alchemy_cms/pull/2252) ([tvdeyen](https://github.com/tvdeyen))
+- Use minor versions for ruby version matrix [#2251](https://github.com/AlchemyCMS/alchemy_cms/pull/2251) ([tvdeyen](https://github.com/tvdeyen))
+- Precompile packs during test setup [#2250](https://github.com/AlchemyCMS/alchemy_cms/pull/2250) ([tvdeyen](https://github.com/tvdeyen))
+- Allow parent page change [#2246](https://github.com/AlchemyCMS/alchemy_cms/pull/2246) ([tvdeyen](https://github.com/tvdeyen))
+- Send language_id to Api::PagesController#index so Pages can be restricted to the language of the page [#2245](https://github.com/AlchemyCMS/alchemy_cms/pull/2245) ([dbwinger](https://github.com/dbwinger))
+
+## 6.0.0-rc6 (2022-03-05)
+
+- Rework sitemap JS [#2249](https://github.com/AlchemyCMS/alchemy_cms/pull/2249) ([tvdeyen](https://github.com/tvdeyen))
+- Remove old page layout change code from update action [#2248](https://github.com/AlchemyCMS/alchemy_cms/pull/2248) ([tvdeyen](https://github.com/tvdeyen))
+- Fix rendering errors in page configure overlay [#2247](https://github.com/AlchemyCMS/alchemy_cms/pull/2247) ([tvdeyen](https://github.com/tvdeyen))
+- Fix copying page with descendants to a different language [#2243](https://github.com/AlchemyCMS/alchemy_cms/pull/2243) ([dbwinger](https://github.com/dbwinger))
+- Handle copying/pasting global pages [#2241](https://github.com/AlchemyCMS/alchemy_cms/pull/2241) ([dbwinger](https://github.com/dbwinger))
+
 ## 6.0.0-rc5 (2022-02-24)
 
 ### Changes
@@ -181,6 +224,52 @@
 - Fix delete element confirm dialog [#2023](https://github.com/AlchemyCMS/alchemy_cms/pull/2023) ([tvdeyen](https://github.com/tvdeyen))
 - Build for Ruby 3 [#1990](https://github.com/AlchemyCMS/alchemy_cms/pull/1990) ([tvdeyen](https://github.com/tvdeyen))
 
+## 5.2.7 (2022-03-01)
+
+- Fix copying page with descendants to a different language ([dbwinger](https://github.com/dbwinger))
+- Handle copying/pasting global pages ([dbwinger](https://github.com/dbwinger))
+
+## 5.2.6 (2022-02-28)
+
+- Add crop_resize Dragonfly processor ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.2.5 (2021-11-24)
+
+- Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.2.4 (2021-11-17)
+
+- Set stampable user_class_name without root identifier ([tvdeyen](https://github.com/tvdeyen))
+- Use relative path for tinymce font-face ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.2.3 (2021-10-26)
+
+- Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.2.2 (2021-09-15)
+
+- Return only pages from current site in api [#2169](https://github.com/AlchemyCMS/alchemy_cms/pull/2169) ([afdev82](https://github.com/afdev82))
+- Improve cache key defaults for menus #2138 [#2160](https://github.com/AlchemyCMS/alchemy_cms/pull/2160) ([oneiros](https://github.com/oneiros))
+- generate picture thumbnails only for pictures with convertible format [#2130](https://github.com/AlchemyCMS/alchemy_cms/pull/2130) ([afdev82](https://github.com/afdev82))
+- Backport #2114 to v5.2 [#2116](https://github.com/AlchemyCMS/alchemy_cms/pull/2116) ([afdev82](https://github.com/afdev82))
+- Add webpacker tasks to Alchemy upgrader [#2115](https://github.com/AlchemyCMS/alchemy_cms/pull/2115) ([dbwinger](https://github.com/dbwinger))
+
+## 5.2.1 (2021-05-13)
+
+- Fix alchemy:generate:thumbnails task [#2092](https://github.com/AlchemyCMS/alchemy_cms/pull/2092) ([afdev82](https://github.com/afdev82))
+- Do not attempt to generate thumbs for svg files. [#2090](https://github.com/AlchemyCMS/alchemy_cms/pull/2090) ([oneiros](https://github.com/oneiros))
+
+## 5.2.0 (2021-05-06)
+
+- Backport #2049 to 5.2 [#2086](https://github.com/AlchemyCMS/alchemy_cms/pull/2086) ([rickythefox](https://github.com/rickythefox))
+- hotfix and deprecate page_active? helper [#2073](https://github.com/AlchemyCMS/alchemy_cms/pull/2073) ([robinboening](https://github.com/robinboening))
+
+## 5.2.0.rc1 (2021-02-17)
+
+### Changes
+
+- Change Factory loading mechanism to FactoryBots supported mechanism [#2030](https://github.com/AlchemyCMS/alchemy_cms/pull/2030) ([mamhoff](https://github.com/mamhoff))
+
 ## 5.2.0.b1 (2021-02-11)
 
 ### Features

data/Gemfile

@@ -3,8 +3,16 @@ source "https://rubygems.org"
 
 gemspec
 
-rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
-gem "rails", "~> #{rails_version}.0"
+rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
+# Necessary until a new 6.1.5 version has been released
+# https://github.com/rails/rails/pull/44691
+if rails_version.to_s.match?(/6.1/)
+  gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
+elsif rails_version.to_s.match?(/7.0/)
+  gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
+else
+  gem "rails", "~> #{rails_version}.0"
+end
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"
@@ -40,8 +48,3 @@ group :development, :test do
     gem "brakeman", require: false
   end
 end
-
-# Necessary for system tests in Rails 6.0
-if ENV["RAILS_VERSION"] == "6.0"
-  gem "selenium-webdriver"
-end

data/Rakefile

@@ -41,12 +41,16 @@ namespace :alchemy do
     task :prepare do
       system(
         <<~BASH
+          yarn install && \
+          yarn link && \
           cd spec/dummy && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
-          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
+          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept --skip-db-create && \
+          yarn link @alchemy_cms/admin && \
+          RAILS_ENV=test bin/webpack && \
           cd -
         BASH
       ) || fail

data/alchemy_cms.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
     activesupport
     railties
   ].each do |rails_gem|
-    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.2"]
+    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 7.1"]
   end
 
   gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
   gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
-  gem.add_runtime_dependency "ransack", [">= 1.8", "<= 2.5.0"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency "ransack", [">= 1.8", "< 4.0"]
   gem.add_runtime_dependency "request_store", ["~> 1.2"]
   gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
@@ -57,13 +57,13 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "capybara", ["~> 3.0"]
   gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]
-  gem.add_development_dependency "cuprite", ["~> 0.13"]
   gem.add_development_dependency "factory_bot_rails", ["~> 6.0"]
   gem.add_development_dependency "puma", ["~> 5.0"]
   gem.add_development_dependency "rails-controller-testing", ["~> 1.0"]
   gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
   gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
   gem.add_development_dependency "simplecov", ["~> 0.20"]
+  gem.add_development_dependency "webdrivers", ["~> 5.0"]
   gem.add_development_dependency "webmock", ["~> 3.3"]
   gem.add_development_dependency "shoulda-matchers", ["~> 5.0"]
   gem.add_development_dependency "timecop", ["~> 0.9"]

data/app/assets/javascripts/alchemy/admin.js

@@ -35,10 +35,8 @@
 //= require alchemy/alchemy.link_dialog
 //= require alchemy/alchemy.list_filter
 //= require alchemy/alchemy.initializer
-//= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
-//= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -82,7 +82,12 @@ class window.Alchemy.Dialog
     @dialog_body.hide()
     @dialog_body.html(data)
     @init()
-    @dialog.trigger('DialogReady.Alchemy', @dialog_body)
+    @dialog[0].dispatchEvent(new CustomEvent(
+      "DialogReady.Alchemy",
+      bubbles: true
+      detail:
+        body: @dialog_body[0]
+    ))
     if @options.ready?
       @options.ready(@dialog_body)
     @dialog_body.show('fade', 200)

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -87,6 +87,8 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
               name: page.name
               url_path: page.url_path
               page_id: page.id
+              language: page.language
+              site: page.site
           more: meta.page * meta.per_page < meta.total_count
       initSelection: ($element, callback) =>
         urlname = $element.val()

data/app/assets/javascripts/alchemy/page_select.js

@@ -1,9 +1,11 @@
-$.fn.alchemyPageSelect = function(options) {
+$.fn.alchemyPageSelect = function (options) {
   var pageTemplate = HandlebarsTemplates.page
 
   return this.select2({
     placeholder: options.placeholder,
-    allowClear: true,
+    allowClear: options.hasOwnProperty("allowClear")
+      ? options.allowClear
+      : true,
     minimumInputLength: 3,
     initSelection: function (_$el, callback) {
       if (options.initialSelection) {
@@ -12,13 +14,16 @@ $.fn.alchemyPageSelect = function(options) {
     },
     ajax: {
       url: options.url,
-      datatype: 'json',
+      datatype: "json",
       quietMillis: 300,
       data: function (term, page) {
         return {
-          q: $.extend({
-            name_cont: term
-          }, options.query_params),
+          q: $.extend(
+            {
+              name_cont: term
+            },
+            options.query_params
+          ),
           page: page
         }
       },
@@ -34,8 +39,8 @@ $.fn.alchemyPageSelect = function(options) {
     formatSelection: function (page) {
       return page.text || page.name
     },
-    formatResult: function(page) {
-      return pageTemplate({page: page})
+    formatResult: function (page) {
+      return pageTemplate({ page: page })
     }
   })
 }

data/app/assets/javascripts/alchemy/templates/index.js

@@ -2,3 +2,4 @@
 //= require alchemy/templates/page
 //= require alchemy/templates/node_folder
 //= require alchemy/templates/node
+//= require alchemy/templates/page_folder

data/app/assets/javascripts/alchemy/templates/page.hbs

@@ -1,9 +1,19 @@
 <div class="page-select--page">
-  <i class="icon far fa-file fa-lg"></i>
-  <span class="page-select--page-name">
-    {{ page.name }}
-  </span>
-  <span class="page-select--page-urlname">
-    {{ page.url_path }}
-  </span>
+  <div class="page-select--top">
+    <i class="icon far fa-file fa-lg"></i>
+    <span class="page-select--page-name">
+      {{ page.name }}
+    </span>
+    <span class="page-select--page-urlname">
+      {{ page.url_path }}
+    </span>
+  </div>
+  <div class="page-select--bottom">
+    <span class="page-select--site-name">
+      {{ page.site.name }}
+    </span>
+    <span class="page-select--language-code">
+      {{ page.language.name }}
+    </span>
+  </div>
 </div>

data/app/assets/javascripts/alchemy/templates/page_folder.hbs

@@ -0,0 +1,3 @@
+<a class="page_folder" data-page-id="{{ page.id }}">
+  <i class="far fa-{{#if page.folded }}plus{{else}}minus{{/if}}-square fa-fw"></i>
+</a>

data/app/assets/stylesheets/alchemy/archive.scss

@@ -48,6 +48,10 @@ div#image_assign_filter_and_image_sizing {
   background-color: $thumbnail-background-color;
   width: 100%;
   height: 120px;
+
+  &:hover {
+    text-decoration: none;
+  }
 }
 
 .picture_thumbnail {
@@ -61,6 +65,11 @@ div#image_assign_filter_and_image_sizing {
     width: 100%;
     height: 100%;
     object-fit: contain;
+
+    &[src$=".svg"] {
+      width: auto;
+      height: auto;
+    }
   }
 
   .picture_name {

data/app/assets/stylesheets/alchemy/elements.scss

@@ -545,6 +545,10 @@
     font-size: 4em;
     color: $medium-gray;
     vertical-align: top;
+
+    &.error {
+      font-size: 1.2em;
+    }
   }
 
   .essence_picture_css_class {

data/app/assets/stylesheets/alchemy/page-select.scss

@@ -8,24 +8,49 @@
 
 .page-select--page {
   display: flex;
-  align-items: center;
+  flex-direction: column;
 
   .icon {
     margin: 0 8px 0 4px;
 
     .select2-highlighted & {
-      color: $white
+      color: $white;
     }
   }
 }
 
+.page-select--top,
+.page-select--bottom {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.page-select--bottom {
+  font-size: $small-font-size;
+  padding-left: 6 * $default-padding;
+}
+
+.page-select--language-code {
+  display: inline-block;
+  background-color: $medium-gray;
+  margin-left: auto;
+  border-radius: $default-border-radius;
+  padding: $default-padding / 2 $default-padding;
+
+  .select2-highlighted & {
+    color: $select-hover-bg-color;
+    background-color: white;
+  }
+}
+
 .page-select--page-urlname {
   margin-left: auto;
-  padding: $default-padding 2*$default-padding;
+  padding: $default-padding 2 * $default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 
   .select2-highlighted & {
-    color: $white
+    color: $white;
   }
 }

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -23,7 +23,7 @@ $sitemap-url-xlarge-width: 350px;
 
 #sitemap-wrapper {
   position: relative;
-  min-height: calc(100vh - 96px);
+  min-height: calc(100vh - 148px);
 }
 
 .sitemap_pagename_link {
@@ -142,18 +142,16 @@ $sitemap-url-xlarge-width: 350px;
 #sitemap {
   padding: 0 0 104px 0;
 
-  &.sorting {
-    padding-top: 100px;
-
-    .page_icon {
-      cursor: move;
-    }
+  .handle {
+    cursor: move;
   }
 
   .page_folder {
     position: absolute;
     left: -23px;
     top: 0;
+    width: 16px;
+    height: $sitemap-line-height;
   }
 
   .placeholder {
@@ -258,3 +256,7 @@ $sitemap-url-xlarge-width: 350px;
     }
   }
 }
+
+#search_field_clear {
+  cursor: pointer;
+}

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -106,18 +106,14 @@ module Alchemy
       def element_includes
         [
           {
-            contents: {
-              essence: :ingredient_association,
-            },
+            contents: :essence,
             ingredients: :related_object,
           },
           :tags,
           {
             all_nested_elements: [
               {
-                contents: {
-                  essence: :ingredient_association,
-                },
+                contents: :essence,
                 ingredients: :related_object,
               },
               :tags,

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -7,7 +7,7 @@ module Alchemy
 
       helper "alchemy/pages"
 
-      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link]
 
       authorize_resource class: Alchemy::Page, except: [:index, :tree]
 
@@ -21,7 +21,7 @@ module Alchemy
         except: [:show]
 
       before_action :set_root_page,
-        only: [:index, :show, :sort, :order]
+        only: [:index, :show, :order]
 
       before_action :run_on_page_layout_callbacks,
         if: :run_on_page_layout_callbacks?,
@@ -123,8 +123,7 @@ module Alchemy
       # * fetches page via before filter
       #
       def update
-        # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
-        @old_page_layout = @page.page_layout
+        @old_parent_id = @page.parent_id
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?("edit")
@@ -133,7 +132,7 @@ module Alchemy
             @tree = serialized_page_tree
           end
         else
-          configure
+          render :configure
         end
       end
 
@@ -169,9 +168,7 @@ module Alchemy
       def fold
         # @page is fetched via before filter
         @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
-        respond_to do |format|
-          format.js
-        end
+        render json: serialized_page_tree
       end
 
       # Leaves the page editing mode and unlocks the page for other users
@@ -182,9 +179,12 @@ module Alchemy
         @pages_locked_by_user = Page.from_current_site.locked_by(current_alchemy_user)
         respond_to do |format|
           format.js
-          format.html {
-            redirect_to params[:redirect_to].blank? ? admin_pages_path : params[:redirect_to]
-          }
+          format.html do
+            redirect_to(
+              params[:redirect_to].presence || admin_pages_path,
+              allow_other_host: true,
+            )
+          end
         end
       end
 
@@ -204,10 +204,6 @@ module Alchemy
         redirect_to admin_pages_path
       end
 
-      def sort
-        @sorting = true
-      end
-
       # Receives a JSON object representing a language tree to be ordered
       # and updates all pages in that language structure to their correct indexes
       def order
@@ -389,9 +385,11 @@ module Alchemy
       end
 
       def serialized_page_tree
-        PageTreeSerializer.new(@page, ability: current_ability,
-                                      user: current_alchemy_user,
-                                      full: params[:full] == "true")
+        PageTreeSerializer.new(
+          @page,
+          ability: current_ability,
+          user: current_alchemy_user,
+        )
       end
 
       def load_languages_and_layouts