alchemy_cms 2.0.7 → 2.1.beta1

data/{assets/stylesheets → app/assets/stylesheets/alchemy}/print.css

@@ -1,3 +1,8 @@
+/*
+*= require alchemy/base
+*= require_self
+*/
+
 div#main_menu,
 div#top_menu,
 div#corner,
@@ -26,4 +31,4 @@ div.pagination em.current {
 
 div.pagination em:before {
 	content: 'Page ';
-}
+}

data/{assets/stylesheets/alchemy_tinymce_dialog.css → app/assets/stylesheets/alchemy/tinymce_dialog.css}

@@ -96,7 +96,7 @@ input.checkbox {
 	padding-right: 8px;
 	padding-bottom: 2px;	
 	margin: 0;
-	background: #eaeaea url(/images/alchemy/gui/shading.png) repeat-x 0 -75px;
+	background: #eaeaea url('/assets/alchemy/shading.png') repeat-x 0 -75px;
 	-webkit-border-radius: 2px;
 	-moz-border-radius: 2px;
 	border-radius: 2px;
@@ -234,7 +234,7 @@ td.charmap, #charmap a {
 
 .tabs li {
 	float: left;
-	background: url(/images/alchemy/gui/shading.png) repeat-x 0 0;
+	background: url('/assets/alchemy/shading.png') repeat-x 0 0;
 	margin: 0 2px 0 0;
 	padding: 0 0 0 10px;
 	line-height: 17px;

data/app/controllers/admin/attachments_controller.rb

@@ -58,10 +58,7 @@ class Admin::AttachmentsController < AlchemyController
       redirect_to :action => :index
     end
   rescue Exception => e
-    log_error $!
-    render :update, :status => 500 do |page|
-      page.call('Alchemy.growl', _('File upload error: %{error}') % {:error => e}, :error)
-    end
+		exception_handler(e)
   end
 
   def edit
@@ -88,10 +85,7 @@ class Admin::AttachmentsController < AlchemyController
     @attachment = Attachment.find(params[:id])
     name = @attachment.name
     @attachment.destroy
-    render :update do |page|
-      flash[:notice] = ( _("File: '%{name}' deleted successfully") % {:name => name} )
-      page.redirect_to admin_attachments_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
-    end
+		flash[:notice] = ( _("File: '%{name}' deleted successfully") % {:name => name} )
   end
 
   def show

data/app/controllers/admin/clipboard_controller.rb

@@ -15,7 +15,7 @@ class Admin::ClipboardController < AlchemyController
   def insert
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
-    unless @clipboard.collect { |i| i[:id] }.include?(params[:remarkable_id])
+    unless @clipboard.collect { |i| i[:id].to_s }.include?(params[:remarkable_id])
       @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
     end
     respond_to do |format|
@@ -28,7 +28,7 @@ class Admin::ClipboardController < AlchemyController
   def remove
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
-    @clipboard.delete_if { |i| i[:id] == params[:remarkable_id] }
+    @clipboard.delete_if { |i| i[:id].to_s == params[:remarkable_id] }
     respond_to do |format|
       format.js
     end

data/app/controllers/admin/contents_controller.rb

@@ -34,9 +34,6 @@ class Admin::ContentsController < AlchemyController
   def update
     content = Content.find(params[:id])
     content.essence.update_attributes(params[:content])
-    render :update do |page|
-      page << "Alchemy.closeCurrentWindow();Alchemy.reloadPreview()"
-    end
   end
   
   def order
@@ -44,11 +41,7 @@ class Admin::ContentsController < AlchemyController
       content = Content.find(id)
       content.move_to_bottom
     end
-    render :update do |page|
-      page.call('Alchemy.growl', _("Successfully saved content position"))
-      page.call("Alchemy.SortableContents", '#element_area .picture_gallery_images', form_authenticity_token)
-      page.call('Alchemy.reloadPreview')
-    end
+		@notice = _("Successfully saved content position")
   rescue
     exception_handler($!)
   end
@@ -57,14 +50,9 @@ class Admin::ContentsController < AlchemyController
     content = Content.find(params[:id])
     element = content.element
     content_name = content.name
-    content_dom_id = "#{content.essence_type.underscore}_#{content.id}"
-    if content.destroy
-      render :update do |page|
-        page.call("jQuery('#{content_dom_id}').remove")
-        page.call('Alchemy.growl', _("Successfully deleted %{content}") % {:content => content_name})
-        page.call('Alchemy.reloadPreview')
-      end
-    end
+    @content_dom_id = "#{content.essence_type.underscore}_#{content.id}"
+		@notice = _("Successfully deleted %{content}") % {:content => content_name}
+    content.destroy
   rescue
     exception_handler($!)
   end

data/app/controllers/admin/elements_controller.rb

@@ -45,7 +45,6 @@ class Admin::ElementsController < AlchemyController
 			@element = Element.copy(source_element, {:page_id => @page.id})
 			if element_from_clipboard[:action] == 'cut'
 				source_element.destroy
-				@cutted_element_id = source_element.id
 				@clipboard.delete_if { |i| i[:id].to_i == source_element.id }
 			end
 		else
@@ -70,7 +69,8 @@ class Admin::ElementsController < AlchemyController
     if @element.save_contents(params)
       @page = @element.page
       @element.public = !params[:public].nil?
-      @element_validated = @element.save
+      @element.save
+			@element_validated = true
     else
 			@element_validated = false
 			@notice = _('Validation failed.')

data/app/controllers/admin/essence_audios_controller.rb

@@ -5,9 +5,6 @@ class Admin::EssenceAudiosController < AlchemyController
   def update
     @essence_audio = EssenceAudio.find(params[:id])
     @essence_audio.update_attributes(params[:essence_audio])
-    render :update do |page|
-      page << "Alchemy.closeCurrentWindow(); Alchemy.reloadPreview()"
-    end
   end
 
 end

data/app/controllers/admin/essence_files_controller.rb

@@ -1,7 +1,6 @@
 class Admin::EssenceFilesController < AlchemyController
 
   filter_access_to :all
-	helper :contents
 
   def edit
     @content = Content.find(params[:id])
@@ -12,10 +11,6 @@ class Admin::EssenceFilesController < AlchemyController
   def update
     @essence_file = EssenceFile.find(params[:id])
     @essence_file.update_attributes(params[:essence_file])
-    render :update do |page|
-      page.call "Alchemy.closeCurrentWindow"
-      page.call "Alchemy.reloadPreview"
-    end
   end
 
   def assign
@@ -25,12 +20,6 @@ class Admin::EssenceFilesController < AlchemyController
     @content.essence.save
     @content.save
     @options = params[:options]
-    render :update do |page|
-      page << "jQuery('##{@content.essence_type.underscore}_#{@content.id}').replaceWith('#{escape_javascript(render(:partial => "essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options}))}')"
-      page.call "Alchemy.closeCurrentWindow"
-      page.call "Alchemy.reloadPreview"
-      page.call "Alchemy.setElementDirty", "#element_#{@content.element.id}"
-    end
   end
 
 end

data/app/controllers/admin/essence_flashes_controller.rb

@@ -5,9 +5,6 @@ class Admin::EssenceFlashesController < AlchemyController
   def update
     @essence_flash = EssenceFlash.find(params[:id])
     @essence_flash.update_attributes(params[:essence_flash])
-    render :update do |page|
-      page << "Alchemy.closeCurrentWindow(); Alchemy.reloadPreview()"
-    end
   end
 
 end

data/app/controllers/admin/essence_pictures_controller.rb

@@ -68,13 +68,8 @@ class Admin::EssencePicturesController < AlchemyController
     @picture_essence.link = params[:link]
     @picture_essence.link_title = params[:title]
     @picture_essence.open_link_in_new_window = params[:blank]
-    if @picture_essence.save
-      render :update do |page|
-        page << "Alchemy.closeCurrentWindow()"
-        page << "Alchemy.reloadPreview()"
-        page.call('Alchemy.growl', _("saved_link"))
-      end
-    end
+		@notice = _("saved_link")
+    @picture_essence.save
   end
 
   def destroy

data/app/controllers/admin/essence_videos_controller.rb

@@ -5,9 +5,6 @@ class Admin::EssenceVideosController < AlchemyController
   def update
     @essence_video = EssenceVideo.find(params[:id])
     @essence_video.update_attributes(params[:essence_video])
-    render :update do |page|
-      page << "Alchemy.closeCurrentWindow(); Alchemy.reloadPreview()"
-    end
   end
 
 end

data/app/controllers/admin/languages_controller.rb

@@ -48,17 +48,11 @@ class Admin::LanguagesController < AlchemyController
 
   def destroy
     name = @language.name
-    if @language.destroy
-      flash[:notice] = ( _("Language '%{name}' destroyed") % {:name => name} )
-      set_language_to_default
-    end
-    render(:update) { |page| page.redirect_to(admin_languages_url) }
+		@language.destroy
+		flash[:notice] = ( _("Language '%{name}' destroyed") % {:name => name} )
+		set_language_to_default
   rescue Exception => e
-    render :update do |page|
-      page << "confirm.close();"
-      page.call('Alchemy.growl', e, :error)
-    end
-    logger.error("++++++++++++++ #{e}")
+		exception_handler(e)
   end
 
 private

data/app/controllers/admin/pages_controller.rb

@@ -49,6 +49,7 @@ class Admin::PagesController < AlchemyController
     render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, _("page '%{name}' created.") % {:name => page.name}, 'form#new_page_form button.button')
   rescue Exception => e
     exception_handler(e)
+    redirect_to admin_pages_path
   end
   
   # Edit the content of the page and all its elements and contents.
@@ -77,6 +78,7 @@ class Admin::PagesController < AlchemyController
 		# fetching page via before filter
 		if @page.update_attributes(params[:page])
 			@notice = _("Page %{name} saved") % {:name => @page.name}
+			@while_page_edit = request.referer.include?('edit')
 		else
 			render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
 		end
@@ -198,7 +200,8 @@ class Admin::PagesController < AlchemyController
       page.move_to_child_of(parent)
     end
     flash[:notice] = _("Pages order saved")
-    render(:update) { |page| page.redirect_to admin_pages_path }
+		@redirect_url = admin_pages_path
+    render :action => :redirect
   rescue Exception => e
     exception_handler(e)
   end
@@ -209,9 +212,8 @@ class Admin::PagesController < AlchemyController
 		session[:language_id] = params[:language_id]
     redirect_path = params[:layoutpages] ? admin_layoutpages_path : admin_pages_path
     if request.xhr?
-      render :update do |page|
-        page.redirect_to redirect_path
-      end
+			@redirect_url = redirect_path
+	    render :action => :redirect
     else
       redirect_to redirect_path
     end

data/app/controllers/admin/pictures_controller.rb

@@ -7,6 +7,8 @@ class Admin::PicturesController < AlchemyController
 
   cache_sweeper :pictures_sweeper, :only => [:update, :destroy]
 
+  respond_to :html, :js
+
   def index
     @size = params[:size] || 'medium'
     if params[:per_page] == 'all'
@@ -64,7 +66,9 @@ class Admin::PicturesController < AlchemyController
     # Are we using the Flash uploader? Or the plain html file uploader?
     if params[Rails.application.config.session_options[:key]].blank?
       flash[:notice] = @message
-      redirect_to :back
+      #redirect_to :back
+      #TODO temporary workaround; has to be fixed.
+      redirect_to admin_pictures_path
     end
   rescue Exception => e
     exception_handler(e)
@@ -77,21 +81,17 @@ class Admin::PicturesController < AlchemyController
     @picture.name = params[:name]
     @picture.save
     @message = _("Image renamed successfully from: '%{from}' to '%{to}'") % {:from => oldname, :to => @picture.name}
-    render :update do |page|
-      page.call 'Alchemy.growl', @message
-    end
   rescue Exception => e
     exception_handler(e)
   end
 
   def destroy
-    @picture = Picture.find(params[:id])
-    name = @picture.name
-    @picture.destroy
-    render :update do |page|
-      flash[:notice] = ( _("Image: '%{name}' deleted successfully") % {:name => name} )
-      page.redirect_to admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
-    end
+		@picture = Picture.find(params[:id])
+		name = @picture.name
+		@picture.destroy
+		flash[:notice] = ( _("Image: '%{name}' deleted successfully") % {:name => name} )
+		@redirect_url = admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
+		render :action => :redirect
   end
 
   def flush
@@ -100,10 +100,7 @@ class Admin::PicturesController < AlchemyController
       FileUtils.rm_rf("#{Rails.root}/public/pictures/thumbnails/#{picture.id}")
       expire_page(:controller => '/pictures', :action => 'zoom', :id => picture.id)
     end
-    render :update do |page|
-      page.call 'Alchemy.growl', _('Picture cache flushed')
-      page.call "Alchemy.pleaseWaitOverlay", false
-    end
+		@notice = _('Picture cache flushed')
   end
 
   def show_in_window
@@ -138,9 +135,7 @@ private
         render :partial => 'archive_overlay'
       }
       format.js {
-        render :update do |page|
-          page << "jQuery('#alchemy_window_body').replaceWith('#{escape_javascript(render(:partial => 'archive_overlay'))}')"
-        end
+        render :action => :archive_overlay
       }
     end
   end

data/app/controllers/admin/trash_controller.rb

@@ -21,11 +21,6 @@ class Admin::TrashController < AlchemyController
     @page = Page.find_by_id(params[:page_id])
     @elements = Element.trashed
     @elements.map(&:destroy)
-    render :update do |page|
-      page.call('Alchemy.growl', _("Cleared trash"))
-      page << "Alchemy.refreshTrashWindow(#{@page.id})"
-      page << "jQuery('#element_trash_button .icon').removeClass('full')"
-    end
   rescue Exception => e
     exception_handler(e)
   end

data/app/controllers/admin/users_controller.rb

@@ -66,9 +66,8 @@ class Admin::UsersController < AlchemyController
     if @user.destroy
       flash[:notice] = ( _("User: '%{name}' deleted") % {:name => name} )
     end
-    render :update do |page|
-      page.redirect_to admin_users_path
-    end
+		@redirect_url = admin_users_path
+		render :action => :redirect
   end
 
 end

data/app/controllers/alchemy_controller.rb

@@ -21,22 +21,21 @@ class AlchemyController < ApplicationController
     current_user.admin?
   end
 
-  def render_errors_or_redirect(object, redirect_url, flash_notice, button = nil)
-    if object.errors.empty?
-      flash[:notice] = _(flash_notice)
-      render(:update) { |page| page.redirect_to(redirect_url) }
-    else
-      render_remote_errors(object, button)
-    end
-  end
+	def render_errors_or_redirect(object, redirect_url, flash_notice, button = nil)
+		if object.errors.empty?
+			@redirect_url = redirect_url
+			flash[:notice] = _(flash_notice)
+			render :action => :redirect
+		else
+			render_remote_errors(object, button)
+		end
+	end
 
-  def render_remote_errors(object, button = nil)
-    render :update do |page|
-      page << "jQuery('#errors').html('<ul>" + object.errors.sum { |a, b| "<li>" + _(b) + "</li>" } + "</ul>')"
-      page << "jQuery('#errors').show()"
-      page << "Alchemy.enableButton('#{button || 'form button.button'}')"
-    end
-  end
+	def render_remote_errors(object, button = nil)
+		@button = button
+		@errors = ("<ul>" + object.errors.sum { |a, b| "<li>" + _(b) + "</li>" } + "</ul>").html_safe
+		render :action => :remote_errors
+	end
 
   # Returns a host string with the domain the app is running on.
   def current_server
@@ -106,9 +105,9 @@ private
 
   # Displays an error notice in the Alchemy backend.
   def show_error_notice(e)
-    notice = "Error: #{e}"
+    @notice = "Error: #{e}"
     if request.xhr?
-      render(:update) { |page| page.call("Alchemy.growl", notice, 'error') }
+      render :action => "error_notice"
     else
       flash[:error] = notice
     end
@@ -198,10 +197,7 @@ protected
     else
       flash[:info] = _('Please log in')
       if request.xhr?
-        render :update do |page|
-          page.call "Alchemy.closeCurrentWindow"
-          page.redirect_to login_path
-        end
+        render :action => :permission_denied
       else
         store_location
         redirect_to login_path
@@ -245,13 +241,5 @@ protected
   def trash_empty?(category)
     category.singularize.classify.constantize.trashed.blank?
   end
-
-	def layout_for_page
-		if !params[:layout].blank? && params[:layout] != 'none'
-			params[:layout]
-		else
-			'pages'
-		end
-	end
-
+  
 end