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 c2f801c15e3630c897e6107405ef752b04f81039..1cdb8511fe4e994bb175c6f285f6a4ea2c12f03d 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -43,6 +43,7 @@
             page[:openid_url].show
             page[:openid_url_hint].show
             page[:openid_submit].show
             page[:openid_url].show
             page[:openid_url_hint].show
             page[:openid_submit].show

+            page[:remember_me_label].removeClassName("nowrap")

           end
         %>
         <%= openid_button "yahoo", "yahoo.com" %>
           end
         %>
         <%= openid_button "yahoo", "yahoo.com" %>


@@ -66,7 +67,7 @@
           </td>
         </tr>
         <tr>
           </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>
           <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
         </tr>
       </table>