From b0b3bebff6d0492cc37756d0a0d8efbb3594b54a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Feb 2014 11:31:07 +0000 Subject: [PATCH] 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 0000000000000000000000000000000000000000..5321642f6e26fa61ce9f8e731631ba3a52e87f57 GIT binary patch literal 592 zcmV-W0T zlfi0JK@^6+nL9U)A*(C`T6+_uCPS&(M7-eT33Q9v~C~Lhd5q zLXbjs3AiuPXfk)^&T$dbTHRd5e>?MkXZ~}}sL^QDR7#!XdEONfLjftJd=y0k5qWPy z2q(>Ev)5=ewAQ+apAdqX&*#0_Y=*Jcc9SI0Aq4U~F9c9ZktB(pPN!XyWtmY*;hZaE z-l$Y6k!6`N&N)P+aP^Hu1m_$N0GA&vXCIaT9KC(S!Rsvm;>#&pXP*GDN3U=PFYW=} zdjP)Nc={K&Gy9%QfKCCYrt!VEmmQS{+8V&v@-DsBWZQ|bn^{Q~%i#Z>!BOSgm z)T@H4mbp27NA>(O0E@$yxO(|v4>nEg>_KPmei=8DS#)+-basA;ks~5_@A0fsyCq8VVEXvoc;!Y@EDA&`3Y(-zv&57C3 zH86a1aFC#{FK4b&F0SvRob(U{c@`CAQ64n*WCgv66vjZ%-cGWmnYKmKal#>dDVf{Q zMr>#hEp3#}qyX5pX$DVU$4PrXA5l>jMF=?6c7xh2V{kLwS#xXSD2}eI#JSswN~Ilo z6DcOd3OKoE0oU(+VnRti+iRwA@YV_HUe}Lk!8ZY2UOxjFjY@eAw;y%#q$y5OVTjG^ zr%+v4%)<}QsB0RzoJ}DuT+c!3v;)A~5B)rT7035~Hc>Ucg3)=Ae;Nn`I_)5}rwI($ zN@6R??MIyelthZD-F}uSW6Q8DdjyR!XfK7*o2*-BLW7Z^xuxSNmE)#TS~!kKD4eB`64(Egz+fTlA~1e#T?6mP ze0zppv>4k`L`H>wU6&{R7<|M>d|)6z%qA2R`VUw@ZDV0#Wnux9(L^nj*jw1rXhNeE zol1-mjfH@q5h#@KSeC_I_TF>m+SL5UN@THfE8!mskVG?FFL-N@Qxf!wEc zQgw=+TkSM;q){~i8?!||Kc2^0i#Wj-XAo_$PB2>Y^7;hjrHBi6&!aLvVKHQOWR6r? z@!|dyZ-zc{^l~d=4B`yFI6+4S>nzq;N-LYZx-mgjLyGLZPSWkQ^girj?8-O`W8Z1* z%TRx+7NgB}4@{`BPAc^+PAoC`RWQTu! zF~61U?J_IVtH0kZiI=c8yN-@31VR|v Xl%00TH|87u00000NkvXXu0mjfRjx!u literal 0 HcmV?d00001 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}/' }, -- 2.44.0