From: Joey Hess <joey@kitenet.net>
Date: Tue, 29 Apr 2014 20:27:12 +0000 (-0400)
Subject: Remove google from openid selector, per http://xkcd.com/1361/
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7faffaa96843b8719fb3458bf8838a91c2b0f8f7

Remove google from openid selector, per http://xkcd.com/1361/

Replace with Verisign's openid provider.
---

diff --git a/debian/changelog b/debian/changelog
index 0c36baf60..cd5d62eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20140228) UNRELEASED; urgency=medium
 
   * only_committed_changes could fail in a git repository merged
     with git merge -s ours.
+  * Remove google from openid selector, per http://xkcd.com/1361/
 
  -- Joey Hess <joeyh@debian.org>  Sat, 05 Apr 2014 19:08:22 -0400
 
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 8b8bbba5d..9f588d54e 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -6,10 +6,11 @@ This code is licenced under the New BSD License.
 */
 
 var providers_large = {
-    google: {
-        name: 'Google',
-        icon: 'ikiwiki/openid/goa-account-google.png',
-        url: 'https://www.google.com/accounts/o8/id'
+    verisign: {
+        name: 'Verisign',
+        icon: 'ikiwiki/openid/verisign.png',
+        label: 'Enter your Verisign username:',
+        url: 'http://{username}.pip.verisignlabs.com/'
     },
     yahoo: {
         name: 'Yahoo',      
@@ -17,7 +18,7 @@ var providers_large = {
         url: 'http://me.yahoo.com/'
     },    
     openid: {
-        name: 'OpenID',     
+        name: 'Other OpenID',     
 	icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null
@@ -47,12 +48,6 @@ var providers_small = {
         icon: 'ikiwiki/openid/aol.png',
         label: 'Enter your AOL username:',
         url: 'http://openid.aol.com/{username}'
-    },
-    verisign: {
-        name: 'Verisign',
-        icon: 'ikiwiki/openid/verisign.png',
-        label: 'Enter your Verisign username:',
-        url: 'http://{username}.pip.verisignlabs.com/'
     }
 };
 var providers = $.extend({}, providers_large, providers_small);