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 3d30d9d6915850d20fa6eb52fc30d4d0d7ea7a06..556843c2a0fe97d55203c61277fe417d045beca7 100644 (file)
--- 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 f161f18a56523d5e7e2b49d21af914b5a8621a9a..153dca1fe5e212dfb8d82b2336968693bb3cf87e 100644 (file)
--- 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 (file)
index 0000000..7b2f228
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 (file)
index 2fefe48..0000000
Binary files a/public/images/myspace.png and /dev/null differ