Expire diary pages which contain comments by a user when necessary

[rails.git] / app / views / user / login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 1130600d53662794ed14fbb325eb3cedff4a72ad..8fe094cfa7b404075cab725a0309d5bd9acdf0e8 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -2,24 +2,24 @@
   <div id="login_login">
     <h1><%= t 'user.login.heading' %></h1>
 
-    <p><%= t 'user.login.already got' %></p>
+    <p><%= t 'user.login.already have' %></p>
 
     <% form_tag :action => 'login' do %>
       <%= hidden_field_tag('referer', h(params[:referer])) %>
       <table id="loginForm">
-        <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
+        <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => params[:username], :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
         <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
         <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td></tr>
       </table>
       <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
     <% end %>
-    <br clear="both">
+    <br clear="all" />
   </div>
   <div id="login_signup">
     <h2><%= t 'user.login.new to osm' %></h2>
     <p><%= t 'user.login.to make changes' %></p>
-    <p><%= t 'user.login.create account minute' %></p></p>
+    <p><%= t 'user.login.create account minute' %></p>
     <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
-    <br clear="both">
+    <br clear="all" />
   </div>
 </div>