From: Tom Hughes <tom@compton.nu>
Date: Fri, 27 May 2011 23:17:52 +0000 (+0100)
Subject: Replace MySpace with AOL in the OpenID login buttons
X-Git-Tag: live~6790
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/26b42dbe975dd6c49590eb764879d710e64efbb1

Replace MySpace with AOL in the OpenID login buttons
---

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 3d30d9d69..556843c2a 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -29,13 +29,13 @@
               end
             %>
           </td>
-          <td><%= openid_button "yahoo", "me.yahoo.com" %></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 "myspace", "myspace.com" %></td>
+          <td><%= openid_button "aol", "aol.com" %></td>
         </tr>
       </table>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f161f18a5..153dca1fe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1540,21 +1540,21 @@ en:
         openid:
           title: Login with OpenID
           alt: Login with an OpenID URL
-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID
         google:
           title: Login with Google
           alt: Login with a Google OpenID
+        yahoo:
+          title: Login with Yahoo
+          alt: Login with a Yahoo OpenID
         myopenid:
           title: Login with myOpenID
           alt: Login with a myOpenID OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
-        myspace:
-          title: Login with MySpace
-          alt: Login with a MySpace OpenID
+        aol:
+          title: Login with AOL
+          alt: Login with an AOL OpenID
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
diff --git a/public/images/aol.png b/public/images/aol.png
new file mode 100644
index 000000000..7b2f228fd
Binary files /dev/null and b/public/images/aol.png differ
diff --git a/public/images/myspace.png b/public/images/myspace.png
deleted file mode 100644
index 2fefe48af..000000000
Binary files a/public/images/myspace.png and /dev/null differ