Merge from head

[selectricity] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 031368b84327d7a1f5d397362686462b0f974859..c9388f6f52c542fc7e6081556ccdb5ae661282a8 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,8 +10,11 @@ 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])
     if logged_in?
@@ -23,6 +26,10 @@ class AccountController < ApplicationController
       flash[:notice] = "Logged in successfully"
     end
   end
+  
+  def forgot_password
+    raise "Not Implemented!"
+  end
 
   def signup
     @user = User.new(params[:user])
@@ -42,4 +49,14 @@ class AccountController < ApplicationController
     flash[:notice] = "You have been logged out."
     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
+
+