Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command...

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 52c3deac806eec55dba6ca5d198f9f7b65f00d53..3d20120647cc1f6fb4a45ef49d0f6542a8c66cdd 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -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