diff --git a/debian/copyright b/debian/copyright
index e1a81932b..f3ea9e740 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -211,6 +211,34 @@ Comment:
From http://code.google.com/p/openid-selector/
License: BSD-2-clause
+Files: underlays/openid-selector/ikiwiki/openid/goa-*
+Copyright:
+ © 2011 Red Hat, Inc.
+License: LGPL-2.1+
+Comment:
+ taken from data/icons/16x16/ in gnome-online-accounts git
+
+Files: underlays/openid-selector/ikiwiki/openid/wordpress.png
+Copyright:
+ © 2003-2013 "the contributors"
+License: GPL-2+
+Comment:
+ taken from wp-admin/images/w-logo-blue.png in wordpress/3.8.1+dfsg1-1
+ and trivially modified (resized to 16x16, placed on a white background)
+
+Files:
+ icons/aol.svg
+ icons/livejournal.svg
+ icons/verisign.svg
+ underlays/openid-selector/ikiwiki/openid/aol.png
+ underlays/openid-selector/ikiwiki/openid/livejournal.png
+ underlays/openid-selector/ikiwiki/openid/verisign.png
+Copyright:
+ © 2014 Simon McVittie
+License: other
+ Redistribution and use in source and compiled forms, with or without
+ modification, are permitted under any circumstances. No warranty.
+
Files: underlays/jquery/*
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation
@@ -301,3 +329,20 @@ License: Expat
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/icons/aol.svg b/icons/aol.svg
new file mode 100644
index 000000000..3986767db
--- /dev/null
+++ b/icons/aol.svg
@@ -0,0 +1,101 @@
+
+
+
+
diff --git a/icons/livejournal.svg b/icons/livejournal.svg
new file mode 100644
index 000000000..381d88170
--- /dev/null
+++ b/icons/livejournal.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/icons/verisign.svg b/icons/verisign.svg
new file mode 100644
index 000000000..cbdb21dc1
--- /dev/null
+++ b/icons/verisign.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/underlays/openid-selector/ikiwiki/openid/aol.png b/underlays/openid-selector/ikiwiki/openid/aol.png
new file mode 100644
index 000000000..d47f5fa54
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/aol.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png b/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png
new file mode 100644
index 000000000..5321642f6
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-google.png b/underlays/openid-selector/ikiwiki/openid/goa-account-google.png
new file mode 100644
index 000000000..ae1caa8a3
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/goa-account-google.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png b/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png
new file mode 100644
index 000000000..51e1c119b
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/livejournal.png b/underlays/openid-selector/ikiwiki/openid/livejournal.png
new file mode 100644
index 000000000..d86ee5eac
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/livejournal.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 056110384..8b8bbba5d 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -8,12 +8,12 @@ This code is licenced under the New BSD License.
var providers_large = {
google: {
name: 'Google',
- icon: 'http://google.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-google.png',
url: 'https://www.google.com/accounts/o8/id'
},
yahoo: {
name: 'Yahoo',
- icon: 'http://yahoo.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-yahoo.png',
url: 'http://me.yahoo.com/'
},
openid: {
@@ -26,43 +26,31 @@ var providers_large = {
var providers_small = {
livejournal: {
name: 'LiveJournal',
- icon: 'http://livejournal.com/favicon.ico',
+ icon: 'ikiwiki/openid/livejournal.png',
label: 'Enter your Livejournal username:',
url: 'http://{username}.livejournal.com/'
},
flickr: {
name: 'Flickr',
- icon: 'http://flickr.com/favicon.ico',
+ icon: 'ikiwiki/openid/goa-account-flickr.png',
label: 'Enter your Flickr username:',
url: 'http://flickr.com/photos/{username}/'
},
wordpress: {
name: 'Wordpress',
- icon: 'https://s2.wp.com/i/favicon.ico',
+ icon: 'ikiwiki/openid/wordpress.png',
label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/'
},
- myopenid: {
- name: 'MyOpenID',
- icon: 'http://myopenid.com/favicon.ico',
- label: 'Enter your MyOpenID username:',
- url: 'http://{username}.myopenid.com/'
- },
- claimid: {
- name: 'ClaimID',
- icon: 'http://claimid.com/favicon.ico',
- label: 'Enter your ClaimID username:',
- url: 'http://claimid.com/{username}'
- },
aol: {
name: 'AOL',
- icon: 'http://aol.com/favicon.ico',
+ icon: 'ikiwiki/openid/aol.png',
label: 'Enter your AOL username:',
url: 'http://openid.aol.com/{username}'
},
verisign: {
name: 'Verisign',
- icon: 'http://verisign.com/favicon.ico',
+ icon: 'ikiwiki/openid/verisign.png',
label: 'Enter your Verisign username:',
url: 'http://{username}.pip.verisignlabs.com/'
}
diff --git a/underlays/openid-selector/ikiwiki/openid/verisign.png b/underlays/openid-selector/ikiwiki/openid/verisign.png
new file mode 100644
index 000000000..5120812ed
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/verisign.png differ
diff --git a/underlays/openid-selector/ikiwiki/openid/wordpress.png b/underlays/openid-selector/ikiwiki/openid/wordpress.png
new file mode 100644
index 000000000..96e08bd99
Binary files /dev/null and b/underlays/openid-selector/ikiwiki/openid/wordpress.png differ