Eliminate duplication of tag printing logic.

[rails.git] / app / views / user / login.rhtml

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index ff71fb8cbcbdcf7b31abd207b864c7a5a4629a54..0422d213258f76539b5a15c24228b3e50a576a58 100644 (file)
--- a/app/views/user/login.rhtml
+++ b/app/views/user/login.rhtml
@@ -1,14 +1,13 @@
-<h1>Login:</h1><br>
-Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.<br>
+<h1>Login</h1>

 
 

+<p>Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.</p>

 
 

-<%= start_form_tag :action => 'login' %>
+<% form_tag :action => 'login' do %>
+<%= hidden_field_tag('referer', h(params[:referer])) %>

 <table>
 <table>

-  <tr><td>Login name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>password:</td><td><%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td class="fieldName">Email Address or Username:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
+  <tr><td class="fieldName">Password:</td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td></td><td align="right"><%= submit_tag 'Login', :tabindex => 3 %></td></tr>

 </table>
 </table>

-
-<br>
-<input type="submit" value="Login">
-
-<%= end_form_tag %> (<%= link_to 'Forgotten your password?', :controller => 'user', :action => 'lost_password' %>)
+<% end %>