X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2fad5f7c92055755e0a662ed22943b7d3f92e909..e26348fc18a921dbf740c3cad7bb79de5fd8f27d:/app/views/user/login.rhtml

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index ff71fb8cb..ff988f070 100644
--- 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><br />
+Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.<br />
 
-
-<%= start_form_tag :action => 'login' %>
+<% form_tag :action => 'login' do %>
+<%= hidden_field_tag('referer', h(params[:referer])) %>
 <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>Email Address or username:</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>
 </table>
 
-<br>
-<input type="submit" value="Login">
-
-<%= end_form_tag %> (<%= link_to 'Forgotten your password?', :controller => 'user', :action => 'lost_password' %>)
+<br />
+<%= submit_tag 'Login' %>
+<% end %> (<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)