rules_engine_users 0.0.1

data/rails_generators/templates/app/controllers/users_controller.rb

@@ -0,0 +1,215 @@
+class UsersController < ApplicationController
+  
+  skip_before_filter :verify_authenticity_token, :only => [:login_form, :login] # allow login from anywhere
+  before_filter :login_required, :only=>[:details, :change_form, :change, :pswd_change_form, :pswd_change]  
+  
+  def login_form
+    if logged_in?
+      flash[:success] = "User already logged in"
+      redirect_to(root_path)      
+    end  
+  end
+  
+  def login
+    user_params = params[:user] || {}
+    user = User.authenticate_by_email(user_params[:name], user_params[:password]) || User.authenticate_by_login(user_params[:name], user_params[:password])
+    unless user.nil?
+      if (user.access_level == User::ACCESS_LEVEL_DISABLED)
+        flash[:error] = "User access disabled"
+        redirect_to(root_path) 
+      else  
+        self.current_user = user
+        
+        if params[:remember_me] == "1"
+          current_user.set_remember_token
+          cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
+        end
+
+        redirect_to(session[:return_to] || root_path) 
+      end
+    else
+      flash.now[:error] = "Unable to login user"
+      render :action => 'login_form'
+    end
+  end
+
+  def logout
+    self.current_user.reset_remember_token if logged_in?
+    cookies.delete :auth_token
+    reset_session
+    redirect_to(user_login_path)
+  end
+
+  def details    
+    @user = current_user
+  end
+
+  def change_form    
+    @user = current_user
+  end
+  
+  def change
+    @user=current_user
+    
+    if @user.update_attributes(params[:user].except(:access_level, :password))
+      flash[:success]="User Details Changed"
+      redirect_to user_details_path
+    else
+      render :action => 'change_form'
+    end
+  end
+  
+  def pswd_change_form    
+    @user=current_user
+  end
+  
+  def pswd_change
+    user_params = params[:user] || {}
+    
+    @user=current_user
+    if user_params[:old_password].blank? || user_params[:password].blank? || user_params[:password_confirmation].blank?
+      flash.now[:error]  = "Old and New Password Required"
+      render :action => 'pswd_change_form'
+    elsif !User.authenticate_by_email(@user.email, user_params[:old_password])
+      flash.now[:error]  = "Invalid Old Password"
+      render :action => 'pswd_change_form'
+    elsif @user.update_attributes(:password => user_params[:password], :password_confirmation => user_params[:password_confirmation])      
+      flash[:success]="Password Changed"  
+      redirect_to user_details_path
+    else
+      flash.now[:error]  = "Could not change password"
+      render :action => 'pswd_change_form'
+    end
+  end
+  
+  def pswd_forgot_form
+  end
+
+  def pswd_forgot
+    user_params = params[:user] || {}
+    user = User.set_reset_token(user_params[:email])
+    if user
+      flash[:success]  = "An email has been sent with the password reset details."
+      redirect_to user_login_path
+    else
+      flash.now[:error]  = "Could not reset password"
+      render :action => 'pswd_forgot_form'
+    end
+  end
+    
+  def pswd_reset_form
+    @token = params[:token]
+    if @token.blank?
+      # flash[:error]="Reset Token Required"
+      redirect_to user_pswd_forgot_path
+      return
+    end
+    
+    user = User.authenticate_by_reset_token(@token)
+    unless user
+      flash[:error]="Could not reset password"
+      redirect_to user_pswd_forgot_path
+      return
+    end            
+  end
+  
+  def pswd_reset
+    user_params = params[:user] || {}
+
+    @token = params[:token]
+    if @token.blank?
+      # flash.now[:error]  = "Reset Token Expired"
+      render :action => 'pswd_forgot_form'
+      return
+    end
+    
+    if user_params[:email].blank? || user_params[:password].blank?
+      flash.now[:error]  = "Email and Password Required"
+      render :action => 'pswd_reset_form'
+      return
+    end
+
+    if user_params[:password] != user_params[:password_confirmation]
+      flash.now[:error]  = "Password Confirmation does not match"
+      render :action => 'pswd_reset_form'
+      return
+    end
+    
+    @token = params[:token]
+    user = User.authenticate_by_reset_token(@token)
+    
+    unless user && user.email == user_params[:email]
+      flash.now[:error]  = "Invalid Email"
+      render :action => 'pswd_reset_form'
+      return
+    end        
+        
+    if !user.update_attributes(:password=>user_params[:password], :password_confirmation=>user_params[:password])      
+      flash.now[:error]  = "Could not change password"
+      render :action => 'pswd_reset_form'
+      return
+    end      
+    
+    flash[:success]="Password Changed"  
+    self.current_user = user
+    redirect_to root_path    
+  end  
+  
+  def welcome_form
+    @token = params[:token]
+    if @token.blank?
+      # flash[:error]="Welcome Token Required"
+      redirect_to user_pswd_forgot_path
+      return
+    end
+    
+    user = User.authenticate_by_reset_token(@token)
+    unless user
+      flash[:error]="Unable to validate user details"
+      redirect_to user_pswd_forgot_path
+      return
+    end            
+  end
+  
+  def welcome
+    user_params = params[:user] || {}
+
+    @token = params[:token]
+    if @token.blank?
+      flash.now[:error]  = "Welcome Token Expired"
+      render :action => 'pswd_forgot_form'
+      return
+    end
+    
+    if user_params[:email].blank? || user_params[:password].blank?
+      flash.now[:error]  = "Email and Password Required"
+      render :action => 'welcome_form'
+      return
+    end
+
+    if user_params[:password] != user_params[:password_confirmation]
+      flash.now[:error]  = "Password Confirmation does not match"
+      render :action => 'welcome_form'
+      return
+    end
+    
+    @token = params[:token]
+    user = User.authenticate_by_reset_token(@token)
+    
+    unless user && user.email == user_params[:email]
+      flash.now[:error]  = "Invalid Email"
+      render :action => 'welcome_form'
+      return
+    end        
+        
+    if user.update_attributes(:password=>user_params[:password], :password_confirmation=>user_params[:password])
+      flash[:success]="Password Created"  
+      self.current_user = user
+      redirect_to root_path
+    else
+      flash.now[:error]  = "Could not change password"
+      render :action => 'welcome_form'
+    end      
+  end  
+  
+end

data/rails_generators/templates/app/models/user.rb

@@ -0,0 +1,113 @@
+require 'digest/sha1'
+
+class User < ActiveRecord::Base
+
+  ACCESS_LEVEL_ADMIN      = 999   # administrator access 
+  ACCESS_LEVEL_DISABLED   = 0     # disabled access 
+
+  # validation
+  validates_presence_of     :full_name
+  validates_presence_of     :email
+  validates_presence_of     :time_zone
+  validates_presence_of     :login
+  # validates_presence_of     :password, :on => :create        
+  # validates_length_of       :password, :within => 4..40, :on => :create
+  validates_confirmation_of :password, :unless => Proc.new{|user| user.password.blank? }
+  validates_length_of       :password_confirmation, :within => 4..40, :unless => Proc.new{|user| user.password.blank? }
+  validates_uniqueness_of   :email, :case_sensitive => false, :message=>"alread taken."    
+  validates_presence_of     :login
+  validates_format_of       :login, :with => /\A[a-zA-ZZ0-9._]+\Z/, :unless => Proc.new { |user| user.login.blank? }
+  validates_uniqueness_of   :login, :case_sensitive => false, :message=>"alread taken."    
+
+  # anything else you want your user to change should be added here.
+  attr_accessor :password, :old_password
+  attr_accessible :full_name, :login, :email, :time_zone, :password, :password_confirmation, :access_level, :old_password
+
+  before_create  :set_fields_before_create
+  before_save    :set_fields_before_save
+  
+  # named scope
+  named_scope :by_email, lambda {|email| {:conditions => ['email = ?', email]} }
+  named_scope :by_login, lambda {|login| {:conditions => ['login = ?', login]} }
+  named_scope :by_ge_email, lambda {|email| {:conditions => ['email >= ?', email]} }
+  named_scope :by_ge_login, lambda {|login| {:conditions => ['login >= ?', login]} }
+  named_scope :by_ge_full_name, lambda {|full_name| {:conditions => ['full_name >= ?', full_name]} }
+  named_scope :by_access_level, lambda {|access_level| {:conditions => ['access_level = ?', access_level]} }
+  named_scope :by_remember_token, lambda {|remember_token| {:conditions => ['remember_token = ?', remember_token]} }
+  named_scope :by_reset_token, lambda {|reset_token| {:conditions => ['reset_token = ?', reset_token]} }
+  named_scope :order_email, :order => 'email ASC'
+  named_scope :order_login, :order => 'email ASC'
+  named_scope :order_full_name, :order => 'full_name ASC'
+  # def self.at_page(page, options = {})
+  #   paginate(options.reverse_merge(:page => page, :per_page => 20))
+  # end
+
+  ##### Authentication
+  def self.authenticate_by_email(email, password)
+    u = User.by_email(email).find(:first)    
+    return nil unless u
+    return nil unless u.crypted_password == generate_encryption(password, u.salt)
+    u
+  end
+
+  def self.authenticate_by_login(login, password)
+    u = User.by_login(login).find(:first)    
+    return nil unless u
+    return nil unless u.crypted_password == generate_encryption(password, u.salt)
+    u
+  end
+
+  def self.authenticate_by_remember_token(remember_token)
+    u= self.by_remember_token(remember_token).find(:first)
+    return nil unless u
+    return nil unless u.remember_token_expires_at > Time.now.utc
+    u
+  end
+
+  def self.authenticate_by_reset_token(reset_token)
+    u= self.by_reset_token(reset_token).find(:first)
+    return nil unless u
+    return nil unless u.reset_token_expires_at > Time.now.utc
+    u
+  end
+  
+  ##### Tokens
+  def set_remember_token
+    self.remember_token_expires_at = 30.days.from_now.utc
+    self.remember_token            = User.generate_encryption(email, "#{self.remember_token_expires_at}")
+    save(false)
+  end
+
+  def reset_remember_token
+    self.remember_token_expires_at = nil
+    self.remember_token            = nil
+    save(false)
+  end
+
+  def self.set_reset_token(email)
+    u = self.by_email(email).find(:first)
+    return nil unless u
+    u.reset_token_expires_at = 2.days.from_now.utc
+    u.reset_token            = self.generate_encryption(email, "#{u.reset_token_expires_at}")
+    u.save(false)
+    u
+  end
+
+  private
+    def set_fields_before_create
+      self.reset_token_expires_at = 2.days.from_now.utc
+      self.reset_token            = User.generate_encryption(self.email, "#{self.reset_token_expires_at}")
+    end
+  
+    def set_fields_before_save
+      return if self.password.blank? # if password not set no need to change the crypted password
+      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{self.email}--") if new_record?
+      self.crypted_password = User.generate_encryption(self.password, self.salt)
+      self.reset_token_expires_at  = nil
+      self.reset_token             = nil
+    end
+  
+    def self.generate_encryption(password, salt)
+      Digest::SHA1.hexdigest("--#{salt}--#{password}--")    
+    end
+end

data/rails_generators/templates/app/models/user_mailer.rb

@@ -0,0 +1,26 @@
+class UserMailer < ActionMailer::Base
+  default_url_options[:host] = "#{RulesEngine::ControllerUserMail.host}"
+  
+  def welcome_message(options)
+    
+    @recipients = options[:to_email]
+    @from = "#{RulesEngine::ControllerUserMail.from}"
+    @subject = "#{RulesEngine::ControllerUserMail.prefix} Account Created"
+
+    @body[:to_name] = options[:to_name]
+    @body[:to_url] = "http://#{RulesEngine::ControllerUserMail.host}#{user_pswd_reset_path(:token => options[:token])}"
+    
+    @sent_on = Time.current
+  end    
+  
+  def forgot_password(options)
+    @recipients = options[:to_email]
+    @from = "#{RulesEngine::ControllerUserMail.from}"
+    @subject = "#{RulesEngine::ControllerUserMail.prefix} Reset Password"
+
+    @body[:to_name] = options[:to_name]
+    @body[:to_url] = "http://#{RulesEngine::ControllerUserMail.host}#{user_pswd_reset_path(:token => options[:token])}"
+    
+    @sent_on = Time.current
+  end    
+end

data/rails_generators/templates/app/models/user_observer.rb

@@ -0,0 +1,19 @@
+class UserObserver < ActiveRecord::Observer
+  
+  def after_create(record)
+    return unless ActionMailer::Base.perform_deliveries
+    
+    UserMailer.deliver_welcome_message(:to_email => record.email, 
+                                      :to_name => record.full_name, 
+                                      :token => record.reset_token)
+  end
+  
+  def after_update(record)
+    return if record.reset_token.nil?
+    return unless ActionMailer::Base.perform_deliveries
+    
+    UserMailer.deliver_forgot_password(:to_email => record.email, 
+                                      :to_name => record.full_name, 
+                                      :token => record.reset_token)
+  end
+end

data/rails_generators/templates/app/views/admin/users/_form.html.erb

@@ -0,0 +1,6 @@
+<%= f.text_field :full_name, :size => 30, :required => true %>
+<%= f.text_field :login, :size => 20, :required => true, :label => "Login Name" %>
+<%= f.text_field :email, :size => 40, :required => true %>
+<%= f.time_zone_select :time_zone, :required => true  %>
+<%= f.select :access_level, user_access_levels, :ordered => "false", :required => true, :hint => '<strong class="red">Making the user an administrator will allow them <br> to remove other users INCLUDING YOU!!</strong>' %>
+

data/rails_generators/templates/app/views/admin/users/edit.html.erb

@@ -0,0 +1,18 @@
+<% set_re_breadcrumbs link_to('Home Page', root_path), link_to('List Users', admin_users_path), link_to('User Details', admin_user_path(@user)), 'Edit User' %>
+
+<div class="top-5 prepend-1 span-16">
+  <% re_form_for(@user, :url => admin_user_path(@user), :span => "3x13") do |f| %>
+    <%= f.error_messages :message => "Unable to Update User" %>  
+    <% re_whitebox do %>
+      <h2 class="float-left">Edit User</h2>
+      <div class="float-right">
+    	  <%= re_button_submit_green('Update') %>
+    	  <%= re_button_link_red('Delete', admin_user_path(@user), :confirm => 'Are you sure?', :method => :delete) %>
+    	  <%= re_button_link_orange('Cancel', admin_user_path(@user)) %>      
+      </div>
+      <hr/>
+	    <%= render :partial => 'form', :locals => {:f => f}  %>	
+    <% end %>
+  <% end %>
+</div>  
+<div class="clear"></div>    

data/rails_generators/templates/app/views/admin/users/index.html.erb

@@ -0,0 +1,52 @@
+<% set_re_breadcrumbs_right link_to('Home Page', root_path), link_to('List Users', admin_users_path), link_to("+ Create New User", new_admin_user_path, :class=>"dkgreen") %>
+
+<div class="span-22 prepend-1 append-1 last">
+  <% form_tag(admin_users_path, :method => :get) do %>
+    <div class="float-right">
+      <%= re_button_submit("Search", "orange") %>
+    </div>
+    <div class="float-right">
+      <span class="float-left right-10 largetext blue">Search Users :</span>
+      <span class="float-left right-5">
+        <%= text_field_tag 'query', params[:query], :required => true, :size => 25, :class=>'right-10'%>
+      </span>  
+      <span class="float-left right-5">
+        <%= select_tag 'query_type', options_for_select([["Search Name", 'full_name'], 
+																													["Search Login", 'login'], 
+                                                        	["Search Email", 'email']], params['query_type'])%>                                                     
+      </span>                                                  
+    </div>  																										
+  <% end %>
+</div>  
+<div class="clear"></div>
+
+<div class="span-22 prepend-1 append-1 last">
+  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="data">
+    <tr>
+      <th align="left">Login Name</th>
+      <th align="left">Full Name</th>
+      <th align="left">Email</th>
+      <th align="left">Time Zone</th>
+      <th align="left">Access Level</th>
+    </tr>
+    <% if @users.empty? %>
+      <tr>
+        <td colspan="6">
+          <h3>No Users Found</h3>
+        </td>
+      </tr>  
+    <% end %>
+    <% @users.each do | user | %>
+      <tr class="<%= cycle('', 'odd') %>">
+        <td><%=link_to(h(user.login), admin_user_path(user))%></td>
+        <td><%=link_to(h(user.full_name), admin_user_path(user))%></td>
+        <td><%=h user.email%></td>
+        <td><%=h user.time_zone%></td>
+        <td><%= user_access_level(user)%></td>
+      </tr>
+    <% end %>
+  </table>
+
+  <%= will_paginate(@users) %>
+</div>
+<div class="clear"></div>

data/rails_generators/templates/app/views/admin/users/new.html.erb

@@ -0,0 +1,17 @@
+<% set_re_breadcrumbs link_to('Home Page', root_path), link_to('List Users', admin_users_path), 'New User' %>
+
+<div class="top-5 prepend-1 span-16">
+  <% re_form_for(@user, :url => admin_users_path, :span => "3x13") do |f| %>
+    <%= f.error_messages :user => "Unable to Create User" %>  
+    <% re_whitebox do %>
+      <h2 class="float-left">New User</h2>  
+      <div class="float-right">
+    	  <%= re_button_submit_green('Create') %>
+    	  <%= re_button_link_orange('Cancel', admin_users_path) %>      
+      </div>
+      <hr/>
+	    <%= render :partial => 'form', :locals => {:f => f}  %>	
+    <% end %>
+  <% end %>
+</div>  
+<div class="clear"></div>

data/rails_generators/templates/app/views/admin/users/show.html.erb

@@ -0,0 +1,15 @@
+<% set_re_breadcrumbs link_to('Home Page', root_path), link_to('List Users', admin_users_path), 'User Details' %>
+
+<div class="top-5 prepend-1 span-16">
+  <% re_whitebox do %>
+    <h2 class="float-left">User Details</h2>  
+    <div class="float-right"><%=re_button_link_blue('Edit', edit_admin_user_path(@user)) %></div>
+    <hr/>
+    
+    <%= re_form_text 'Full Name', @user.full_name, :span => "3x13" %>
+    <%= re_form_text 'Login Name', @user.login, :span => "3x13" %>
+    <%= re_form_text 'Email', @user.email, :span => "3x13" %>
+    <%= re_form_text 'Time Zone', @user.time_zone, :span => "3x13" %>
+    <%= re_form_text 'Access Level', user_access_level(@user), :span => "3x13" %>
+  <% end %>  
+</div>	

data/rails_generators/templates/app/views/user_mailer/forgot_password.html.erb

@@ -0,0 +1,11 @@
+Hello <%= @to_name %>,
+
+You have requested a new password.
+
+You can reset your password at : <%= @to_url %>
+
+Kind Regards 
+[My Cool New Application] Team
+
+Note : This is an automatically generated email. Please do not reply to this email
+

data/rails_generators/templates/app/views/user_mailer/welcome_message.html.erb

@@ -0,0 +1,11 @@
+Hello <%= @to_name %>,
+
+An [My Cool New Application] account has been created for you.
+
+You can login at : <%= @to_url %>
+
+Kind Regards 
+[My Cool New Application] Team
+
+Note : This is an automatically generated email. Please do not reply to this email
+

data/rails_generators/templates/app/views/users/change_form.html.erb

@@ -0,0 +1,22 @@
+<div class="prepend-1 prepend-top span-15">
+	<h2>Change Your Details</h2>
+  <% re_form_for(@user, :url=> user_change_path, :method => "post", :html => {:id => 'user_change'}, :span => "3x11") do |f| %>
+    <%= f.error_messages :message => "Unable to Change User Details" %>  
+    <% re_whitebox do %>
+      <%= f.text_field :full_name, :size=>30, :required => true%>
+      <%= f.text_field :login, :size=>20, :required => true, :label => "Login Name"%>
+      <%= f.text_field :email, :size=>40, :required => true%>
+      <%= f.time_zone_select :time_zone, :required => true  %>
+    
+      <div class="span-4">
+        <%= link_to("Change Your Password", user_pswd_change_path) %>
+      </div>
+      <div class="span-10" style="text-align:right;">
+        <%= re_button_submit("Update", "green") %>        
+        <%= re_button_link("Cancel", user_details_path, "red") %>
+        <div class="clear"></div>
+      </div>  
+    <% end %>
+  <% end %>
+</div>
+<div class="clear"></div>

data/rails_generators/templates/app/views/users/details.html.erb

@@ -0,0 +1,11 @@
+<div class="prepend-1 prepend-top span-15">
+	<h2>Your Details</h2>
+  <% re_whitebox do %>
+    <%= re_form_text 'Full Name', @user.full_name, :span => '3x11' %>
+    <%= re_form_text 'Login', @user.login, :span => '3x11' %>
+    <%= re_form_text 'Email', @user.email, :span => '3x11' %>    
+    <%= re_form_text 'Time Zone', @user.time_zone, :span => '3x11' %>    
+    <%= re_button_link("Update Your Details", user_change_path, "green") %>
+  <% end %>  
+</div>
+<div class="clear"></div>

data/rails_generators/templates/app/views/users/login_form.html.erb

@@ -0,0 +1,35 @@
+<% javascript_tag do %>
+
+  $(document).ready(function() {	
+  
+    $('#user_password').bind('keypress', function(e) {
+      var code = (e.keyCode ? e.keyCode : e.which);
+      if (code == 13) { //Enter keycode
+        $('#user_login').submit();
+        return false;      
+      }
+    });
+  
+  });
+<% end %>
+
+
+<div class="prepend-1 prepend-top span-15">
+	<h2>Login</h2>
+  <% re_form_for(:user, :url => user_login_path, :html => {:id => 'user_login'}, :span => "5x11") do |f|%>
+    <% re_whitebox do %>
+      <%= f.text_field :name, :size => 38, :required => true, :label => "Email or Login Name" %>
+      <%= f.password_field :password, :size => 25, :required => true%>
+      <%= re_check_box "Remember Me", :remember_me, false, false, :span => "5x11" %>
+  
+      <div class="span-11">
+        <%= link_to("Forgot Password?", user_pswd_forgot_path) %>
+      </div>
+      <div class="span-3">
+        <%= re_button_submit("Login", "green", :span => "3") %>    
+      </div>  
+      <div class="clear"></div>
+    <% end %>
+  <% end %>
+</div>
+<div class="clear"></div>

data/rails_generators/templates/app/views/users/pswd_change_form.html.erb

@@ -0,0 +1,20 @@
+<div class="prepend-1 prepend-top span-15">
+	<h2>Change Your Password</h2>
+  <% re_form_for(:user, :url => user_pswd_change_path, :html => {:id => 'user_pswd_change'}, :span => "5x9") do |f|%>
+    <% re_whitebox do %>      
+      <%= f.password_field :old_password, :label => 'Old Password', :size=>25, :required => true%>
+      <%= f.password_field :password, :label => 'New Password', :size=>25, :required => true%>
+      <%= f.password_field :password_confirmation, :label => 'Confirm New Password', :size=>25, :required => true%>
+      
+      <div class="span-4">
+        <%= link_to("Change Your Details", user_change_path) %>
+      </div>
+      <div class="span-10" style="text-align:right;">
+        <%= re_button_submit("Update", "green") %>        
+        <%= re_button_link("Cancel", user_details_path, "red") %>
+      </div>  
+      <div class="clear"></div>
+    <% end %>
+  <% end %>
+</div>  
+<div class="clear"></div>

data/rails_generators/templates/app/views/users/pswd_forgot_form.html.erb

@@ -0,0 +1,18 @@
+<div class="prepend-1 prepend-top span-16">
+	<h2>Reset Your Password</h2>
+	
+  <% re_form_for(:user, :url => user_pswd_forgot_path, :html => {:id => 'user_pswd_forgot'}, :span => "4x12") do |f| %>
+  	<% re_whitebox do %>
+    	<%= f.text_field :email, :required => true, :size => 40, :label => 'Your Email' %>
+    
+      <div class="span-10">
+        <%= link_to("Login", user_login_path) %>
+      </div>
+      <div class="span-4">
+        <%= re_button_submit("Reset Password", "green", :span => "4") %>    
+      </div>  
+      <div class="clear"></div>
+  	<% end %>
+  <% end %>
+</div>
+<div class="clear"></div>

data/rails_generators/templates/app/views/users/pswd_reset_form.html.erb

@@ -0,0 +1,22 @@
+<div class="prepend-1 prepend-top span-16">
+	<h2>Reset Your Password</h2>
+  <% re_form_for(:user, :url => user_pswd_reset_path, :html => {:id => "user_pswd_reset"}, :span => "5x11") do |f| %>
+    <% re_whitebox do %>      
+      <%= hidden_field_tag :token, @token%>
+    
+      <%= f.text_field :email, :label => 'Your Email', :size=>40, :required => true%>
+      <%= f.password_field :password, :label => 'New Password', :size=>25, :required => true%>
+      <%= f.password_field :password_confirmation, :label => 'Confirm New Password', :size=>25, :required => true%>
+
+      <div class="span-10">
+        <%= link_to("Login", user_login_path) %>
+      </div>
+      <div class="span-5">
+        <%= re_button_submit("Reset Password", "green", :span => "4") %>    
+      </div>  
+      <div class="clear"></div>
+      
+    <% end %>
+  <% end %>
+</div>
+<div class="clear"></div>