alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,62 +1,62 @@
 module Alchemy
-	module Admin
-		class ContentsController < Alchemy::Admin::BaseController
+  module Admin
+    class ContentsController < Alchemy::Admin::BaseController
 
-			def new
-				@element = Element.find(params[:element_id])
-				@contents = @element.available_contents
-				@content = @element.contents.build
-				render :layout => false
-			end
+      def new
+        @element = Element.find(params[:element_id])
+        @contents = @element.available_contents
+        @content = @element.contents.build
+        render :layout => false
+      end
 
-			def create
-				@element = Element.find(params[:content][:element_id])
-				@content = Content.create_from_scratch(@element, params[:content])
-				@options = params[:options] || {}
-				@html_options = params[:html_options] || {}
-				# 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
-				if @content.essence_type == "Alchemy::EssencePicture"
-					@element_dom_id = "#add_content_#{@element.id}"
-					@content.essence.picture_id = params[:picture_id]
-					@content.essence.save
-					@contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
-					@dragable = @contents_of_this_type.length > 1
-					@options = @options.merge(:dragable => @dragable)
-				else
-					@element_dom_id = "#add_content_for_element_#{@element.id}"
-				end
-				@locals = {
-				  :content => @content,
-				  :options => @options.symbolize_keys,
-				  :html_options => @html_options.symbolize_keys
-				}
-			end
+      def create
+        @element = Element.find(params[:content][:element_id])
+        @content = Content.create_from_scratch(@element, params[:content])
+        @options = params[:options] || {}
+        @html_options = params[:html_options] || {}
+        # 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
+        if @content.essence_type == "Alchemy::EssencePicture"
+          @element_dom_id = "#add_content_#{@element.id}"
+          @content.essence.picture_id = params[:picture_id]
+          @content.essence.save
+          @contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
+          @dragable = @contents_of_this_type.length > 1
+          @options = @options.merge(:dragable => @dragable)
+        else
+          @element_dom_id = "#add_content_for_element_#{@element.id}"
+        end
+        @locals = {
+          :content => @content,
+          :options => @options.symbolize_keys,
+          :html_options => @html_options.symbolize_keys
+        }
+      end
 
-			def update
-				content = Content.find(params[:id])
-				content.essence.update_attributes(params[:content], :as => current_user.role.to_sym)
-			end
+      def update
+        content = Content.find(params[:id])
+        content.essence.update_attributes(params[:content], :as => current_user.role.to_sym)
+      end
 
-			def order
-				params[:content_ids].each do |id|
-					content = Content.find(id)
-					content.move_to_bottom
-				end
-				@notice = t("Successfully saved content position")
-			end
+      def order
+        params[:content_ids].each do |id|
+          content = Content.find(id)
+          content.move_to_bottom
+        end
+        @notice = t("Successfully saved content position")
+      end
 
-			def destroy
-				@content = Content.find(params[:id])
-				@content_dup = @content.clone
-				element = @content.element
-				content_name = @content.name
-				@notice = t("Successfully deleted content", :content => content_name)
-				@content.destroy
-			end
-  
-		end
-	end
+      def destroy
+        @content = Content.find(params[:id])
+        @content_dup = @content.clone
+        element = @content.element
+        content_name = @content.name
+        @notice = t("Successfully deleted content", :content => content_name)
+        @content.destroy
+      end
+
+    end
+  end
 end

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

@@ -1,15 +1,16 @@
 module Alchemy
-	module Admin
-		class DashboardController < Alchemy::Admin::BaseController
+  module Admin
+    class DashboardController < Alchemy::Admin::BaseController
 
-			def index
-				@alchemy_version = Alchemy::VERSION
-				@clipboard_items = session[:clipboard]
-				@last_edited_pages = Page.all_last_edited_from(current_user)
-				@locked_pages = Page.all_locked
-				@online_users = User.all_online.to_a.delete_if { |u| u == current_user }
-			end
+      def index
+        @alchemy_version = Alchemy::VERSION
+        @clipboard_items = session[:clipboard]
+        @last_edited_pages = Page.all_last_edited_from(current_user)
+        @locked_pages = Page.all_locked
+        @online_users = User.all_online.to_a.delete_if { |u| u == current_user }
+        @first_time = current_user.login_count == 1 && current_user.last_login_at.nil?
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,124 +1,124 @@
 module Alchemy
-	module Admin
-		class ElementsController < Alchemy::Admin::BaseController
+  module Admin
+    class ElementsController < Alchemy::Admin::BaseController
 
-			cache_sweeper Alchemy::ContentSweeper, :only => [:update]
+      cache_sweeper Alchemy::ContentSweeper, :only => [:update]
 
-			def index
-				@page = Page.find(params[:page_id], :include => {:elements => :contents})
-				@cells = @page.cells
-				if @cells.blank?
-					@elements = @page.elements.not_trashed
-				else
-					@elements = @page.elements_grouped_by_cells
-				end
-				render :layout => false
-			end
+      def index
+        @page = Page.find(params[:page_id], :include => {:elements => :contents})
+        @cells = @page.cells
+        if @cells.blank?
+          @elements = @page.elements.not_trashed
+        else
+          @elements = @page.elements_grouped_by_cells
+        end
+        render :layout => false
+      end
 
-			def list
-				@page_id = params[:page_id]
-				if @page_id.blank? && !params[:page_urlname].blank?
-					@page_id = Page.find_by_urlname_and_language_id(params[:page_urlname], session[:language_id]).id
-				end
-				@elements = Element.find_all_by_page_id_and_public(@page_id, true)
-			end
+      def list
+        @page_id = params[:page_id]
+        if @page_id.blank? && !params[:page_urlname].blank?
+          @page_id = Page.find_by_urlname_and_language_id(params[:page_urlname], session[:language_id]).id
+        end
+        @elements = Element.find_all_by_page_id_and_public(@page_id, true)
+      end
 
-			def new
-				@page = Page.find_by_id(params[:page_id])
-				@element = @page.elements.build
-				@elements = Element.all_for_page(@page)
-				clipboard_elements = get_clipboard('elements')
-				unless clipboard_elements.blank?
-					@clipboard_items = Element.all_from_clipboard_for_page(clipboard_elements, @page)
-				end
-				render :layout => false
-			end
+      def new
+        @page = Page.find_by_id(params[:page_id])
+        @element = @page.elements.build
+        @elements = Element.all_for_page(@page)
+        clipboard_elements = get_clipboard('elements')
+        unless clipboard_elements.blank?
+          @clipboard_items = Element.all_from_clipboard_for_page(clipboard_elements, @page)
+        end
+        render :layout => false
+      end
 
-			# Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
-			def create
-				@page = Page.find(params[:element][:page_id])
-				@paste_from_clipboard = !params[:paste_from_clipboard].blank?
-				if @paste_from_clipboard
-					source_element = Element.find(element_from_clipboard[:id])
-					@element = Element.copy(source_element, {:page_id => @page.id})
-					if element_from_clipboard[:action] == 'cut'
-						@cutted_element_id = source_element.id
-						@clipboard.delete_if { |i| i[:id].to_i == source_element.id }
-						source_element.destroy
-					end
-				else
-					@element = Element.new_from_scratch(params[:element])
-				end
-				put_element_in_cell if @page.can_have_cells?
-				@element.page = @page
-				if @element.save
-					render :action => :create
-				else
-					render_remote_errors(@element, 'form#new_alchemy_element button.button')
-				end
-			end
+      # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
+      def create
+        @page = Page.find(params[:element][:page_id])
+        @paste_from_clipboard = !params[:paste_from_clipboard].blank?
+        if @paste_from_clipboard
+          source_element = Element.find(element_from_clipboard[:id])
+          @element = Element.copy(source_element, {:page_id => @page.id})
+          if element_from_clipboard[:action] == 'cut'
+            @cutted_element_id = source_element.id
+            @clipboard.delete_if { |i| i[:id].to_i == source_element.id }
+            source_element.destroy
+          end
+        else
+          @element = Element.new_from_scratch(params[:element])
+        end
+        put_element_in_cell if @page.can_have_cells?
+        @element.page = @page
+        if @element.save
+          render :action => :create
+        else
+          render_remote_errors(@element, 'form#new_element button.button')
+        end
+      end
 
-			# Saves all contents in the elements by calling save_content on each content
-			# And then updates the element itself.
-			# If a Ferret::FileNotFoundError raises we gonna catch it and rebuilding the index.
-			def update
-				@element = Element.find_by_id(params[:id])
-				if @element.save_contents(params)
-					@page = @element.page
-					@element.public = !params[:public].nil?
-					@element_validated = @element.save!
-				else
-					@element_validated = false
-					@notice = t('Validation failed')
-					@error_message = "<h2>#{@notice}</h2><p>#{t(:content_validations_headline)}</p>".html_safe
-				end
-			end
+      # Saves all contents in the elements by calling save_content on each content
+      # And then updates the element itself.
+      # If a Ferret::FileNotFoundError raises we gonna catch it and rebuilding the index.
+      def update
+        @element = Element.find_by_id(params[:id])
+        if @element.save_contents(params)
+          @page = @element.page
+          @element.public = !params[:public].nil?
+          @element_validated = @element.save!
+        else
+          @element_validated = false
+          @notice = t('Validation failed')
+          @error_message = "<h2>#{@notice}</h2><p>#{t(:content_validations_headline)}</p>".html_safe
+        end
+      end
 
-			# Trashes the Element instead of deleting it.
-			def trash
-				@element = Element.find(params[:id])
-				@page_id = @element.page_id
-				@element.trash
-			end
+      # Trashes the Element instead of deleting it.
+      def trash
+        @element = Element.find(params[:id])
+        @page_id = @element.page_id
+        @element.trash
+      end
 
-			def order
-				params[:element_ids].each do |element_id|
-					element = Element.find(element_id)
-					if element.trashed?
-						element.page_id = params[:page_id]
-						element.cell_id = params[:cell_id]
-						element.insert_at
-					end
-					element.move_to_bottom
-				end
-			end
+      def order
+        params[:element_ids].each do |element_id|
+          element = Element.find(element_id)
+          if element.trashed?
+            element.page_id = params[:page_id]
+            element.cell_id = params[:cell_id]
+            element.insert_at
+          end
+          element.move_to_bottom
+        end
+      end
 
-			def fold
-				@element = Element.find(params[:id])
-				@page = @element.page
-				@element.folded = !@element.folded
-				@element.save
-			end
+      def fold
+        @element = Element.find(params[:id])
+        @page = @element.page
+        @element.folded = !@element.folded
+        @element.save
+      end
 
-		private
+      private
 
-			def put_element_in_cell
-				element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : params[:element][:name]
-				cell_definition = Cell.definition_for(element_with_cell_name.split('#').last) if !element_with_cell_name.blank?
-				if cell_definition
-					@cell = @page.cells.find_or_create_by_name(cell_definition['name'])
-					@element.cell = @cell
-					return true
-				else
-					return false
-				end
-			end
+      def put_element_in_cell
+        element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : params[:element][:name]
+        cell_definition = Cell.definition_for(element_with_cell_name.split('#').last) if !element_with_cell_name.blank?
+        if cell_definition
+          @cell = @page.cells.find_or_create_by_name(cell_definition['name'])
+          @element.cell = @cell
+          return true
+        else
+          return false
+        end
+      end
 
-			def element_from_clipboard
-				@clipboard = get_clipboard(:elements)
-				@clipboard.detect { |i| i[:id].to_i == params[:paste_from_clipboard].to_i }
-			end
+      def element_from_clipboard
+        @clipboard = get_clipboard(:elements)
+        @clipboard.detect { |i| i[:id].to_i == params[:paste_from_clipboard].to_i }
+      end
 
-		end
-	end
+    end
+  end
 end

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

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

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

@@ -1,27 +1,27 @@
 module Alchemy
-	module Admin
-		class EssenceFilesController < Alchemy::Admin::BaseController
+  module Admin
+    class EssenceFilesController < Alchemy::Admin::BaseController
 
-			helper "Alchemy::Admin::Contents"
+      helper "Alchemy::Admin::Contents"
 
-			def edit
-				@content = Content.find(params[:id])
-				@essence_file = @content.essence
-				render :layout => false
-			end
+      def edit
+        @content = Content.find(params[:id])
+        @essence_file = @content.essence
+        render :layout => false
+      end
 
-			def update
-				@essence_file = EssenceFile.find(params[:id])
-				@essence_file.update_attributes(params[:essence_file], :as => current_user.role.to_sym)
-			end
+      def update
+        @essence_file = EssenceFile.find(params[:id])
+        @essence_file.update_attributes(params[:essence_file], :as => current_user.role.to_sym)
+      end
 
-			def assign
-				@content = Content.find_by_id(params[:id])
-				@attachment = Attachment.find_by_id(params[:attachment_id])
-				@content.essence.attachment = @attachment
-				@options = params[:options] || {}
-			end
+      def assign
+        @content = Content.find_by_id(params[:id])
+        @attachment = Attachment.find_by_id(params[:attachment_id])
+        @content.essence.attachment = @attachment
+        @options = params[:options] || {}
+      end
 
-		end
-	end
+    end
+  end
 end

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

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