From 26b42dbe975dd6c49590eb764879d710e64efbb1 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 28 May 2011 00:17:52 +0100
Subject: [PATCH] Replace MySpace with AOL in the OpenID login buttons

---
 app/views/user/login.html.erb |   4 ++--
 config/locales/en.yml         |  12 ++++++------
 public/images/aol.png         | Bin 0 -> 1885 bytes
 public/images/myspace.png     | Bin 1498 -> 0 bytes
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 public/images/aol.png
 delete mode 100644 public/images/myspace.png

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 0000000000000000000000000000000000000000..7b2f228fdf16d600dbb52567bbeb6826c2cd00ef
GIT binary patch
literal 1885
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
XSsn-L-zzw>00000NkvXXu0mjf;y!6G

literal 0
HcmV?d00001

diff --git a/public/images/myspace.png b/public/images/myspace.png
deleted file mode 100644
index 2fefe48afa85fb5216d20cabe4c26428d1b922b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1498
zcmV<01tt24P)<h;3K|Lk000e1NJLTq004LZ0012b0{{R3R)bgx0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyz)(z7MgRZ*!_(_Pe8$k+@U_Y4;p+7z
zaKs>O!s+k$b)C}}X~6(kw;*S>iK^NmXt^P0wghFs08zDBjLjfsw4=S_^!EE=kk4zD
z(Gz96A7rtDrq`6R+*pUl2Vl9W!sMB>+wb%F0AIcN`~BPI^SaFFF>}JO#^#T&+$e9s
zn6}@Zx!~90@-lYD_xb%5VzmHWw@8A?%Gm89YP=wB!vI^e{Qdq>hRlDX)ttB95n#0!
zW3_vt*MOqYJ9oe)Y`!dQx!Ir4umAuAut`KgRCwCVlxusUIuL-vHIOI<ijb8>8%4aJ
z1&La#mGl4q)tNxI7rP(!*$?f`qah5#ymJf4{w6{H445(U)nG}aE!ol4nfx-a#6)5}
z(1{G4t+l}Ni@;J3$D7z0I>94S5|gjW*hDBV(9435*($O6<8~+C)|ZRwOM8{7Uh=J7
z_+9Jl->Kh$rEMTI+X8Xtv|vL$5sYEVn2>}LMzKv;+k4Ce?0qH$WwufhCWsK-U{Zz&
z6>S*s7}V`nsTd`{$rwjgaSVYNj$7~ojL5|d<ia#B!d_(g2&T^LLzZM?hBn(Qa&5fO
zg{<;5JBC>pK{U2Fu5!&>$Ep}2TA5iGGf)%zGS<vQ7oWl8Vp)9>T4SPeN13WJbC8v(
zC_+=MV*-~W<T*kp*mND4MPdck_pseA2xe|quW29KY%y%NV>l?4)>+5w7EI!)YOHZz
zBy6+NR#I6o3v`-_0~I@1f&`&8B^v`dRgTapfW;su<vml+T~Q4IGy=6V7q04?3GlTb
z@N}ot)`s1J7wDIaHS69nBCudHNLFkhiA(|w#rgqyFOF*T3gjGpwz|&=WIT)*hBj#|
zm`*RkXFD`KGI$}8BpxD*MN?!jD!`;K-W^i}wRi{aWEeo<EVxh=uIpncb1ZgB0eQO=
zTHxevP!Y0*SYfs*2hx<$Mc1R1gND@+h!}i47Kslgp<U@0$biB4%VqaRu(De)geW0n
zr(!mMV`^t=y{MQCWa*;ndYtP5ye@p3EDbc>uxf2|aqBTu7fUIbFI1F=mvS;Vov&bw
z@n`V8PErfamISxprOMdX9kdI!D5Th@mrRYoYz_rTe5_{jfGe1?SsrU0SOdqHxRnp!
zLeq9TbER|qCaA#;Pd<SwuE2BNfz<~lrfG-{1+=tmRvGqn7t)UVP(aQp#ADTv{b^2p
z6Tqs}OVX4H+U+5$wNH3@>~9E387CZ&xIwVgdJqJ&_h1LWGX-v1aHC3H(nt-zk@6)J
zvi2#AOVn4Vo?XEzBxBWn>Q2$YEkThlOK6V8VA!o|nMM}s`;VsSMvoo1Zt8}Yv@~wP
zaE|A^Hr~LzR>vlxbq%+(b#?%U3)R0N9GmTtLJ;?PduB5q<{4SaWm2XP&~U6i1~H9y
zhE*6%4Nz3K!fWdTSm&vMikf>Sl)Z#r9D=g(N2>e0=2vaoeG=#i4MXMMa?_`|1{FCN
zqZ!Kf>817Ota<G%$L)s&Ot_xId7d?j_zGTSnc4YkGd_FANs!i_K8d}W&rfd6x&I6^
zQ!48;PA18vDLwdrL|*^Yzm`z9vwKQnj|PeE)#>#ynT+%lti81APbTgXyj@4n+WORZ
zZ{XUazVE-L4H?%@RK0bkEs2&Myasa+^VWP%DcwWvCw0tW-)cS3mc8bQp4BUGvp;vf
zAHbq)P54uqc1q;E%3!ZMuiyvoM$TFRPYZAGLAh4of%nJK^Ugiq?mmFkNo-~N8T_Dv
zvVJ~&jOG~)f9}1%5j1#{{nfA>OZ|%L!{A1GS9cO$pL!pZcmF-dKkf#9BdGT(;OG4C
zB6qz{(&}%Ocb`>%DCq8+<om!szDd3f{J#JL09I1p&F!P=`v3p{07*qoM6N<$f~v~l
AFaQ7m

-- 
2.39.5