alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,91 +1,91 @@
 module Alchemy
-	module Admin
-		class EssencePicturesController < Alchemy::Admin::BaseController
+  module Admin
+    class EssencePicturesController < Alchemy::Admin::BaseController
 
-			helper "alchemy/admin/contents"
+      helper "alchemy/admin/contents"
 
-			def edit
-				@essence_picture = EssencePicture.find(params[:id])
-				@content = Content.find(params[:content_id])
-				@options = params[:options] || {}
-				render :layout => false
-			end
+      def edit
+        @essence_picture = EssencePicture.find(params[:id])
+        @content = Content.find(params[:content_id])
+        @options = params[:options] || {}
+        render :layout => false
+      end
 
-			def crop
-				@essence_picture = EssencePicture.find(params[:id])
-				if @essence_picture.picture
-					@content = @essence_picture.content
-					@options = params[:options] || {}
-					@options[:format] ||= (configuration(:image_store_format) or 'png')
-					if @essence_picture.render_size.blank?
-						if @options[:image_size].blank?
-							@size_x, @size_y = 0, 0
-						else
-							@size_x, @size_y = @options[:image_size].split('x')[0], @options[:image_size].split('x')[1]
-						end
-					else
-						@size_x, @size_y = @essence_picture.render_size.split('x')[0], @essence_picture.render_size.split('x')[1]
-					end
-					if @essence_picture.crop_from.blank? && @essence_picture.crop_size.blank?
-						@initial_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
-						@default_box = @initial_box
-					else
-						@initial_box = {
-							:x1 => @essence_picture.crop_from.split('x')[0].to_i,
-							:y1 => @essence_picture.crop_from.split('x')[1].to_i,
-							:x2 => @essence_picture.crop_from.split('x')[0].to_i + @essence_picture.crop_size.split('x')[0].to_i,
-							:y2 => @essence_picture.crop_from.split('x')[1].to_i + @essence_picture.crop_size.split('x')[1].to_i
-						}
-						@default_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
-					end
-					@ratio = @options[:fixed_ratio] == 'false' ? false : (@size_x.to_f / @size_y.to_f)
-				else
-					@no_image_notice = t('No image found. Did you saved the element?')
-				end
-				render :layout => false
-			end
+      def crop
+        @essence_picture = EssencePicture.find(params[:id])
+        if @essence_picture.picture
+          @content = @essence_picture.content
+          @options = params[:options] || {}
+          @options[:format] ||= (configuration(:image_store_format) or 'png')
+          if @essence_picture.render_size.blank?
+            if @options[:image_size].blank?
+              @size_x, @size_y = 0, 0
+            else
+              @size_x, @size_y = @options[:image_size].split('x')[0], @options[:image_size].split('x')[1]
+            end
+          else
+            @size_x, @size_y = @essence_picture.render_size.split('x')[0], @essence_picture.render_size.split('x')[1]
+          end
+          if @essence_picture.crop_from.blank? && @essence_picture.crop_size.blank?
+            @initial_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
+            @default_box = @initial_box
+          else
+            @initial_box = {
+              :x1 => @essence_picture.crop_from.split('x')[0].to_i,
+              :y1 => @essence_picture.crop_from.split('x')[1].to_i,
+              :x2 => @essence_picture.crop_from.split('x')[0].to_i + @essence_picture.crop_size.split('x')[0].to_i,
+              :y2 => @essence_picture.crop_from.split('x')[1].to_i + @essence_picture.crop_size.split('x')[1].to_i
+            }
+            @default_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
+          end
+          @ratio = @options[:fixed_ratio] == 'false' ? false : (@size_x.to_f / @size_y.to_f)
+        else
+          @no_image_notice = t('No image found. Did you saved the element?')
+        end
+        render :layout => false
+      end
 
-			def update
-				@essence_picture = EssencePicture.find(params[:id])
-				@essence_picture.update_attributes(params[:essence_picture], :as => current_user.role.to_sym)
-				@content = Content.find(params[:content_id])
-			end
+      def update
+        @essence_picture = EssencePicture.find(params[:id])
+        @essence_picture.update_attributes(params[:essence_picture], :as => current_user.role.to_sym)
+        @content = Content.find(params[:content_id])
+      end
 
-			def assign
-				@content = Content.find(params[:id])
-				@picture = Picture.find(params[:picture_id])
-				@content.essence.picture = @picture
-				@options = params[:options] || {}
-				@element = @content.element
-				@dragable = @options[:grouped]
-				# If options params come from Flash uploader then we have to parse them as hash.
-				if @options.is_a?(String)
-					@options = Rack::Utils.parse_query(@options)
-				end
-				@options = @options.merge(
-					:dragable => @dragable
-				)
-			end
+      def assign
+        @content = Content.find(params[:id])
+        @picture = Picture.find(params[:picture_id])
+        @content.essence.picture = @picture
+        @options = params[:options] || {}
+        @element = @content.element
+        @dragable = @options[:grouped]
+        # If options params come from Flash uploader then we have to parse them as hash.
+        if @options.is_a?(String)
+          @options = Rack::Utils.parse_query(@options)
+        end
+        @options = @options.merge(
+          :dragable => @dragable
+        )
+      end
 
-			def save_link
-				@content = Content.find(params[:id])
-				@picture_essence = @content.essence
-				@picture_essence.link = params[:link]
-				@picture_essence.link_title = params[:title]
-				@picture_essence.open_link_in_new_window = params[:blank]
-				@notice = t("saved_link")
-				@picture_essence.save
-			end
+      def save_link
+        @content = Content.find(params[:id])
+        @picture_essence = @content.essence
+        @picture_essence.link = params[:link]
+        @picture_essence.link_title = params[:title]
+        @picture_essence.open_link_in_new_window = params[:blank]
+        @notice = t("saved_link")
+        @picture_essence.save
+      end
 
-			def destroy
-				content = Content.find_by_id(params[:id])
-				@element = content.element
-				@content_id = content.id
-				content.destroy
-				@essence_pictures = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
-				@options = params[:options]
-			end
+      def destroy
+        content = Content.find_by_id(params[:id])
+        @element = content.element
+        @content_id = content.id
+        content.destroy
+        @essence_pictures = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
+        @options = params[:options]
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,12 +1,12 @@
 module Alchemy
-	module Admin
-		class EssenceVideosController < Alchemy::Admin::BaseController
+  module Admin
+    class EssenceVideosController < Alchemy::Admin::BaseController
 
-			def update
-				@essence_video = EssenceVideo.find(params[:id])
-				@essence_video.update_attributes(params[:essence_video], :as => current_user.role.to_sym)
-			end
+      def update
+        @essence_video = EssenceVideo.find(params[:id])
+        @essence_video.update_attributes(params[:essence_video], :as => current_user.role.to_sym)
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,7 +1,19 @@
 module Alchemy
-	module Admin
-		class LanguagesController < Alchemy::Admin::ResourcesController
+  module Admin
+    class LanguagesController < Alchemy::Admin::ResourcesController
 
-		end
-	end
+      def new
+        @language = Alchemy::Language.new
+        @language.page_layout = (configured_page_layout or @language.page_layout)
+        render :layout => !request.xhr?
+      end
+
+      protected
+
+      def configured_page_layout
+        Alchemy::Config.get(:default_language).try('[]', 'page_layout')
+      end
+
+    end
+  end
 end

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

@@ -1,13 +1,13 @@
 module Alchemy
-	module Admin
-		class LayoutpagesController < Alchemy::Admin::BaseController
+  module Admin
+    class LayoutpagesController < Alchemy::Admin::BaseController
 
-			def index
-				@locked_pages = Page.all_locked_by(current_user)
-				@layout_root = Page.find_or_create_layout_root_for(session[:language_id])
-				@languages = Language.all
-			end
+      def index
+        @locked_pages = Page.all_locked_by(current_user)
+        @layout_root = Page.find_or_create_layout_root_for(session[:language_id])
+        @languages = Language.all
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,278 +1,279 @@
 module Alchemy
-	module Admin
-		class PagesController < Alchemy::Admin::BaseController
+  module Admin
+    class PagesController < Alchemy::Admin::BaseController
 
-			helper "alchemy/pages"
+      helper "alchemy/pages"
 
-			before_filter :set_translation, :except => [:show]
+      before_filter :set_translation, :except => [:show]
 
-			filter_access_to [:show, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :get_page_from_id, :model => Alchemy::Page
-			filter_access_to [:index, :link, :layoutpages, :new, :switch_language, :create, :move, :flush], :attribute_check => false
+      filter_access_to [:show, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :get_page_from_id, :model => Alchemy::Page
+      filter_access_to [:index, :link, :layoutpages, :new, :switch_language, :create, :move, :flush], :attribute_check => false
 
-			cache_sweeper Alchemy::PagesSweeper, :only => [:publish], :if => proc { Alchemy::Config.get(:cache_pages) }
+      cache_sweeper Alchemy::PagesSweeper, :only => [:publish], :if => proc { Alchemy::Config.get(:cache_pages) }
 
-			def index
-				@page_root = Page.language_root_for(session[:language_id])
-				@locked_pages = Page.all_locked_by(current_user)
-				@languages = Language.all
-				if !@page_root
-					if @languages.length == 1
-						@language = @languages.first
-						store_language_in_session(@language)
-					else
-						@language = @languages.find { |language| language.id == session[:language_id] }
-					end
-					@languages_with_page_tree = Language.all_for_created_language_trees if @language
-				end
-			end
+      def index
+        @page_root = Page.language_root_for(session[:language_id])
+        @locked_pages = Page.all_locked_by(current_user)
+        @languages = Language.all
+        if !@page_root
+          if @languages.length == 1
+            @language = @languages.first
+            store_language_in_session(@language)
+          else
+            @language = @languages.find { |language| language.id == session[:language_id] }
+          end
+          @languages_with_page_tree = Language.all_for_created_language_trees if @language
+        end
+      end
 
-			def show
-				# fetching page via before filter
-				@preview_mode = true
-				@root_page = Page.language_root_for(session[:language_id])
-				# Setting the locale to pages language. so the page content has its correct translation
-				::I18n.locale = @page.language_code
-				render :layout => layout_for_page
-			end
+      def show
+        # fetching page via before filter
+        @preview_mode = true
+        @root_page = Page.language_root_for(session[:language_id])
+        # Setting the locale to pages language. so the page content has its correct translation
+        ::I18n.locale = @page.language_code
+        render :layout => layout_for_page
+      end
 
-			def new
-				@page = Page.new(:layoutpage => params[:layoutpage] == 'true', :parent_id => params[:parent_id])
-				@page_layouts = PageLayout.get_layouts_for_select(session[:language_id], @page.layoutpage?)
-				@clipboard_items = Page.all_from_clipboard_for_select(get_clipboard('pages'), session[:language_id], @page.layoutpage?)
-				render :layout => false
-			end
+      def new
+        @page = Page.new(:layoutpage => params[:layoutpage] == 'true', :parent_id => params[:parent_id])
+        @page_layouts = PageLayout.get_layouts_for_select(session[:language_id], @page.layoutpage?)
+        @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard('pages'), session[:language_id], @page.layoutpage?)
+        render :layout => false
+      end
 
-			def create
-				parent = Page.find_by_id(params[:page][:parent_id]) || Page.root
-				params[:page][:language_id] ||= parent.language ? parent.language.id : Language.get_default.id
-				params[:page][:language_code] ||= parent.language ? parent.language.code : Language.get_default.code
-				if !params[:paste_from_clipboard].blank?
-					source_page = Page.find(params[:paste_from_clipboard])
-					page = Page.copy(source_page, {
-						:name => params[:page][:name].blank? ? source_page.name + ' (' + t('Copy') + ')' : params[:page][:name],
-						:urlname => '',
-						:title => '',
-						:parent_id => params[:page][:parent_id],
-						:language => parent.language
-					})
-					source_page.copy_children_to(page) unless source_page.children.blank?
-				else
-					page = Page.create(params[:page], :as => current_user.role.to_sym)
-				end
-				render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created", :name => page.name), '#alchemyOverlay button.button')
-			end
+      def create
+        parent = Page.find_by_id(params[:page][:parent_id]) || Page.root
+        params[:page][:language_id] ||= parent.language ? parent.language.id : Language.get_default.id
+        params[:page][:language_code] ||= parent.language ? parent.language.code : Language.get_default.code
+        if !params[:paste_from_clipboard].blank?
+          source_page = Page.find(params[:paste_from_clipboard])
+          page = Page.copy(source_page, {
+            :name => params[:page][:name].blank? ? source_page.name + ' (' + t('Copy') + ')' : params[:page][:name],
+            :urlname => '',
+            :title => '',
+            :parent_id => params[:page][:parent_id],
+            :language => parent.language
+          })
+          source_page.copy_children_to(page) unless source_page.children.blank?
+        else
+          page = Page.create(params[:page], :as => current_user.role.to_sym)
+        end
+        render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created", :name => page.name), 'form#new_page_form button.button')
+      end
 
-			# Edit the content of the page and all its elements and contents.
-			def edit
-				# fetching page via before filter
-				if @page.locked? && @page.locker && @page.locker.logged_in? && @page.locker != current_user
-					flash[:notice] = t("This page is locked by %{name}", :name => (@page.locker.name rescue t('unknown')))
-					redirect_to admin_pages_path
-				else
-					@page.lock(current_user)
-					@locked_pages = Page.all_locked_by(current_user)
-				end
-				@layoutpage = @page.layoutpage?
-			end
+      # Edit the content of the page and all its elements and contents.
+      def edit
+        # fetching page via before filter
+        if @page.locked? && @page.locker && @page.locker.logged_in? && @page.locker != current_user
+          flash[:notice] = t("This page is locked by %{name}", :name => (@page.locker.name rescue t('unknown')))
+          redirect_to admin_pages_path
+        else
+          @page.lock(current_user)
+          @locked_pages = Page.all_locked_by(current_user)
+        end
+        @layoutpage = @page.layoutpage?
+      end
 
-			# Set page configuration like page names, meta tags and states.
-			def configure
-				# fetching page via before filter
-				if @page.redirects_to_external?
-					render :action => 'configure_external', :layout => false
-				else
-					render :layout => false
-				end
-			end
+      # Set page configuration like page names, meta tags and states.
+      def configure
+        # fetching page via before filter
+        if @page.redirects_to_external?
+          render :action => 'configure_external', :layout => false
+        else
+          render :layout => false
+        end
+      end
 
-			def update
-				# fetching page via before filter
-				if @page.update_attributes(params[:page], :as => current_user.role.to_sym)
-					@notice = t("Page saved", :name => @page.name)
-					@while_page_edit = request.referer.include?('edit')
-				else
-					render_remote_errors(@page, '#alchemyOverlay button.button')
-				end
-			end
+      def update
+        # fetching page via before filter
+        if @page.update_attributes(params[:page], :as => current_user.role.to_sym)
+          @notice = t("Page saved", :name => @page.name)
+          @while_page_edit = request.referer.include?('edit')
+        else
+          render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
+        end
+      end
 
-			def destroy
-				# fetching page via before filter
-				name = @page.name
-				@page_id = @page.id
-				@layoutpage = @page.layoutpage?
-				session[:language_id] = @page.language_id
-				if @page.destroy
-					@page_root = Page.language_root_for(session[:language_id])
-					get_clipboard('pages').delete(@page.id)
-					@message = t("Page deleted", :name => name)
-					flash[:notice] = @message
-					respond_to do |format|
-						format.js
-					end
-				end
-			end
+      def destroy
+        # fetching page via before filter
+        name = @page.name
+        @page_id = @page.id
+        @layoutpage = @page.layoutpage?
+        session[:language_id] = @page.language_id
+        if @page.destroy
+          @page_root = Page.language_root_for(session[:language_id])
+          get_clipboard('pages').delete(@page.id)
+          @message = t("Page deleted", :name => name)
+          flash[:notice] = @message
+          respond_to do |format|
+            format.js
+          end
+        end
+      end
 
-			def link
-				@url_prefix = ""
-				if configuration(:show_real_root)
-					@page_root = Page.root
-				else
-					@page_root = Page.language_root_for(session[:language_id])
-				end
-				@area_name = params[:area_name]
-				@content_id = params[:content_id]
-				@link_target_options = Page.link_target_options
-				@attachments = Attachment.all.collect{ |f| [f.name, download_attachment_path(:id => f.id, :name => f.name)] }
-				if params[:link_urls_for] == "newsletter"
-					# TODO: links in newsletters has to go through statistic controller. therfore we have to put a string inside the content_rtfs and replace this string with recipient.id before sending the newsletter.
-					#@url_prefix = "#{current_server}/recipients/reacts"
-					@url_prefix = current_server
-				end
-				if multi_language?
-					@url_prefix = "#{session[:language_code]}/"
-				end
-				render :layout => false
-			end
+      def link
+        @url_prefix = ""
+        if configuration(:show_real_root)
+          @page_root = Page.root
+        else
+          @page_root = Page.language_root_for(session[:language_id])
+        end
+        @area_name = params[:area_name]
+        @content_id = params[:content_id]
+        @link_target_options = Page.link_target_options
+        @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(:id => f.id, :name => f.name)] }
+        if params[:link_urls_for] == "newsletter"
+          # TODO: links in newsletters has to go through statistic controller. therfore we have to put a string inside the content_rtfs and replace this string with recipient.id before sending the newsletter.
+          #@url_prefix = "#{current_server}/recipients/reacts"
+          @url_prefix = current_server
+        end
+        if multi_language?
+          @url_prefix = "#{session[:language_code]}/"
+        end
+        render :layout => false
+      end
 
-			def fold
-				# @page is fetched via before filter
-				@page.fold(current_user.id, !@page.folded?(current_user.id))
-				@page.save
-				respond_to do |format|
-					format.js
-				end
-			end
+      def fold
+        # @page is fetched via before filter
+        @page.fold(current_user.id, !@page.folded?(current_user.id))
+        @page.save
+        respond_to do |format|
+          format.js
+        end
+      end
 
-			# Leaves the page editing mode and unlocks the page for other users
-			def unlock
-				# fetching page via before filter
-				@page.unlock
-				flash[:notice] = t("unlocked_page", :name => @page.name)
-				@pages_locked_by_user = Page.all_locked_by(current_user)
-				respond_to do |format|
-					format.js
-					format.html {
-						redirect_to params[:redirect_to].blank? ? admin_pages_path : params[:redirect_to]
-					}
-				end
-			end
+      # Leaves the page editing mode and unlocks the page for other users
+      def unlock
+        # fetching page via before filter
+        @page.unlock
+        flash[:notice] = t("unlocked_page", :name => @page.name)
+        @pages_locked_by_user = Page.all_locked_by(current_user)
+        respond_to do |format|
+          format.js
+          format.html {
+            redirect_to params[:redirect_to].blank? ? admin_pages_path : params[:redirect_to]
+          }
+        end
+      end
 
-			def visit
-				@page.unlock
-				redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
-			end
+      def visit
+        @page.unlock
+        redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+      end
 
-			# Sets the page public and sweeps the page cache
-			def publish
-				# fetching page via before filter
-				@page.public = true
-				@page.save
-				flash[:notice] = t("page_published", :name => @page.name)
-				redirect_back_or_to_default(admin_pages_path)
-			end
+      # Sets the page public and sweeps the page cache
+      def publish
+        # fetching page via before filter
+        @page.public = true
+        @page.save
+        flash[:notice] = t("page_published", :name => @page.name)
+        redirect_back_or_to_default(admin_pages_path)
+      end
 
-			def copy_language_tree
-				# copy language root from old to new language
-				if params[:layoutpage]
-					original_language_root = Page.layout_root_for(params[:languages][:old_lang_id])
-				else
-					original_language_root = Page.language_root_for(params[:languages][:old_lang_id])
-				end
-				new_language_root = Page.copy(
-					original_language_root,
-					:language_id => params[:languages][:new_lang_id],
-					:language_code => session[:language_code]
-				)
-				new_language_root.move_to_child_of Page.root
-				original_language_root.copy_children_to(new_language_root)
-				flash[:notice] = t('language_pages_copied')
-				redirect_to params[:layoutpage] == "true" ? admin_layoutpages_path : :action => :index
-			end
+      def copy_language_tree
+        # copy language root from old to new language
+        if params[:layoutpage]
+          original_language_root = Page.layout_root_for(params[:languages][:old_lang_id])
+        else
+          original_language_root = Page.language_root_for(params[:languages][:old_lang_id])
+        end
+        new_language_root = Page.copy(
+          original_language_root,
+          :language_id => params[:languages][:new_lang_id],
+          :language_code => session[:language_code],
+          :layoutpage => params[:layoutpage]
+        )
+        new_language_root.move_to_child_of Page.root
+        original_language_root.copy_children_to(new_language_root)
+        flash[:notice] = t('language_pages_copied')
+        redirect_to params[:layoutpage] == "true" ? admin_layoutpages_path : :action => :index
+      end
 
-			def sort
-				@page_root = Page.language_root_for(session[:language_id])
-				@sorting = true
-			end
+      def sort
+        @page_root = Page.language_root_for(session[:language_id])
+        @sorting = true
+      end
 
-			def order
-				@page_root = Page.language_root_for(session[:language_id])
-				
-				# Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
-				neworder = JSON.parse(params[:set])
-				prev_item = nil
-				neworder.each do |item|
-					dbitem = Page.find(item['id'])
-					prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
-					sort_children(item, dbitem) unless item['children'].nil?
-					prev_item = dbitem.reload
-				end
-				
-				flash[:notice] = t("Pages order saved")
-				@redirect_url = admin_pages_path
-				render :action => :redirect
-			end
+      def order
+        @page_root = Page.language_root_for(session[:language_id])
 
-			def switch_language
-				set_language_from(params[:language_id])
-				redirect_path = request.referer.include?('admin/layoutpages') ? admin_layoutpages_path : admin_pages_path
-				if request.xhr?
-					@redirect_url = redirect_path
-					render :action => :redirect
-				else
-					redirect_to redirect_path
-				end
-			end
+        # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+        neworder = JSON.parse(params[:set])
+        prev_item = nil
+        neworder.each do |item|
+          dbitem = Page.find(item['id'])
+          prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
+          sort_children(item, dbitem) unless item['children'].nil?
+          prev_item = dbitem.reload
+        end
 
-			def flush
-				Page.with_language(session[:language_id]).flushables.each do |page|
-					expire_page(page)
-				end
-				respond_to do |format|
-					format.js
-				end
-			end
+        flash[:notice] = t("Pages order saved")
+        @redirect_url = admin_pages_path
+        render :action => :redirect
+      end
 
-		private
+      def switch_language
+        set_language_from(params[:language_id])
+        redirect_path = request.referer.include?('admin/layoutpages') ? admin_layoutpages_path : admin_pages_path
+        if request.xhr?
+          @redirect_url = redirect_path
+          render :action => :redirect
+        else
+          redirect_to redirect_path
+        end
+      end
 
-			def get_page_from_id
-				@page ||= Page.find(params[:id])
-			end
+      def flush
+        Page.with_language(session[:language_id]).flushables.each do |page|
+          expire_page(page)
+        end
+        respond_to do |format|
+          format.js
+        end
+      end
 
-			def pages_from_raw_request
-				request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
-			end
+      private
 
-			def expire_page(page)
-				return if page.do_not_sweep
-				# TODO: We should change this back to expire_action after Rails 3.2 was released.
-				# expire_action(
-				# 	alchemy.show_page_url(
-				# 		:urlname => page.urlname_was,
-				# 		:lang => multi_language? ? page.language_code : nil
-				# 	)
-				# )
-				# Temporarily fix for Rails 3 bug
-				expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
-					self,
-					alchemy.show_page_url(
-						:urlname => page.urlname_was,
-						:lang => multi_language? ? page.language_code : nil
-					),
-					false
-				).path) unless page.redirects_to_external?
-			end
+      def get_page_from_id
+        @page ||= Page.find(params[:id])
+      end
 
-			# Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
-			def sort_children(element,dbitem)
-				prevchild = nil
-				element['children'].each do |child|
-					childitem = Page.find(child['id'])
-					prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
-					sort_children(child, childitem) unless child['children'].nil?
-					prevchild = childitem
-				end
-			end
+      def pages_from_raw_request
+        request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
+      end
 
-		end
-	end
+      def expire_page(page)
+        return if page.do_not_sweep
+        # TODO: We should change this back to expire_action after Rails 3.2 was released.
+        # expire_action(
+        #   alchemy.show_page_url(
+        #     :urlname => page.urlname_was,
+        #     :lang => multi_language? ? page.language_code : nil
+        #   )
+        # )
+        # Temporarily fix for Rails 3 bug
+        expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
+                          self,
+                          alchemy.show_page_url(
+                            :urlname => page.urlname_was,
+                            :lang => multi_language? ? page.language_code : nil
+                          ),
+                          false
+                        ).path) unless page.redirects_to_external?
+      end
+
+      # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+      def sort_children(element, dbitem)
+        prevchild = nil
+        element['children'].each do |child|
+          childitem = Page.find(child['id'])
+          prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
+          sort_children(child, childitem) unless child['children'].nil?
+          prevchild = childitem
+        end
+      end
+
+    end
+  end
 end