From f8add0adb327a6514bbfc1773e1fc9577c98fa32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 13 May 2015 17:56:36 -0400
Subject: [PATCH] rename openid selector files to login-selector
---
IkiWiki/Plugin/openid.pm | 4 ++--
debian/copyright | 11 +++++------
doc/basewiki.mdwn | 2 +-
doc/templates.mdwn | 2 +-
.../{openid-selector.tmpl => login-selector.tmpl} | 2 +-
.../ikiwiki/login-selector}/aol.png | Bin
.../login-selector}/goa-account-flickr.png | Bin
.../ikiwiki/login-selector}/goa-account-yahoo.png | Bin
.../ikiwiki/login-selector/login-selector.js} | 10 +++++-----
.../ikiwiki/login-selector}/verisign.png | Bin
.../ikiwiki/login-selector}/wordpress.png | Bin
.../ikiwiki/openid/livejournal.png | Bin 772 -> 0 bytes
12 files changed, 15 insertions(+), 16 deletions(-)
rename templates/{openid-selector.tmpl => login-selector.tmpl} (95%)
rename underlays/{openid-selector/ikiwiki/openid => login-selector/ikiwiki/login-selector}/aol.png (100%)
rename underlays/{openid-selector/ikiwiki/openid => login-selector/ikiwiki/login-selector}/goa-account-flickr.png (100%)
rename underlays/{openid-selector/ikiwiki/openid => login-selector/ikiwiki/login-selector}/goa-account-yahoo.png (100%)
rename underlays/{openid-selector/ikiwiki/openid/openid-jquery.js => login-selector/ikiwiki/login-selector/login-selector.js} (96%)
rename underlays/{openid-selector/ikiwiki/openid => login-selector/ikiwiki/login-selector}/verisign.png (100%)
rename underlays/{openid-selector/ikiwiki/openid => login-selector/ikiwiki/login-selector}/wordpress.png (100%)
delete mode 100644 underlays/openid-selector/ikiwiki/openid/livejournal.png
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b8ebbe228..a12c83b8c 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,7 +7,7 @@ use strict;
use IkiWiki 3.00;
sub import {
- add_underlay("openid-selector");
+ add_underlay("login-selector");
add_underlay("jquery");
hook(type => "checkconfig", id => "openid", call => \&checkconfig);
hook(type => "getsetup", id => "openid", call => \&getsetup);
@@ -68,7 +68,7 @@ sub openid_selector {
my $q=shift;
my $session=shift;
- my $template=IkiWiki::template("openid-selector.tmpl");
+ my $template=IkiWiki::template("login-selector.tmpl");
my $openid_url=$q->param('openid_identifier');
if (! load_openid_module()) {
diff --git a/debian/copyright b/debian/copyright
index a73d1ccff..35fadf56b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -201,20 +201,20 @@ Comment:
Republished with permission.
License: GPL-2+
-Files: underlays/openid-selector/ikiwiki/openid/*
+Files: underlays/openid-selector/ikiwiki/login-selector/*
Copyright: © 2008-2010 andyjm, david.j.boden
Comment:
From http://code.google.com/p/openid-selector/
License: BSD-2-clause
-Files: underlays/openid-selector/ikiwiki/openid/goa-*
+Files: underlays/openid-selector/ikiwiki/login-selector/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
+Files: underlays/openid-selector/ikiwiki/login-selector/wordpress.png
Copyright:
© 2003-2013 "the contributors"
License: GPL-2+
@@ -226,9 +226,8 @@ 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
+ underlays/openid-selector/ikiwiki/login-selector/aol.png
+ underlays/openid-selector/ikiwiki/login-selector/verisign.png
Copyright:
© 2014 Simon McVittie
License: other
diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index 8392884eb..b4aa60c78 100644
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -10,7 +10,7 @@ It currently includes these pages:
* [[templates]]
* [[ikiwiki/formatting]]
* [[ikiwiki/markdown]]
-* [[ikiwiki/openid]]
+* [[ikiwiki/login-selector]]
* [[ikiwiki/pagespec]]
* [[ikiwiki/directive]]
* [[ikiwiki/subpage]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 80372fcb7..525b4f8fc 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -92,7 +92,7 @@ Here is a full list of the template files used:
* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
`editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
`editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
- `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
+ `passwordmail.tmpl`, `login-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
interface; do not normally need to be customised.
diff --git a/templates/openid-selector.tmpl b/templates/login-selector.tmpl
similarity index 95%
rename from templates/openid-selector.tmpl
rename to templates/login-selector.tmpl
index a055203a4..e3a91fef2 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/login-selector.tmpl
@@ -1,5 +1,5 @@
<script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
-<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/login-selector/login-selector.js"></script>
<script type="text/javascript">
$(document).ready(function() {
selector.init(
diff --git a/underlays/openid-selector/ikiwiki/openid/aol.png b/underlays/login-selector/ikiwiki/login-selector/aol.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/aol.png
rename to underlays/login-selector/ikiwiki/login-selector/aol.png
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png
rename to underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png
rename to underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
similarity index 96%
rename from underlays/openid-selector/ikiwiki/openid/openid-jquery.js
rename to underlays/login-selector/ikiwiki/login-selector/login-selector.js
index eaac50315..71ae0466e 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
@@ -24,30 +24,30 @@ var selections_openid_large = {
var selections_openid_small = {
verisign: {
name: 'Verisign',
- icon: 'ikiwiki/openid/verisign.png',
+ icon: 'ikiwiki/login-selector/verisign.png',
label: 'Enter your Verisign username:',
url: 'http://{username}.pip.verisignlabs.com/'
},
yahoo: {
name: 'Yahoo',
- icon: 'ikiwiki/openid/goa-account-yahoo.png',
+ icon: 'ikiwiki/login-selector/goa-account-yahoo.png',
url: 'http://me.yahoo.com/'
},
flickr: {
name: 'Flickr',
- icon: 'ikiwiki/openid/goa-account-flickr.png',
+ icon: 'ikiwiki/login-selector/goa-account-flickr.png',
label: 'Enter your Flickr username:',
url: 'http://flickr.com/photos/{username}/'
},
wordpress: {
name: 'Wordpress',
- icon: 'ikiwiki/openid/wordpress.png',
+ icon: 'ikiwiki/login-selector/wordpress.png',
label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/'
},
aol: {
name: 'AOL',
- icon: 'ikiwiki/openid/aol.png',
+ icon: 'ikiwiki/login-selector/aol.png',
label: 'Enter your AOL username:',
url: 'http://openid.aol.com/{username}'
}
diff --git a/underlays/openid-selector/ikiwiki/openid/verisign.png b/underlays/login-selector/ikiwiki/login-selector/verisign.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/verisign.png
rename to underlays/login-selector/ikiwiki/login-selector/verisign.png
diff --git a/underlays/openid-selector/ikiwiki/openid/wordpress.png b/underlays/login-selector/ikiwiki/login-selector/wordpress.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/wordpress.png
rename to underlays/login-selector/ikiwiki/login-selector/wordpress.png
diff --git a/underlays/openid-selector/ikiwiki/openid/livejournal.png b/underlays/openid-selector/ikiwiki/openid/livejournal.png
deleted file mode 100644
index d86ee5eaca21b70dbfc9b8a7787d84b470254215..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH})6
z^6MbX=%g{b0w^e1;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i|^KNKr^;
zNlq$*qe4MyUUFuRLQ!gQYHm_aW?s5NNk*!IPi9$aR(@$wUSf_yPJVj+_6Q$8piWVc
zPRG)cjQk>o;LP0oJO$t6u*{N@%+$3_CNF>rgg^?Mi&7IyGJ%pInYpP9Mh1o^j{FDS
zFfcH31o(uw{{R19&%_LfLPJ9p92^V`475#6Ev?K9jLp5=ZB48!Osy@f+ynJ(y{tV$
zfMlSrlZ{uXjh&^wtv8SXBqIWyY`nwt?YyHyoNc|s9UN@+?R=6WUG1El@{>I)Gkt1v
ze7nj5+lvDX14_b6CK?4*MODr;3T?2ov5c)-U=&bf6y6GC8+s%fdZiip<`@N4ID};Q
z1^O7e#TtdyJ4fbw#Fqip7)N&bq}3-hFJIOfWgOEVkkb)bJSn+j-M-n0QPp$OdNvz{
zw{?|=PH&8g$f>=sJl)95d~!{gN$O&g)Fo!I6MVfK0;7^MC+^J7&n}vO{^<PVyBo6Z
zZOneUE%)Wlyzkdub^t@nyCldjn1PX*nL|Lr(la<DEFn9uqN1k0t!wi18S@t`UAk(^
z$<vpw-GBb#)$6zK-hKS^>C<O0_yPo9f#CZOAo%&~*YDqd{{H><uYJ1QJfN}jJY5_^
zBrb=ZKPq(CfX6j(`b-em8G4fS|Nr?RGk2VPqIcfuvrAj9*Gn~@B@3>*N3x|fTw_Rm
zG?h^+dCI14XR)Q0?wU7TH#`lL;+`@mRK#6y>Aq!OE*f?`TFDf%tNr;u*+=O$$_=k)
z8cw@Xz<KV$Ki7zv7AqFrmKE;$dwj*?nf(lzb4?=N`^!pJyFQuUac$;|ds!|Mcb6Dx
cwMLw=@2pgiZ@;tF9q3X9Pgg&ebxsLQ0N6b^5C8xG
--
2.39.5