X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f864203056d2988b46b202f2cc00783378ee140a..c8ee1351049ef1bb4d7b50d071b2a96154266d1d:/app/views/user/login.rhtml

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index 31fe7e415..3c40906ca 100644
--- a/app/views/user/login.rhtml
+++ b/app/views/user/login.rhtml
@@ -1,13 +1,13 @@
-<h1>Login:</h1><br>
-Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.<br>
+<h1>Login</h1>
 
-<%= start_form_tag :action => 'login' %>
+<p>Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.</p>
+
+<% form_tag :action => 'login' do %>
+<%= hidden_field_tag('referer', h(params[:referer])) %>
 <table>
-  <tr><td>email address:</td><td><%= text_field('user', 'email',{: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}) %></td></tr>
+  <tr><td class="fieldName">Password:</td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255}) %> <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' %></td></tr>
 </table>
-
-<br>
-<input type="submit" value="Login">
-
-<%= end_form_tag %> (<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)
+<% end %>