Merge into jdong

[selectricity-live] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c13203b793283f6b34746f7acfb7f11c70345b87..e8adcf0fe809b8a466f38eb7161e5af765060104 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,5 @@
 class AccountController < ApplicationController
-  layout 'hc'
+  layout 'main'
   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
@@ -10,7 +10,9 @@ class AccountController < ApplicationController
   def index
     redirect_to(:action => 'signup') unless logged_in? || User.count > 0
   end
-
+  
+  #these methods provide basic functionality for the user login system
+  #===================================================================
   def login
     return unless request.post?
     self.current_user = User.authenticate(params[:login], params[:password])
@@ -19,7 +21,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
-      redirect_back_or_default(:controller => '/account', :action => 'index')
+      redirect_back_or_default(:controller => '/site', :action => 'index')
       flash[:notice] = "Logged in successfully"
     end
   end
@@ -29,7 +31,7 @@ class AccountController < ApplicationController
     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'
@@ -40,6 +42,16 @@ class AccountController < ApplicationController
     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
+  #======================================================================
+  
+  #The following methods are for slectricity specific uses
+  def summary
+    @user = User.find(params[:id])
   end
+  
+  
 end
+
+