alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

data/spec/libraries/tinymce_spec.rb

@@ -50,6 +50,16 @@ module Alchemy
             should eq([])
           end
         end
+
+        context 'with a page given' do
+          let(:page) { mock_model('Page') }
+          subject { Tinymce.custom_config_contents(page) }
+
+          it "only returns custom tinymce config for elements of that page" do
+            expect(page).to receive(:element_definitions).and_return([element_definition])
+            should include({'element' => element_definition['name']}.merge(content_definition))
+          end
+        end
       end
     end
 

data/spec/models/element_spec.rb

@@ -367,6 +367,22 @@ module Alchemy
       it "should return the content for rss descdefinitionription" do
         element.content_for_rss_description.should == element.contents.find_by_name('body')
       end
+
+      context 'if no content is defined as rss title' do
+        before { element.stub(content_descriptions: []) }
+
+        it "should return nil" do
+          element.content_for_rss_title.should be_nil
+        end
+      end
+
+      context 'if no content is defined as rss description' do
+        before { element.stub(content_descriptions: []) }
+
+        it "should return nil" do
+          element.content_for_rss_description.should be_nil
+        end
+      end
     end
 
     describe '#update_contents' do

data/spec/models/legacy_page_url_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Alchemy::LegacyPageUrl do
+  let(:page) { build_stubbed(:page) }
+
+  let(:page_url_with_parameters) do
+    Alchemy::LegacyPageUrl.new(urlname: 'index.php?id=2', page: page)
+  end
+
+  let(:valid_page_url) do
+    Alchemy::LegacyPageUrl.new(urlname: 'my/0-work+is-nice_stuff', page: page)
+  end
+
+  it 'is only valid with correct urlname format' do
+    valid_page_url.should be_valid
+  end
+
+  it 'is also valid with get parameters in urlname' do
+    page_url_with_parameters.should be_valid
+  end
+end

data/spec/models/message_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 module Alchemy
+  Config.get(:mailer)['fields'].push('email_of_my_boss')
+  Config.get(:mailer)['validate_fields'].push('email_of_my_boss')
+
   describe Message do
     let(:message) { Message.new }
 
@@ -18,15 +21,28 @@ module Alchemy
       end
     end
 
-    it "validates attributes defined in mailer config" do
-      Config.get(:mailer)['validate_fields'].each do |field|
-        expect(message).to have(1).error_on(field)
+    context "validation of" do
+      context "all fields defined in mailer config" do
+        it "adds errors on that fields" do
+          Config.get(:mailer)['validate_fields'].each do |field|
+            expect(message).to have(1).error_on(field)
+          end
+        end
       end
-    end
 
-    it "validates email format" do
-      message.email = 'wrong email format'
-      expect(message.errors_on(:email)).to include("is invalid")
+      context 'field containing email in its name' do
+        context "when field has a value" do
+          it "adds error notice (is invalid) to the field" do
+            message.email_of_my_boss = 'wrong email format'
+            expect(message.errors_on(:email_of_my_boss)).to include("is invalid")
+          end
+        end
+        context "when field is blank" do
+          it "adds error notice (can't be blank) to the field" do
+            expect(message.errors_on(:email_of_my_boss)).to include("can't be blank")
+          end
+        end
+      end
     end
   end
 end

data/spec/models/page_spec.rb

@@ -33,13 +33,13 @@ module Alchemy
 
         it "should validate the page_layout" do
           contentpage.page_layout = nil
-          contentpage.save
+          contentpage.should_not be_valid
           contentpage.should have(1).error_on(:page_layout)
         end
 
         it "should validate the parent_id" do
           contentpage.parent_id = nil
-          contentpage.save
+          contentpage.should_not be_valid
           contentpage.should have(1).error_on(:parent_id)
         end
 
@@ -74,25 +74,41 @@ module Alchemy
       end
 
       context "creating the rootpage without parent_id and page_layout" do
+        let(:rootpage) { build(:page, parent_id: nil, page_layout: nil, name: 'Rootpage') }
+
         before do
           Page.delete_all
-          @rootpage = FactoryGirl.build(:page, :parent_id => nil, :page_layout => nil, :name => 'Rootpage')
         end
 
         it "should be valid" do
-          @rootpage.save
-          @rootpage.should be_valid
+          rootpage.should be_valid
         end
       end
 
       context "saving a systempage" do
-        before do
-          @systempage = FactoryGirl.build(:systempage)
-        end
+        let(:systempage) { build(:systempage) }
 
         it "should not validate the page_layout" do
-          @systempage.save
-          @systempage.should be_valid
+          systempage.should be_valid
+        end
+      end
+
+      context 'saving an external page' do
+        let(:external_page) { build(:page, page_layout: 'external') }
+
+        it "does not pass with invalid url given" do
+          external_page.urlname = 'not, a valid page url'
+          expect(external_page).to_not be_valid
+        end
+
+        it "only be valid with correct url given" do
+          external_page.urlname = 'www.google.com&utf_src=alchemy;page_id=%20'
+          expect(external_page).to be_valid
+        end
+
+        it "only be valid with urlname given" do
+          external_page.urlname = ''
+          expect(external_page).to_not be_valid
         end
       end
     end
@@ -155,6 +171,27 @@ module Alchemy
         end
       end
 
+      context 'after_move' do
+        let(:parent_1) { FactoryGirl.create(:page, name: 'Parent 1', visible: true) }
+        let(:parent_2) { FactoryGirl.create(:page, name: 'Parent 2', visible: true) }
+        let(:page)     { FactoryGirl.create(:page, parent_id: parent_1.id, name: 'Page', visible: true) }
+
+        it "updates the urlname" do
+          page.urlname.should == 'parent-1/page'
+          page.move_to_child_of parent_2
+          page.urlname.should == 'parent-2/page'
+        end
+
+        context 'of an external page' do
+          let(:external) { FactoryGirl.create(:page, parent_id: parent_1.id, name: 'external', page_layout: 'external', urlname: 'http://google.com') }
+
+          it "the urlname does not get updated" do
+            external.move_to_child_of parent_2
+            external.urlname.should == 'http://google.com'
+          end
+        end
+      end
+
       context "a normal page" do
         before do
           @page = FactoryGirl.build(:page, :language_code => nil, :language => klingonian, :do_not_autogenerate => false)
@@ -998,6 +1035,7 @@ module Alchemy
       describe '#previous' do
         it "should return the previous page on the same level" do
           center_page.previous.should == public_page
+          next_page.previous.should == center_page
         end
 
         context "no previous page on same level present" do
@@ -1159,6 +1197,7 @@ module Alchemy
       let(:page)         { FactoryGirl.create(:page, parent_id: parent.id, name: 'page', visible: true) }
       let(:invisible)    { FactoryGirl.create(:page, parent_id: page.id, name: 'invisible', visible: false) }
       let(:contact)      { FactoryGirl.create(:page, parent_id: invisible.id, name: 'contact', visible: true) }
+      let(:external)     { FactoryGirl.create(:page, parent_id: parent.id, name: 'external', page_layout: 'external', urlname: 'http://google.com') }
 
       context "with activated url_nesting" do
         before { Config.stub(:get).and_return(true) }
@@ -1179,8 +1218,8 @@ module Alchemy
           contact.urlname.should_not =~ /invisible/
         end
 
-        context "after changing my urlname" do
-          it "should update urlnames of descendants" do
+        context "after changing page's urlname" do
+          it "updates urlnames of descendants" do
             page
             parentparent.urlname = 'new-urlname'
             parentparent.save!
@@ -1188,6 +1227,16 @@ module Alchemy
             page.urlname.should == 'new-urlname/parent/page'
           end
 
+          context 'with descendants that are redirecting to external' do
+            it "it skips this page" do
+              external
+              parent.urlname = 'new-urlname'
+              parent.save!
+              external.reload
+              external.urlname.should == 'http://google.com'
+            end
+          end
+
           it "should create a legacy url" do
             page.stub(:slug).and_return('foo')
             page.update_urlname!
@@ -1242,6 +1291,34 @@ module Alchemy
       end
     end
 
+    describe '#external_urlname' do
+      let(:external_page) { build(:page, page_layout: 'external') }
+
+      context 'with missing protocol' do
+        before { external_page.urlname = 'google.com'}
+
+        it "returns an urlname prefixed with http://" do
+          expect(external_page.external_urlname).to eq 'http://google.com'
+        end
+      end
+
+      context 'with protocol present' do
+        before { external_page.urlname = 'ftp://google.com'}
+
+        it "returns the urlname" do
+          expect(external_page.external_urlname).to eq 'ftp://google.com'
+        end
+      end
+
+      context 'beginngin with a slash' do
+        before { external_page.urlname = '/internal-url'}
+
+        it "returns the urlname" do
+          expect(external_page.external_urlname).to eq '/internal-url'
+        end
+      end
+    end
+
     context 'page status methods' do
       let(:page) { FactoryGirl.build(:page, public: true, visible: true, restricted: false, locked: false)}
 

data/vendor/assets/javascripts/tinymce/plugins/anchor/plugin.min.js

@@ -0,0 +1 @@
+tinymce.PluginManager.add("anchor",function(n){function e(){var e=n.selection.getNode();n.windowManager.open({title:"Anchor",body:{type:"textbox",name:"name",size:40,label:"Name",value:e.name||e.id},onsubmit:function(e){n.execCommand("mceInsertContent",!1,n.dom.createHTML("a",{id:e.data.name}))}})}n.addButton("anchor",{icon:"anchor",tooltip:"Anchor",onclick:e,stateSelector:"a:not([href])"}),n.addMenuItem("anchor",{icon:"anchor",text:"Anchor",context:"insert",onclick:e})});

data/vendor/assets/javascripts/tinymce/plugins/hr/plugin.min.js

@@ -0,0 +1 @@
+tinymce.PluginManager.add("hr",function(n){n.addCommand("InsertHorizontalRule",function(){n.execCommand("mceInsertContent",!1,"<hr />")}),n.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),n.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,376 +12,376 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc.2
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: sassy-buttons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: tvdeyen-handles_sortable_columns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: spinner.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: non-stupid-digest-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.
@@ -392,10 +392,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -417,6 +417,7 @@ files:
 - app/assets/javascripts/alchemy/alchemy.base.js.coffee
 - app/assets/javascripts/alchemy/alchemy.browser.js.coffee
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
+- app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
 - app/assets/javascripts/alchemy/alchemy.custom.js
 - app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
@@ -440,11 +441,10 @@ files:
 - app/assets/javascripts/alchemy/alchemy.page_sorter.js
 - app/assets/javascripts/alchemy/alchemy.preview.js.coffee
 - app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee
-- app/assets/javascripts/alchemy/alchemy.routes.js.erb
 - app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
 - app/assets/javascripts/alchemy/alchemy.spinner.js.coffee
 - app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee
-- app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb
+- app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee
 - app/assets/javascripts/alchemy/alchemy.translations.js.coffee
 - app/assets/javascripts/alchemy/alchemy.uploader.js.coffee
 - app/assets/javascripts/alchemy/alchemy.windows.js.coffee
@@ -509,6 +509,7 @@ files:
 - app/controllers/alchemy/admin/essence_pictures_controller.rb
 - app/controllers/alchemy/admin/languages_controller.rb
 - app/controllers/alchemy/admin/layoutpages_controller.rb
+- app/controllers/alchemy/admin/legacy_page_urls_controller.rb
 - app/controllers/alchemy/admin/pages_controller.rb
 - app/controllers/alchemy/admin/pictures_controller.rb
 - app/controllers/alchemy/admin/resources_controller.rb
@@ -563,12 +564,12 @@ files:
 - app/models/alchemy/legacy_page_url.rb
 - app/models/alchemy/message.rb
 - app/models/alchemy/page.rb
-- app/models/alchemy/page/cells.rb
-- app/models/alchemy/page/elements.rb
-- app/models/alchemy/page/naming.rb
-- app/models/alchemy/page/natures.rb
-- app/models/alchemy/page/scopes.rb
-- app/models/alchemy/page/users.rb
+- app/models/alchemy/page/page_cells.rb
+- app/models/alchemy/page/page_elements.rb
+- app/models/alchemy/page/page_naming.rb
+- app/models/alchemy/page/page_natures.rb
+- app/models/alchemy/page/page_scopes.rb
+- app/models/alchemy/page/page_users.rb
 - app/models/alchemy/picture.rb
 - app/models/alchemy/picture/sweeping.rb
 - app/models/alchemy/site.rb
@@ -619,6 +620,7 @@ files:
 - app/views/alchemy/admin/dashboard/help.html.erb
 - app/views/alchemy/admin/dashboard/index.html.erb
 - app/views/alchemy/admin/dashboard/info.html.erb
+- app/views/alchemy/admin/elements/_add_element_button.html.erb
 - app/views/alchemy/admin/elements/_add_picture.html.erb
 - app/views/alchemy/admin/elements/_element.html.erb
 - app/views/alchemy/admin/elements/_element_foot.html.erb
@@ -647,16 +649,28 @@ files:
 - app/views/alchemy/admin/languages/_table.html.erb
 - app/views/alchemy/admin/languages/index.html.erb
 - app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
+- app/views/alchemy/admin/layoutpages/edit.html.erb
 - app/views/alchemy/admin/layoutpages/index.html.erb
+- app/views/alchemy/admin/legacy_page_urls/_form.html.erb
+- app/views/alchemy/admin/legacy_page_urls/_label.html.erb
+- app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb
+- app/views/alchemy/admin/legacy_page_urls/_new.html.erb
+- app/views/alchemy/admin/legacy_page_urls/create.js.erb
+- app/views/alchemy/admin/legacy_page_urls/destroy.js.erb
+- app/views/alchemy/admin/legacy_page_urls/update.js.erb
 - app/views/alchemy/admin/pages/_create_language_form.html.erb
 - app/views/alchemy/admin/pages/_external_link.html.erb
 - app/views/alchemy/admin/pages/_file_link.html.erb
+- app/views/alchemy/admin/pages/_form.html.erb
 - app/views/alchemy/admin/pages/_internal_link.html.erb
+- app/views/alchemy/admin/pages/_legacy_urls.html.erb
+- app/views/alchemy/admin/pages/_locked_page.html.erb
 - app/views/alchemy/admin/pages/_new_page_form.html.erb
 - app/views/alchemy/admin/pages/_page.html.erb
 - app/views/alchemy/admin/pages/_page_for_links.html.erb
 - app/views/alchemy/admin/pages/_page_status.html.erb
 - app/views/alchemy/admin/pages/_sitemap.html.erb
+- app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb
 - app/views/alchemy/admin/pages/configure.html.erb
 - app/views/alchemy/admin/pages/configure_external.html.erb
 - app/views/alchemy/admin/pages/destroy.js.erb
@@ -678,6 +692,7 @@ files:
 - app/views/alchemy/admin/partials/_language_tree_select.html.erb
 - app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
 - app/views/alchemy/admin/partials/_remote_search_form.html.erb
+- app/views/alchemy/admin/partials/_routes.html.erb
 - app/views/alchemy/admin/partials/_search_form.html.erb
 - app/views/alchemy/admin/partials/_sub_navigation.html.erb
 - app/views/alchemy/admin/partials/_toolbar_button.html.erb
@@ -940,7 +955,9 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
+- spec/features/admin/legacy_page_url_management_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
@@ -1011,10 +1028,10 @@ files:
 - spec/models/essence_select_spec.rb
 - spec/models/essence_text_spec.rb
 - spec/models/language_spec.rb
+- spec/models/legacy_page_url_spec.rb
 - spec/models/message_spec.rb
 - spec/models/page_spec.rb
 - spec/models/picture_spec.rb
-- spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/tag_spec.rb
 - spec/routing/routing_spec.rb
@@ -1048,11 +1065,13 @@ files:
 - vendor/assets/javascripts/tinymce/langs/de.js
 - vendor/assets/javascripts/tinymce/langs/nl.js
 - vendor/assets/javascripts/tinymce/license.txt
+- vendor/assets/javascripts/tinymce/plugins/anchor/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/autoresize/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/charmap/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/code/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/directionality/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/fullscreen/plugin.min.js
+- vendor/assets/javascripts/tinymce/plugins/hr/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/link/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/paste/plugin.min.js
 - vendor/assets/javascripts/tinymce/plugins/tabfocus/plugin.min.js
@@ -1083,18 +1102,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
@@ -1176,7 +1195,9 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
+- spec/features/admin/legacy_page_url_management_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
@@ -1247,10 +1268,10 @@ test_files:
 - spec/models/essence_select_spec.rb
 - spec/models/essence_text_spec.rb
 - spec/models/language_spec.rb
+- spec/models/legacy_page_url_spec.rb
 - spec/models/message_spec.rb
 - spec/models/page_spec.rb
 - spec/models/picture_spec.rb
-- spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/tag_spec.rb
 - spec/routing/routing_spec.rb