From b0b3bebff6d0492cc37756d0a0d8efbb3594b54a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Feb 2014 11:31:07 +0000 Subject: Replace Google, Yahoo, Flickr icons with versions by Jakub Steiner Taken from gnome-online-accounts under LGPL-2.1+. --- debian/copyright | 24 +++++++++++++++++++++ .../ikiwiki/openid/goa-account-flickr.png | Bin 0 -> 592 bytes .../ikiwiki/openid/goa-account-google.png | Bin 0 -> 825 bytes .../ikiwiki/openid/goa-account-yahoo.png | Bin 0 -> 741 bytes .../ikiwiki/openid/openid-jquery.js | 6 +++--- 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png create mode 100644 underlays/openid-selector/ikiwiki/openid/goa-account-google.png create mode 100644 underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png diff --git a/debian/copyright b/debian/copyright index e1a81932b..0501d3f2d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -211,6 +211,13 @@ 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/jquery/* Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer © 2011 The Dojo Foundation @@ -301,3 +308,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/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/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js index 95c44a69c..3a8114b27 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: { @@ -32,7 +32,7 @@ var providers_small = { }, 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}/' }, -- cgit v1.2.3