Merged from Mako.

[selectricity] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c13203b793283f6b34746f7acfb7f11c70345b87..bb614dec3cc0d93f0aef84d82f0bc4c37c4d0f06 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,5 @@
 class AccountController < ApplicationController
 class AccountController < ApplicationController

-  layout 'hc'
+  layout 'main'

   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem


@@ -19,7 +19,7 @@ class AccountController < ApplicationController
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end

-      redirect_back_or_default(:controller => '/account', :action => 'index')
+      redirect_back_or_default(:controller => '/site', :action => 'index')

       flash[:notice] = "Logged in successfully"
     end
   end
       flash[:notice] = "Logged in successfully"
     end
   end


@@ -29,7 +29,7 @@ class AccountController < ApplicationController
     return unless request.post?
     @user.save!
     self.current_user = @user
     return unless request.post?
     @user.save!
     self.current_user = @user

-    redirect_back_or_default(:controller => '/account', :action => 'index')
+    redirect_back_or_default(:controller => '/site', :action => 'index')

     flash[:notice] = "Thanks for signing up!"
   rescue ActiveRecord::RecordInvalid
     render :action => 'signup'
     flash[:notice] = "Thanks for signing up!"
   rescue ActiveRecord::RecordInvalid
     render :action => 'signup'


@@ -40,6 +40,6 @@ class AccountController < ApplicationController
     cookies.delete :auth_token
     reset_session
     flash[:notice] = "You have been logged out."
     cookies.delete :auth_token
     reset_session
     flash[:notice] = "You have been logged out."

-    redirect_back_or_default(:controller => '/account', :action => 'index')
+    redirect_back_or_default(:controller => '/site', :action => 'index')

   end
 end
   end
 end