Author: farra
Date: Mon Aug 31 10:43:14 2009
New Revision: 809534
URL: http://svn.apache.org/viewvc?rev=809534&view=rev
Log:
consite: members extension. add 'forgot password' and 'register' links to the
login form
Added:
labs/consite/trunk/members/app/views/admin/members/login.html.haml
Modified:
labs/consite/trunk/members/members_extension.rb
Added: labs/consite/trunk/members/app/views/admin/members/login.html.haml
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/members/app/views/admin/members/login.html.haml?rev=809534&view=auto
==============================================================================
--- labs/consite/trunk/members/app/views/admin/members/login.html.haml (added)
+++ labs/consite/trunk/members/app/views/admin/members/login.html.haml Mon Aug
31 10:43:14 2009
@@ -0,0 +1,72 @@
+- content_for 'page_css' do
+ :sass
+ #content
+ text-align: center
+ #login
+ background-color: #f5f1e2
+ border: 5px solid #efead3
+ text-align: left
+ margin: 2em
+ margin-left: auto
+ margin-right: auto
+ padding: 5px 20px
+ padding-right: 22px
+ position: relative
+ width: 23.5em
+ h1
+ font-size: 140%
+ margin: 0
+ margin-top: 13px
+ table
+ width: 100%
+ margin: 15px 0 10px 0
+ td
+ text-align: left
+ padding: 6px 0
+ &.label
+ width: 6em
+ &.field
+ input.textbox
+ font-size: 100%
+ width: 98%
+ &.checkbox
+ font-size: 85%
+ &.buttons
+ text-align: right
+ input
+ font-size: 140%
+
+#login
+ %h1 Please Login
+
+ - form_tag login_url do
+ %table
+ %tr
+ %td.label
+ %label{:for=>"user_login"} Username
+ %td.field{:colspan=>2}
+ = text_field "user", "login", :class => 'textbox activate', :value
=> '', :maxlength => 40, :size => 40
+ %tr
+ %td.label
+ %label{:for=>"user_password"} Password
+ %td.field{:colspan=>2}
+ = password_field "user", "password", :class => 'textbox', :value =>
'', :maxlength => 40, :size => 40
+ %tr
+ %td
+ %td.checkbox
+ = check_box_tag :remember_me, 1, false, :class => 'checkbox'
+ %label.checkbox{:for=>"remember_me"} Remember me
+ %td.buttons
+ %input.button{:type=>"submit", :value=>"Login"}/
+ %tr
+ %td
+ %td.checkbox
+ = link_to 'Forgot Password?', forgot_password_path
+ %td
+ %tr
+ %td
+ %td.checkbox
+ = link_to 'Register', new_admin_member_path
+ %td
+
+= javascript_tag "$('user_login').activate();"
\ No newline at end of file
Modified: labs/consite/trunk/members/members_extension.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/members/members_extension.rb?rev=809534&r1=809533&r2=809534&view=diff
==============================================================================
--- labs/consite/trunk/members/members_extension.rb (original)
+++ labs/consite/trunk/members/members_extension.rb Mon Aug 31 10:43:14 2009
@@ -58,14 +58,37 @@
:denied_message => 'You must have developer privileges to perform this
action.'
end
+ # override login in order to add new links on the login form
+
Admin::WelcomeController.class_eval do
alias_method :index_to_page, :index unless
method_defined?(:index_to_profile)
+ alias_method :login_without_links, :login unless
method_defined?(:login_with_links)
def index_to_profile
redirect_to profile_admin_members_path
end
+
+ def login_with_links
+ if request.post?
+ login = params[:user][:login]
+ password = params[:user][:password]
+ announce_invalid_user unless self.current_user =
User.authenticate(login, password)
+ end
+ if current_user
+ if params[:remember_me]
+ current_user.remember_me
+ set_session_cookie
+ end
+ redirect_to (session[:return_to] || welcome_url)
+ session[:return_to] = nil
+ end
+ render :template => 'admin/members/login.html.haml'
+ end
+
+
+ alias_method :index, :index_to_profile
+ alias_method :login, :login_with_links
- alias_method :index, :index_to_profile
end
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
