/diary no longer requires login

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

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index ff71fb8cbcbdcf7b31abd207b864c7a5a4629a54..bde0614d545f4713b316e62c1cba6cf462c00c1c 100644 (file)
--- a/app/views/user/login.rhtml
+++ b/app/views/user/login.rhtml
@@ -1,14 +1,12 @@
 <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 %>

 <table>
 <table>

-  <tr><td>Login name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
+  <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>
 </table>
 
 <br>
   <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' %>)
+<%= submit_tag 'Login' %>
+<% end %> (<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)