From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 Jun 2011 16:49:36 +0000 (+0100)
Subject: Use smaller logos for OpenID logins
X-Git-Tag: live~6819
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/84733f2fb01ed8ff687bb7a3bea98b2983f54744?ds=inline

Use smaller logos for OpenID logins
---

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 124015e3b..2d90ba7cf 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -19,13 +19,13 @@
 
       <p><%= t 'user.login.with openid' %></p>
 
-      <table id="login_openid_buttons_wide">
+      <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_wide].hide
+                page[:login_openid_buttons].hide
                 page[:login_openid_url].show
                 page[:login_openid_submit].show
               end
@@ -33,38 +33,12 @@
           </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 "aol", "aol.com" %></td>
-        </tr>
-      </table>
-
       <table>
         <tr id="login_openid_url">
           <td class="fieldName nowrap">
diff --git a/public/images/aol.png b/public/images/aol.png
index 7b2f228fd..917028b50 100644
Binary files a/public/images/aol.png and b/public/images/aol.png differ
diff --git a/public/images/google.png b/public/images/google.png
index ea2e380e8..8d5207403 100644
Binary files a/public/images/google.png and b/public/images/google.png differ
diff --git a/public/images/myopenid.png b/public/images/myopenid.png
index 1d9632c68..5e410bb81 100644
Binary files a/public/images/myopenid.png and b/public/images/myopenid.png differ
diff --git a/public/images/openid.png b/public/images/openid.png
new file mode 100644
index 000000000..dd6f65e9d
Binary files /dev/null and b/public/images/openid.png differ
diff --git a/public/images/openid_large.png b/public/images/openid_large.png
deleted file mode 100644
index 08875c488..000000000
Binary files a/public/images/openid_large.png and /dev/null differ
diff --git a/public/images/wordpress.png b/public/images/wordpress.png
index 57cdd1d9a..21e22ed41 100644
Binary files a/public/images/wordpress.png and b/public/images/wordpress.png differ
diff --git a/public/images/yahoo.png b/public/images/yahoo.png
index e7b148d0f..7bd439d4f 100644
Binary files a/public/images/yahoo.png and b/public/images/yahoo.png differ
diff --git a/public/stylesheets/large.css b/public/stylesheets/large.css
index 95490fddc..a1efa8583 100644
--- a/public/stylesheets/large.css
+++ b/public/stylesheets/large.css
@@ -18,9 +18,3 @@
 .olControlPanZoom {
   display: none;
 }
-
-/* Rules for the login form */
-
-#login_openid_buttons_narrow {
-  display: none;
-}
diff --git a/public/stylesheets/small.css b/public/stylesheets/small.css
index 2c6f669df..f4d51c868 100644
--- a/public/stylesheets/small.css
+++ b/public/stylesheets/small.css
@@ -136,10 +136,6 @@ h1 {
   max-width: 18em;
 }
 
-#login_openid_buttons_wide {
-  display: none;
-}
-
 /* Rules for the profile page */
 
 .user_map {