diff options
| -rw-r--r-- | app/controllers/application.rb | 4 | ||||
| -rw-r--r-- | app/views/user_accounts/signin.rhtml (renamed from app/views/frontpage/signin.rhtml) | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index f00479bee..34c357c61 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.5 2007-09-03 13:52:01 francis Exp $ +# $Id: application.rb,v 1.6 2007-09-12 15:27:15 francis Exp $ class ApplicationController < ActionController::Base @@ -26,8 +26,8 @@ class ApplicationController < ActionController::Base else flash[:error] = "Email or password not correct" end - end + render :template => 'user_accounts/signin' end # Logout form diff --git a/app/views/frontpage/signin.rhtml b/app/views/user_accounts/signin.rhtml index f66ec4eb0..013fe8077 100644 --- a/app/views/frontpage/signin.rhtml +++ b/app/views/user_accounts/signin.rhtml @@ -1,11 +1,13 @@ <%= start_form_tag :action => "signin" %> - <label for="email">Email:</label> + <p> + <label for="email">Enter your e-mail address:</label> <%= text_field_tag "email" %> - <br> + </p> + <p> <label for="password">Password:</label> <%= password_field_tag "password" %> - <br> + </p> <%= submit_tag "Sign in" %> <%= end_form_tag %> |