alchemy_cms 4.3.2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d15b38f5b661ee273e9b99e86f443784ef6ea5979557a98cd47c743853ac71bf
-  data.tar.gz: 9a0610ad72088ab7b8d237d529e0ab5d52a7ecb6c40c04b30394ef3c8d6323ac
+  metadata.gz: 3627c5787085ffff82e37a3d35ca2ca42cc58c5ec8f44e10fa6ba91e4fbd4095
+  data.tar.gz: d2e1d6dbbae695b9a6e29df44d0ed8850952550e610fdfda6a156d519d19f3b6
 SHA512:
-  metadata.gz: '086afcd9d02c25bac7f39acf06f7f8327801f803885501afc83114fa500be43838af96ea812a8766022e517a8ce8689a9189065e7868bc76c18161f6551079ac'
-  data.tar.gz: 6a621a860ae8a1ed40ae62db8fa0025f2b8f95e662f1ffb328929213ec8638f05cddce70e4f1c037ee8c43d99f30e568ffb5693628721619dd3bc2b6efb607a4
+  metadata.gz: 72f44c680caaa741f59b3b33940a654774f53c94f8e3ce66d164135d52999007fe2d3b4ca0af80ee490f09366d758118d50498a5d22539662a5f81ba4379d52b
+  data.tar.gz: 1dd6222e477cffd173025f52b973d5f55f3f844f9f1731cfc2745b40b84a96622d51b74f331bb3d092462dbe20036622b14d802c64a0ee1e4f5552e37d19359d

data/.github/workflows/ci.yml

@@ -0,0 +1,92 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  RSpec:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rails:
+          - '5.2'
+          - '6.0'
+        ruby:
+          - '2.5.x'
+          - '2.6.x'
+        database:
+          - mysql
+          - postgresql
+    env:
+      DB: ${{ matrix.database }}
+      MYSQL_PASSWORD: root
+      PGHOST: 127.0.0.1
+      PGUSER: postgres
+      RAILS_ENV: test
+      RAILS_VERSION: ${{ matrix.rails }}
+      CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+    services:
+      postgres:
+        image: postgres:10
+        ports: ['5432:5432']
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Restore apt cache
+        id: apt-cache
+        uses: actions/cache@preview
+        with:
+          path: /home/runner/apt/cache
+          key: ${{ runner.os }}-apt-${{ matrix.database }}
+          restore-keys: |
+            ${{ runner.os }}-apt-
+      - name: Install Postgres headers
+        if: matrix.database == 'postgresql'
+        run: |
+          mkdir -p /home/runner/apt/cache
+          sudo apt-get update -qq
+          sudo apt-get install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
+          sudo chown -R runner /home/runner/apt/cache
+      - name: Install MySQL headers
+        if: matrix.database == 'mysql'
+        run: |
+          mkdir -p /home/runner/apt/cache
+          sudo apt-get update -qq
+          sudo apt-get install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
+          sudo chown -R runner /home/runner/apt/cache
+      - name: Install bundler
+        run: |
+          gem install bundler
+      - name: Restore Ruby Gems cache
+        id: cache
+        uses: actions/cache@preview
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
+          restore-keys: |
+            ${{ runner.os }}-bundle-
+      - name: Install bundle
+        timeout-minutes: 10
+        run: |
+          bundle install --jobs 4 --retry 3 --path vendor/bundle
+      - name: Prepare database
+        run: |
+          bundle exec rake alchemy:spec:prepare
+      - name: Install code climate test reporter
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+      - name: Test with RSpec
+        run: |
+          bundle exec rspec
+          ./cc-test-reporter after-build --exit-code $?
+      - uses: actions/upload-artifact@master
+        if: failure()
+        with:
+          name: Screenshots
+          path: spec/dummy/tmp/screenshots

data/.gitignore

@@ -21,3 +21,4 @@ spec/dummy/public/assets
 .ruby-gemset
 .ruby-version
 .env
+.rspec

data/CHANGELOG.md

@@ -1,6 +1,62 @@
+## 4.4.0 (2020-01-06)
+
+- Use contents settings for size in EssencePicture#picture_url [#1703](https://github.com/AlchemyCMS/alchemy_cms/pull/1703) ([tvdeyen](https://github.com/tvdeyen))
+- Remove title tag from preview elements [#1701](https://github.com/AlchemyCMS/alchemy_cms/pull/1701) ([tvdeyen](https://github.com/tvdeyen))
+- Remove custom JS logging [#1700](https://github.com/AlchemyCMS/alchemy_cms/pull/1700) ([tvdeyen](https://github.com/tvdeyen))
+- Remove demo locale files [#1699](https://github.com/AlchemyCMS/alchemy_cms/pull/1699) ([tvdeyen](https://github.com/tvdeyen))
+- Use alchemyPageSelect for Node page select [#1698](https://github.com/AlchemyCMS/alchemy_cms/pull/1698) ([tvdeyen](https://github.com/tvdeyen))
+- Cache menu partials [#1697](https://github.com/AlchemyCMS/alchemy_cms/pull/1697) ([tvdeyen](https://github.com/tvdeyen))
+- Update page tree to menu nodes Rake task [#1696](https://github.com/AlchemyCMS/alchemy_cms/pull/1696) ([tvdeyen](https://github.com/tvdeyen))
+- Validate nodes name if page is absent [#1695](https://github.com/AlchemyCMS/alchemy_cms/pull/1695) ([tvdeyen](https://github.com/tvdeyen))
+- Update the application layout installer template [#1691](https://github.com/AlchemyCMS/alchemy_cms/pull/1691) ([tvdeyen](https://github.com/tvdeyen))
+- Update note about missing user class [#1690](https://github.com/AlchemyCMS/alchemy_cms/pull/1690) ([tvdeyen](https://github.com/tvdeyen))
+- Use a Sprockets 3/4 manifest file [#1689](https://github.com/AlchemyCMS/alchemy_cms/pull/1689) ([tvdeyen](https://github.com/tvdeyen))
+- Use select2 for internal page link in link overlay [#1685](https://github.com/AlchemyCMS/alchemy_cms/pull/1685) ([tvdeyen](https://github.com/tvdeyen))
+- Do not consider nested elements "orphaned" [#1684](https://github.com/AlchemyCMS/alchemy_cms/pull/1684) ([mamhoff](https://github.com/mamhoff))
+- Destroy page-dependent elements [#1683](https://github.com/AlchemyCMS/alchemy_cms/pull/1683) ([mamhoff](https://github.com/mamhoff))
+- Add anchor link tab to link overlay [#1682](https://github.com/AlchemyCMS/alchemy_cms/pull/1682) ([tvdeyen](https://github.com/tvdeyen))
+- Ensure the apt/cache folder exists while installing [#1678](https://github.com/AlchemyCMS/alchemy_cms/pull/1678) ([tvdeyen](https://github.com/tvdeyen))
+- Cache apt packages between CI runs [#1677](https://github.com/AlchemyCMS/alchemy_cms/pull/1677) ([tvdeyen](https://github.com/tvdeyen))
+- Use select2 with AJAX search for essence page select [#1675](https://github.com/AlchemyCMS/alchemy_cms/pull/1675) ([tvdeyen](https://github.com/tvdeyen))
+- Eager load associated records [#1674](https://github.com/AlchemyCMS/alchemy_cms/pull/1674) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for testing with multiple Rails versions [#1673](https://github.com/AlchemyCMS/alchemy_cms/pull/1673) ([tvdeyen](https://github.com/tvdeyen))
+- Page api pagination [#1672](https://github.com/AlchemyCMS/alchemy_cms/pull/1672) ([tvdeyen](https://github.com/tvdeyen))
+- Adjust select2 loading-more indicator [#1671](https://github.com/AlchemyCMS/alchemy_cms/pull/1671) ([tvdeyen](https://github.com/tvdeyen))
+- Test support fixes [#1669](https://github.com/AlchemyCMS/alchemy_cms/pull/1669) ([tvdeyen](https://github.com/tvdeyen))
+- Build fixes [#1668](https://github.com/AlchemyCMS/alchemy_cms/pull/1668) ([tvdeyen](https://github.com/tvdeyen))
+- Add Menus [#1667](https://github.com/AlchemyCMS/alchemy_cms/pull/1667) ([tvdeyen](https://github.com/tvdeyen))
+- Add a label component [#1666](https://github.com/AlchemyCMS/alchemy_cms/pull/1666) ([tvdeyen](https://github.com/tvdeyen))
+- Run bundle install on CI even if cache hits [#1665](https://github.com/AlchemyCMS/alchemy_cms/pull/1665) ([tvdeyen](https://github.com/tvdeyen))
+- Moves switch_language method into languages_controller. [#1664](https://github.com/AlchemyCMS/alchemy_cms/pull/1664) ([tvdeyen](https://github.com/tvdeyen))
+- Cache gems between CI runs [#1663](https://github.com/AlchemyCMS/alchemy_cms/pull/1663) ([tvdeyen](https://github.com/tvdeyen))
+- Remove production gems from local Gemfile [#1662](https://github.com/AlchemyCMS/alchemy_cms/pull/1662) ([tvdeyen](https://github.com/tvdeyen))
+- Touch contents updated_at column in pure SQL [#1661](https://github.com/AlchemyCMS/alchemy_cms/pull/1661) ([tvdeyen](https://github.com/tvdeyen))
+- Convert page editing user methods into AR relations [#1658](https://github.com/AlchemyCMS/alchemy_cms/pull/1658) ([tvdeyen](https://github.com/tvdeyen))
+- Ensure the admin locale is only set by available locales [#1655](https://github.com/AlchemyCMS/alchemy_cms/pull/1655) ([tvdeyen](https://github.com/tvdeyen))
+- Add a GitHub actions ci.yml [#1654](https://github.com/AlchemyCMS/alchemy_cms/pull/1654) ([tvdeyen](https://github.com/tvdeyen))
+- Adjust install generator to latest changes [#1649](https://github.com/AlchemyCMS/alchemy_cms/pull/1649) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate _view suffix of element views [#1648](https://github.com/AlchemyCMS/alchemy_cms/pull/1648) ([tvdeyen](https://github.com/tvdeyen))
+- Add a configurable logout method (default: delete) [#1647](https://github.com/AlchemyCMS/alchemy_cms/pull/1647) ([delphaber](https://github.com/delphaber))
+- Deprecate render_essence helpers [#1644](https://github.com/AlchemyCMS/alchemy_cms/pull/1644) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate element editors [#1643](https://github.com/AlchemyCMS/alchemy_cms/pull/1643) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate local options in essence editors [#1642](https://github.com/AlchemyCMS/alchemy_cms/pull/1642) ([tvdeyen](https://github.com/tvdeyen))
+- Ensure the EssencePage id regexp matches only numbers [#1641](https://github.com/AlchemyCMS/alchemy_cms/pull/1641) ([tvdeyen](https://github.com/tvdeyen))
+- Use EssencePage in contact forms [#1640](https://github.com/AlchemyCMS/alchemy_cms/pull/1640) ([tvdeyen](https://github.com/tvdeyen))
+- Add Alchemy::EssencePage [#1639](https://github.com/AlchemyCMS/alchemy_cms/pull/1639) ([tvdeyen](https://github.com/tvdeyen))
+- FEAT: Render message and warnings in element editor [#1637](https://github.com/AlchemyCMS/alchemy_cms/pull/1637) ([tvdeyen](https://github.com/tvdeyen))
+- Tackle Rails 6 deprecations [#1636](https://github.com/AlchemyCMS/alchemy_cms/pull/1636) ([tvdeyen](https://github.com/tvdeyen))
+- Preload assets in tests [#1635](https://github.com/AlchemyCMS/alchemy_cms/pull/1635) ([tvdeyen](https://github.com/tvdeyen))
+- Allow acts-as-list 1.0 [#1634](https://github.com/AlchemyCMS/alchemy_cms/pull/1634) ([tvdeyen](https://github.com/tvdeyen))
+- Add Sprockets manifest file to dummy app [#1632](https://github.com/AlchemyCMS/alchemy_cms/pull/1632) ([tvdeyen](https://github.com/tvdeyen))
+- Master now tracks 4.4.0.alpha [#1627](https://github.com/AlchemyCMS/alchemy_cms/pull/1627) ([tvdeyen](https://github.com/tvdeyen))
+- Fix Cell Migration to maintain positions [#1625](https://github.com/AlchemyCMS/alchemy_cms/pull/1625) ([mamhoff](https://github.com/mamhoff))
+- Cell Upgrader: Match quotation marks in cell name string [#1624](https://github.com/AlchemyCMS/alchemy_cms/pull/1624) ([mamhoff](https://github.com/mamhoff))
+- Cell Migrator: Maintain element order in fixed elements [#1623](https://github.com/AlchemyCMS/alchemy_cms/pull/1623) ([mamhoff](https://github.com/mamhoff))
+- Enhance cells upgrader to deal with render_elements from_page: x [#1622](https://github.com/AlchemyCMS/alchemy_cms/pull/1622) ([mamhoff](https://github.com/mamhoff))
+
 ## 4.3.2 (2019-11-08)
 
-- Allow SimpleForm 5 [#1660](https://github.com/AlchemyCMS/alchemy_cms/pull/1660) ([jkimmeyer](https://github.com/jkimmeyer))
+- Allow simple form 5 [#1660](https://github.com/AlchemyCMS/alchemy_cms/pull/1633) ([jkimmeyer](https://github.com/jkimmeyer))
 
 ## 4.3.1 (2019-09-27)
 
@@ -9,7 +65,7 @@
 - Cell Migrator: Maintain element order in fixed elements [#1623](https://github.com/AlchemyCMS/alchemy_cms/pull/1623) ([mamhoff](https://github.com/mamhoff))
 - Enhance cells upgrader to deal with render_elements from_page: x [#1622](https://github.com/AlchemyCMS/alchemy_cms/pull/1622) ([mamhoff](https://github.com/mamhoff))
 
-# 4.3.0 (2019-08-23)
+## 4.3.0 (2019-08-23)
 
 - Add Rails 6 support [#1616](https://github.com/AlchemyCMS/alchemy_cms/pull/1616) ([tvdeyen](https://github.com/tvdeyen))
 - Use media_type over content_type in specs [#1615](https://github.com/AlchemyCMS/alchemy_cms/pull/1615) ([tvdeyen](https://github.com/tvdeyen))
@@ -541,3 +597,4 @@ No changes
 ## 3.0.0 (2014-07-03)
 
 [Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
+

data/Gemfile

@@ -2,12 +2,15 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 6.0.0'
+rails_version = ENV.fetch('RAILS_VERSION', 6.0).to_f
+gem 'rails', "~> #{rails_version}.0"
 
 # Profiling
 gem 'rack-mini-profiler', group: :development, require: false
 
-gem 'sqlite3', '~> 1.4.1' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+  gem 'sqlite3', rails_version > 5.0 ? '~> 1.4.1' : '~> 1.3.6'
+end
 gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
 gem 'pg',     '~> 1.0'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'
@@ -15,9 +18,6 @@ gem 'sassc-rails'
 group :development, :test do
   gem 'simplecov', require: false
   gem 'bootsnap', require: false
-  if ENV['TRAVIS']
-    gem 'codeclimate-test-reporter', '~> 1.0', require: false
-  end
   unless ENV['CI']
     gem 'launchy'
     gem 'annotate'
@@ -30,5 +30,6 @@ group :development, :test do
     gem 'localeapp', '~> 3.0', require: false
     gem 'dotenv', '~> 2.2'
     gem 'github_fast_changelog', require: false
+    gem 'active_record_query_trace', require: false
   end
 end

data/README.md

@@ -1,7 +1,7 @@
 # AlchemyCMS
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=master)](https://github.com/AlchemyCMS/alchemy_cms/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
@@ -124,11 +124,12 @@ The best practice is to use an initializer:
 
 ```ruby
 # config/initializers/alchemy.rb
-Alchemy.user_class_name     = 'YourUserClass'       # Defaults to 'User'
-Alchemy.current_user_method = 'current_admin_user'  # Defaults to 'current_user'
-Alchemy.signup_path         = '/your/signup/path'   # Defaults to '/signup'
-Alchemy.login_path          = '/your/login/path'    # Defaults to '/login'
-Alchemy.logout_path         = '/your/logout/path'   # Defaults to '/logout'
+Alchemy.user_class_name     = 'YourUserClass'          # Defaults to 'User'
+Alchemy.current_user_method = 'current_admin_user'     # Defaults to 'current_user'
+Alchemy.signup_path         = '/your/signup/path'      # Defaults to '/signup'
+Alchemy.login_path          = '/your/login/path'       # Defaults to '/login'
+Alchemy.logout_path         = '/your/logout/path'      # Defaults to '/logout'
+Alchemy.logout_method       = 'http_verb_for_logout'   # Defaults to 'delete'
 ```
 
 The only thing Alchemy needs to know from your user class is the `alchemy_roles` method.

data/alchemy_cms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths         = ['lib']
 
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.10.0']
-  gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
+  gem.add_runtime_dependency 'acts_as_list',                     ['>= 0.3', '< 2']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0', '< 5.0']
@@ -38,15 +38,17 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
   gem.add_runtime_dependency 'simple_form',                      ['>= 4.0', '< 6']
+  gem.add_runtime_dependency 'sprockets',                        ['>= 3.0', '< 5']
   gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
 
   gem.add_development_dependency 'capybara',                     ['~> 3.0']
   gem.add_development_dependency 'capybara-screenshot',          ['~> 1.0']
   gem.add_development_dependency 'factory_bot_rails',            ['~> 5.0']
+  gem.add_development_dependency 'puma',                         ['~> 4.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 'selenium-webdriver',           ['~> 3.8']
+  gem.add_development_dependency 'webdrivers',                   ['~> 4.0']
   gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']
 
   gem.post_install_message = <<-MSG

data/app/assets/config/alchemy_manifest.js

@@ -0,0 +1,15 @@
+//= link alchemy/admin/all.css
+//= link alchemy/admin/all.js
+//= link alchemy/preview.js
+//= link alchemy/menubar.css
+//= link alchemy/menubar.js
+//= link alchemy/print.css
+//= link alchemy/welcome.css
+//= link tinymce/plugins/alchemy_link/plugin.min.js
+//= link tinymce/tinymce.min.js
+//= link_directory ../stylesheets/tinymce/skins/alchemy/ .css
+//= link_directory ../stylesheets/tinymce/skins/alchemy/img/
+//= link_directory ../stylesheets/tinymce/skins/alchemy/fonts/
+//= link_tree ../images/alchemy/
+//= link_tree ../../../vendor/assets/fonts/
+//= link_tree ../../../vendor/assets/images/

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

@@ -48,3 +48,4 @@
 //= require alchemy/alchemy.tooltips
 //= require alchemy/alchemy.translations
 //= require alchemy/alchemy.trash_window
+//= require alchemy/page_select

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

@@ -68,7 +68,7 @@ $.extend Alchemy,
       Alchemy.setElementDirty $element
     false
 
-  # Initializes all select tag with .alchemy_selectbox class as selectBoxIt instance
+  # Initializes all select tag with .alchemy_selectbox class as select2 instance
   # Pass a jQuery scope to only init a subset of selectboxes.
   SelectBox: (scope) ->
     $("select.alchemy_selectbox", scope).select2
@@ -76,18 +76,6 @@ $.extend Alchemy,
       dropdownAutoWidth: true
     return
 
-  # Logs exception to js console, if present.
-  debug: (e) ->
-    if window["console"]
-      console.warn(e)
-    return
-
-  # Logs errors to js console, if present.
-  log_error: (e) ->
-    if window["console"]
-      console.error e
-    return
-
   getUrlParam: (name) ->
     results = new RegExp("[\\?&]" + name + "=([^&#]*)").exec(window.location.href)
     results[1] or 0  if results

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

@@ -23,7 +23,7 @@ Alchemy.I18n =
       else
         translation
     else
-      Alchemy.debug "Translations for locale #{Alchemy.locale} not found!"
+      console.warn "Translations for locale #{Alchemy.locale} not found!"
       key
 
 # Global utility method for translating a given string

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

@@ -18,18 +18,19 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     # attach events we handle
     @attachEvents()
     # Store some jQuery objects for further reference
-    @$page_anchor = $('#page_anchor', @dialog_body)
-    @$internal_urlname = $('#internal_urlname', @dialog_body)
-    @$internal_anchor = $('#internal_anchor', @dialog_body)
+    @$page_urlname = $('#page_urlname', @dialog_body)
+    @$element_anchor = $('#element_anchor', @dialog_body)
+    @$anchor_link = $('#anchor_link', @dialog_body)
     @$external_url = $('#external_url', @dialog_body)
     @$public_filename = $('#public_filename', @dialog_body)
     @$overlay_tabs = $('#overlay_tabs', @dialog_body)
     @$page_container = $('#page_selector_container')
-    @initInternalAnchors()
     # if we edit an existing link
     if @link_object
       # we select the correct tab
       @selectTab()
+    @initPageSelect()
+    @initAnchorLinks()
 
   # Attaches click events to several buttons in the link dialog.
   attachEvents: ->
@@ -42,8 +43,12 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
           url = @$external_url.val()
         when 'file'
           url = @$public_filename.val()
+        when 'anchor'
+          url = @$anchor_link.val()
         else
-          url = $("##{@link_type}_urlname").val()
+          url = @$page_urlname.val()
+          if @$element_anchor.val() != ''
+            url += "##{@$element_anchor.val()}"
       # Create the link
       @createLink
         url: url
@@ -51,38 +56,67 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
         target: $("##{@link_type}_link_target").val()
       false
 
-  # Attaches click events to buttons in the link dialog that appear after the
-  # page tree has finished loading.
-  attachTreeEvents: ->
-    # The select page and show elements links.
-    $('a.sitemap_pagename_link, a.show_elements_to_link', @dialog_body).click (e) =>
-      $this = $(e.currentTarget)
-      page_id = $this.data('page-id')
-      url = $this.data('url')
-      # Select page in page tree
-      @selectPage(page_id)
-      # if the show elements link was clicked
-      if $this.hasClass('show_elements_to_link')
-        # we open the elements select for that page
-        @showElementsSelect($this.attr('href'), url)
+  # Initializes the select2 based Page select
+  initPageSelect: ->
+    pageTemplate = HandlebarsTemplates.page
+    element_anchor_placeholder = @$element_anchor.attr('placeholder')
+    @$page_urlname.select2
+      placeholder: Alchemy.t('Search page')
+      allowClear: true
+      minimumInputLength: 3
+      ajax:
+        url: Alchemy.routes.api_pages_path
+        datatype: 'json'
+        quietMillis: 300
+        data: (term, page) ->
+          q:
+            name_cont: term
+          page: page
+        results: (data) ->
+          meta = data.meta
+          results:
+            data.pages.map (page) ->
+              id: "/#{page.urlname}"
+              name: page.name
+              urlname: page.urlname
+              page_id: page.id
+          more: meta.page * meta.per_page < meta.total_count
+      initSelection: ($element, callback) =>
+        urlname = $element.val()
+        $.get Alchemy.routes.api_pages_path,
+          q:
+            urlname_eq: urlname.replace(/^\//, '')
+          page: 1
+          per_page: 1,
+          (data) =>
+            page = data.pages[0]
+            if page
+              @initElementSelect(page.id)
+              callback
+                id: "/#{page.urlname}"
+                name: page.name
+                urlname: page.name
+                page_id: page.id
+      formatSelection: (page) ->
+        page.name
+      formatResult: (page) ->
+        pageTemplate(page: page)
+    .on 'change', (event) =>
+      if event.val == ''
+        @$element_anchor.val(element_anchor_placeholder)
+        @$element_anchor.select2('destroy').prop('disabled', true)
       else
-        # store url
-        @$internal_urlname.val('/' + url)
-      false
-    # Select the current page in the tree
-    @selectInternalLinkTab()
-
-  # Sets the page selected and scrolls it in the viewport.
-  selectPage: (page_id) ->
-    # deselect any selected page from page tree
-    @deselectPage()
-    # reset the internal anchor select
-    @$internal_anchor.select2('val', '')
-    $('#sitemap_sitename_' + page_id).addClass('selected_page')
-    @$page_container.scrollTo("#sitemap_sitename_#{page_id}", {duration: 400, offset: -10})
-
-  deselectPage: ->
-    $('#sitemap .selected_page', @dialog_body).removeClass('selected_page')
+        @$element_anchor.val('')
+        @initElementSelect(event.added.page_id)
+
+  # Initializes the select2 based elements select
+  # reveals after a page has been selected
+  initElementSelect: (page_id) ->
+    $.get Alchemy.routes.api_elements_path, page_id: page_id, (data) =>
+      @$element_anchor.prop('disabled', false).removeAttr('placeholder').select2
+        data: [ id: '', text: Alchemy.t('None') ].concat data.elements.map (element) ->
+          id: element.dom_id
+          text: element.display_name
 
   # Creates a link if no validation errors are present.
   # Otherwise shows an error notice.
@@ -149,57 +183,24 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
       # Handles a file link.
       tab = $('#overlay_tab_file_link')
       @$public_filename.select2('val', @$link[0].pathname + @$link[0].search)
+    else if @$link.attr('href').match(/^#/)
+      # Handles an anchor link.
+      tab = $('#overlay_tab_anchor_link')
+      @$anchor_link.select2('val', @$link.attr('href'))
     else
       # Handles an internal link.
       tab = $('#overlay_tab_internal_link')
+      @initInternalLinkTab()
     # activate the tab jquery ui 1.10 style o.O
     @$overlay_tabs.tabs('option', 'active', $('#overlay_tabs > div').index(tab))
 
   # Handles actions for internal link tab.
-  selectInternalLinkTab: ->
-    return unless @$link
+  initInternalLinkTab: ->
     url = @$link.attr('href').split('#')
-    urlname = url[0]
-    anchor = url[1]
-    if anchor
-      # store the anchor
-      @$page_anchor.val("##{anchor}")
-      # and update the url field
-      @$internal_urlname.val("#{urlname}##{anchor}")
-      # if we linked an internal anchor
-      if @$internal_urlname.val().match(/^#/)
-        # we select the correct value from anchors select
-        value = @$internal_urlname.val()
-        @$internal_anchor.select2 'val', value.replace(/^#/, '')
-    else
-      @$internal_urlname.val(urlname)
-    $sitemap_line = $('.sitemap_sitename').closest('[name="'+urlname+'"]')
-    if ($sitemap_line.length > 0)
-      # Select the line where the link was detected in.
-      $sitemap_line.addClass('selected_page')
-      @$page_container.scrollTo($sitemap_line.closest('li'), {duration: 400, offset: -10})
-
-  # Opens a new Dialog that shows the elements from given page_id in a selectbox.
-  # The value is stored as anchor and the url gets updated so it includes the anchor link
-  showElementsSelect: (show_elements_url, urlname) ->
-    dialog = new Alchemy.Dialog show_elements_url,
-      size: '400x165'
-      ready: =>
-        $element_select = $('.elements_from_page_selector')
-        # check if the urlname is the same as stored,
-        current_urlname = @$internal_urlname.val().split('#')[0]
-        if "/#{urlname}" == current_urlname
-          # then we can select the current anchor in the selectbox
-          $element_select.select2 'val', @$page_anchor.val()
-        $element_select.change =>
-          @$page_anchor.val $element_select.select2('val')
-        $('button', dialog.dialog_body).click =>
-          @$internal_urlname.val("/#{urlname}#{@$page_anchor.val()}")
-          dialog.close()
-          false
-        return
-    dialog.open()
-    return
+    # update the url field
+    @$page_urlname.val(url[0])
+    # store the anchor
+    @$element_anchor.val(url[1])
 
   # Creates a temporay $('a') object that holds all values on it.
   createTempLink: ->
@@ -225,20 +226,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     $('#errors', @dialog_body).show()
 
   # Populates the internal anchors select
-  initInternalAnchors: ->
+  initAnchorLinks: ->
     frame = document.getElementById('alchemy_preview_window')
     elements = frame.contentDocument.getElementsByTagName('*')
     if elements.length > 0
       for element in elements
         if element.id
-          @$internal_anchor.append("<option value='#{element.id}'>##{element.id}</option>")
+          @$anchor_link.append("<option value='##{element.id}'>##{element.id}</option>")
     else
-      @$internal_anchor.html("<option>#{Alchemy.t('No anchors found')}</option>")
-    @$internal_anchor.change (e) =>
-      # deselect any selected page from page tree
-      @deselectPage()
-      # store the internal anchor as urlname
-      $("#internal_urlname").val("##{e.target.value}")
+      @$anchor_link.html("<option>#{Alchemy.t('No anchors found')}</option>")
+    return
 
   # Public class methods