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 4515f412ddec810c95c296d0413573a173fb06a0..0616d76f8aa23c4c31ebb7f09b853aaa42457860 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -15,27 +15,53 @@
       </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">
+      <table id="login_openid_buttons_wide">
         <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|
                 page[:login_form][:openid_url].value = "http://"
-                page[:login_openid_buttons].hide
+                page[:login_openid_buttons_wide].hide
                 page[:login_openid_url].show
                 page[:login_openid_submit].show
               end
             %>
           </td>
+          <td><%= openid_button "google", "gmail.com" %></td>
           <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
+        </tr>
+        <tr>
+          <td><%= openid_button "myopenid", "myopenid.com" %></td>
+          <td><%= openid_button "wordpress", "wordpress.com" %></td>
+          <td><%= openid_button "aol", "aol.com" %></td>
+        </tr>
+      </table>
+
+      <table id="login_openid_buttons_narrow">
+        <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|
+                page[:login_form][:openid_url].value = "http://"
+                page[:login_openid_buttons_narrow].hide
+                page[:login_openid_url].show
+                page[:login_openid_submit].show
+              end
+            %>
+          </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>
+        </tr>
+        <tr>
           <td><%= openid_button "wordpress", "wordpress.com" %></td>
-          <td><%= openid_button "myspace", "myspace.com" %></td>
+          <td><%= openid_button "aol", "aol.com" %></td>
         </tr>
       </table>
 
@@ -58,13 +84,13 @@
       <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
     <% 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">