Merge branch 'master' into openstreetbugs

[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 3d30d9d6915850d20fa6eb52fc30d4d0d7ea7a06..2d90ba7cfd1d5a69ea8eced427b210a04b576ed4 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -9,19 +9,21 @@
       <p><%= t 'user.login.with username' %></p>
 
       <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.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"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
+        <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :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 %>
 
+      <br clear="all" />
+
       <p><%= t 'user.login.with openid' %></p>
 
       <table id="login_openid_buttons">
         <tr>
           <td>
             <%=
-              link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
+              link_to_function(image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
                 page[:login_form][:openid_url].value = "http://"
                 page[:login_openid_buttons].hide
                 page[:login_openid_url].show
@@ -29,13 +31,11 @@
               end
             %>
           </td>
-          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
           <td><%= openid_button "google", "gmail.com" %></td>
-        </tr>
-        <tr>
+          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
           <td><%= openid_button "myopenid", "myopenid.com" %></td>
           <td><%= openid_button "wordpress", "wordpress.com" %></td>
-          <td><%= openid_button "myspace", "myspace.com" %></td>
+          <td><%= openid_button "aol", "aol.com" %></td>
         </tr>
       </table>