Use smaller logos for OpenID logins

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 124015e3b1723b1c441820e233d6c05e40a8de27..2d90ba7cfd1d5a69ea8eced427b210a04b576ed4 100644 (file)
--- 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 7b2f228fdf16d600dbb52567bbeb6826c2cd00ef..917028b506aa5b4347950de39e34abc987dbda20 100644 (file)
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 ea2e380e8a0b212d4b47c1c3c107639005e5ccf4..8d52074038784498732c1e6001a995e8c1cb6130 100644 (file)
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 1d9632c68b979c6fbb59733484a13e2e5b0c538f..5e410bb8149502b8019644e62000eac51eb34dba 100644 (file)
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 (file)
index 0000000..dd6f65e
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 (file)
index 08875c4..0000000
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 57cdd1d9a6108f0f73b5d5282669b8f41f3409ec..21e22ed41bb753462f7f3443e31adcaf9f8a06f4 100644 (file)
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 e7b148d0fe6944be4432ff429c5125153224532f..7bd439d4f72c003b361972f4088cb7b061f28c7e 100644 (file)
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 95490fddc657dea617883416898617bf5ecb3e13..a1efa8583621c7b894955d708648f3cf3e2be61b 100644 (file)
--- 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 2c6f669df021b4d60ea988a58ae1e34f831547c1..f4d51c868453d43c9e9edc781b262f8d9ab908d0 100644 (file)
--- 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 {