From b0b3bebff6d0492cc37756d0a0d8efbb3594b54a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
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 <http://www.gnu.org/licenses/>.
+ .
+ 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-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1026dYSaeirbZlh+PjGZ;V_|F{L~?0%Wj<%R3;+NDu1Q2eR5*>T
zlfi0JK@^6+nL9U)A*(C`T6+_uC<VcVt5i_3%`${OL(>PS&(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&<Y8T*e{swHvxukPzEkO6K`sDP`d572e+<tnc<<4h7YwiMof#kxFub-z
z!`YpAeIP``*`E>Gy9%QfKCCYrt!VEmmQS{+8V&v@-DsBWZQ|bn^{Q~%i#Z>!BOSgm
z)T@H4mbp27NA>(O0E@$yxO(|v4>nEg>_KPmei=8DS#)+-basA;ks~5_@A<!D{3n3-
z-dk%;9LKCyt3u{-xs0_I@4Yu7GDy?3*J`zNtyU`pu+}mjkAsK|jC1aIGMSL3>0f<k
eW6U6gaQp+3TOslN#k^|(0000<MNUMnLSTYMg!#V!
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..ae1caa8a3c9acfb0703e580b5baf8748e5fb03f7
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1026dYSaeirbZlh+PjGZ;V_|F{L~?0%Wj<%R3;+NEmq|oHR5*=|
zk!@&=VI0PP_x;?@vF)5WGdqlA%ge@yiM)i!OQ?PEN%Hc+M=2y9ND)f$$p^(ZMdqy~
znG`AJtyqlN%(BonbJm<4+n)P8=Q+=F`+zgYQm(o_{jdM^zxrRIrLE)qi<d21d*a_L
zA^0yC1EoXX&BC?IYsG~t^}+n=*`oQQPbL@^Ev=3*xio@FCUGxc`(qmd0UaryChZy3
z^`%$TY#7h!tBv@9$?86K4{%_|97HsV_q>syCq8VVEXvoc;!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*o<sS>2*-BLW7Z^xu<XL?y^me8f~m1`
zE^a%+?z%&C_IKwbuq_)mqft8Tu%gPvd9xq??Pv6FL2M-jGmlXmF5=L-z3jVjB*#Ds
zf%Y^~dk*O@HwnB1LKSA2Ni^cL9>xSNmE)#TS~!kKD4eB`64(Egz+fTlA~1e#T?6mP
ze0zppv>4k`L`H>wU6&{<wCkW|PA)YKt?go2)oP?L{0*5uiO%F#mXyyQZa_#{-nWt$
z%|qO5sK0dX^6|~h-3f%S{#o0fFve%}*kTTD-Fxi^&9oi`M(fCH00000NkvXXu0mjf
Dy+(F(
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..51e1c119bb457531f6805c49887c146f60f25134
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1026dYSaeirbZlh+PjGZ;V_|F{L~?0%Wj<%R3;+NELrFwIR5*=|
zle<q;Q4oi}d+%8=JQi>R7<|M>d|)6z%qA2R`VUw@ZDV0#Wnux9(L^nj*jw1rXhNeE
zol1-mjfH@q5h#@KSeC_I_TF>m+<PoAizr0qWKMBTX7bJaX1u2-pC5}oH4JgT1I0ef
z0}H`uk|cx5c;0Zj{=h({xj6_@0eIm372qlt;2g0eYHc+)@Uv7xnI!B#c=$-5mo&B%
z?*{-?7tqw!802PF`;|CReyvYb+}u|%fGrBu$LkO$N{JI(l|!7}t=2uwsRVI?5@$&K
zn2y^gY3fRoK3#_`Sr(ox@?&g;!enuG3NJ>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`<O`kG&XVbDVC?ER`ELaP5-%n{TR=zpPl5>RWQTu!
zF~61U?J_IVtH0kZiI=c8yN-@31VR|<e`HMj1c2DaJN}lZbC{yRgtFa49quH^-t44z
zsE63Z9LlzE@j)+beJxlgoEbPlRVIZFqb(V&vvxBqE8p`g^ZxqLyFCYJYIKJD+y*+*
zSZ8g}U6bw5i9T2DRr}yb{&R|}CA4Uk?NS^i(Woj*c`!!E+qHgh`&wu4Y~XpLE@0>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.39.5