Merge branch 'master' into openid

[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 37b852a52a2bd7780050d46a6673999db08f59a3..72c768713e224aad75141638ad584e5420bad815 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -11,11 +11,11 @@
       <table>
         <tr>
           <td class="fieldName"><label for="user_email"><%= t 'user.login.email or username' %></label></td>
-          <td><%= text_field(:user, :email, { :value => "", :size => 28, :maxlength => 255, :tabindex => 1 }) %></td>
+          <td><%= text_field_tag("username", "", { :size => 28, :maxlength => 255, :tabindex => 1 }) %></td>
         </tr>
         <tr>
           <td class="fieldName"><label for="user_password"><%= t 'user.login.password' %></label></td>
-          <td><%= password_field(:user, :password, { :value => "", :size => 28, :maxlength => 255, :tabindex => 2 }) %></td>
+          <td><%= password_field_tag("password", "", { :size => 28, :maxlength => 255, :tabindex => 2 }) %></td>
         </tr>
         <tr>
           <td></td>
@@ -37,15 +37,15 @@
       <h3><%= t 'user.login.openid_heading' %></h3>
       <div id="openid_buttons">
         <%=
-          link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
-            page[:login_form][:user_openid_url].value = "http://"
+          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|
+            page[:login_form][:openid_url].value = "http://"
             page[:openid_buttons].hide
             page[:openid_url].show
             page[:openid_url_hint].show
             page[:openid_submit].show
           end
         %>
-        <%= openid_button "yahoo", "yahoo.com" %>
+        <%= openid_button "yahoo", "me.yahoo.com" %>
         <%= openid_button "google", "gmail.com" %>
         <%= openid_button "myopenid", "myopenid.com" %>
         <%= openid_button "wordpress", "wordpress.com" %>
@@ -54,11 +54,10 @@
 
       <table>
         <tr id="openid_url">
-          <td class="fieldName">
-            <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %>
-            <%= t 'user.login.openid' %>
+          <td class="fieldName nowrap">
+            <%= t 'user.login.openid', :logo => openid_logo %>
           </td>
-          <td><%= text_field(:user, :openid_url, { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %></td>
+          <td><%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %></td>
         </tr>
         <tr id="openid_url_hint">
           <td></td>
@@ -67,7 +66,7 @@
           </td>
         </tr>
         <tr>
-          <td class="fieldName nowrap"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
+          <td class="fieldName nowrap" id="remember_me_label"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
           <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
         </tr>
       </table>