Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command...
authorAndy Allan <andy@gravitystorm.co.uk>
Thu, 27 Jan 2011 17:28:25 +0000 (17:28 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 3 Apr 2011 12:46:17 +0000 (13:46 +0100)
app/controllers/user_controller.rb

index 52c3deac806eec55dba6ca5d198f9f7b65f00d53..3d20120647cc1f6fb4a45ef49d0f6542a8c66cdd 100644 (file)
@@ -1,6 +1,5 @@
 class UserController < ApplicationController
-  layout 'site', :except => [:api_details, :login]
-  layout 'slim', :only => :login
+  layout 'site', :except => [:api_details]
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
@@ -258,6 +257,7 @@ class UserController < ApplicationController
     elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end
+    render :layout => 'slim'
   end
 
   def logout