rename openid selector files to login-selector

master
Joey Hess 2015-05-13 17:56:36 -04:00
parent 7765941011
commit f8add0adb3
12 changed files with 15 additions and 16 deletions

View File

@ -7,7 +7,7 @@ use strict;
use IkiWiki 3.00; use IkiWiki 3.00;
sub import { sub import {
add_underlay("openid-selector"); add_underlay("login-selector");
add_underlay("jquery"); add_underlay("jquery");
hook(type => "checkconfig", id => "openid", call => \&checkconfig); hook(type => "checkconfig", id => "openid", call => \&checkconfig);
hook(type => "getsetup", id => "openid", call => \&getsetup); hook(type => "getsetup", id => "openid", call => \&getsetup);
@ -68,7 +68,7 @@ sub openid_selector {
my $q=shift; my $q=shift;
my $session=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'); my $openid_url=$q->param('openid_identifier');
if (! load_openid_module()) { if (! load_openid_module()) {

11
debian/copyright vendored
View File

@ -201,20 +201,20 @@ Comment:
Republished with permission. Republished with permission.
License: GPL-2+ License: GPL-2+
Files: underlays/openid-selector/ikiwiki/openid/* Files: underlays/openid-selector/ikiwiki/login-selector/*
Copyright: © 2008-2010 andyjm, david.j.boden Copyright: © 2008-2010 andyjm, david.j.boden
Comment: Comment:
From http://code.google.com/p/openid-selector/ From http://code.google.com/p/openid-selector/
License: BSD-2-clause License: BSD-2-clause
Files: underlays/openid-selector/ikiwiki/openid/goa-* Files: underlays/openid-selector/ikiwiki/login-selector/goa-*
Copyright: Copyright:
© 2011 Red Hat, Inc. © 2011 Red Hat, Inc.
License: LGPL-2.1+ License: LGPL-2.1+
Comment: Comment:
taken from data/icons/16x16/ in gnome-online-accounts git 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: Copyright:
© 2003-2013 "the contributors" © 2003-2013 "the contributors"
License: GPL-2+ License: GPL-2+
@ -226,9 +226,8 @@ Files:
icons/aol.svg icons/aol.svg
icons/livejournal.svg icons/livejournal.svg
icons/verisign.svg icons/verisign.svg
underlays/openid-selector/ikiwiki/openid/aol.png underlays/openid-selector/ikiwiki/login-selector/aol.png
underlays/openid-selector/ikiwiki/openid/livejournal.png underlays/openid-selector/ikiwiki/login-selector/verisign.png
underlays/openid-selector/ikiwiki/openid/verisign.png
Copyright: Copyright:
© 2014 Simon McVittie © 2014 Simon McVittie
License: other License: other

View File

@ -10,7 +10,7 @@ It currently includes these pages:
* [[templates]] * [[templates]]
* [[ikiwiki/formatting]] * [[ikiwiki/formatting]]
* [[ikiwiki/markdown]] * [[ikiwiki/markdown]]
* [[ikiwiki/openid]] * [[ikiwiki/login-selector]]
* [[ikiwiki/pagespec]] * [[ikiwiki/pagespec]]
* [[ikiwiki/directive]] * [[ikiwiki/directive]]
* [[ikiwiki/subpage]] * [[ikiwiki/subpage]]

View File

@ -92,7 +92,7 @@ Here is a full list of the template files used:
* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
`editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
`editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.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. interface; do not normally need to be customised.

View File

@ -1,5 +1,5 @@
<script type="text/javascript" src="ikiwiki/jquery.min.js"></script> <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"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
selector.init( selector.init(

View File

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 460 B

View File

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 592 B

View File

Before

Width:  |  Height:  |  Size: 741 B

After

Width:  |  Height:  |  Size: 741 B

View File

@ -24,30 +24,30 @@ var selections_openid_large = {
var selections_openid_small = { var selections_openid_small = {
verisign: { verisign: {
name: 'Verisign', name: 'Verisign',
icon: 'ikiwiki/openid/verisign.png', icon: 'ikiwiki/login-selector/verisign.png',
label: 'Enter your Verisign username:', label: 'Enter your Verisign username:',
url: 'http://{username}.pip.verisignlabs.com/' url: 'http://{username}.pip.verisignlabs.com/'
}, },
yahoo: { yahoo: {
name: 'Yahoo', name: 'Yahoo',
icon: 'ikiwiki/openid/goa-account-yahoo.png', icon: 'ikiwiki/login-selector/goa-account-yahoo.png',
url: 'http://me.yahoo.com/' url: 'http://me.yahoo.com/'
}, },
flickr: { flickr: {
name: 'Flickr', name: 'Flickr',
icon: 'ikiwiki/openid/goa-account-flickr.png', icon: 'ikiwiki/login-selector/goa-account-flickr.png',
label: 'Enter your Flickr username:', label: 'Enter your Flickr username:',
url: 'http://flickr.com/photos/{username}/' url: 'http://flickr.com/photos/{username}/'
}, },
wordpress: { wordpress: {
name: 'Wordpress', name: 'Wordpress',
icon: 'ikiwiki/openid/wordpress.png', icon: 'ikiwiki/login-selector/wordpress.png',
label: 'Enter your Wordpress.com username:', label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/' url: 'http://{username}.wordpress.com/'
}, },
aol: { aol: {
name: 'AOL', name: 'AOL',
icon: 'ikiwiki/openid/aol.png', icon: 'ikiwiki/login-selector/aol.png',
label: 'Enter your AOL username:', label: 'Enter your AOL username:',
url: 'http://openid.aol.com/{username}' url: 'http://openid.aol.com/{username}'
} }

View File

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 714 B

View File

Before

Width:  |  Height:  |  Size: 886 B

After

Width:  |  Height:  |  Size: 886 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 772 B