X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/3a1d81bd9c5a866aed0dd7890a4174f0ff6b1e78..7e9ca590c745ad01f7d0beb44bbe24eea35f531d:/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 8137f232f..c59be1edc 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -21,7 +21,7 @@ var providers_large = {
icon: 'wikiicons/openidlogin-bg.gif',
label: 'Enter your OpenID:',
url: null
- },
+ }
};
var providers_small = {
livejournal: {
@@ -31,10 +31,10 @@ var providers_small = {
url: 'http://{username}.livejournal.com/'
},
flickr: {
- name: 'Flickr',
+ name: 'Flickr',
icon: 'http://flickr.com/favicon.ico',
- label: 'Enter your Flickr username:',
- url: 'http://flickr.com/{username}/'
+ label: 'Enter your Flickr username:',
+ url: 'http://flickr.com/photos/{username}/'
},
wordpress: {
name: 'Wordpress',
@@ -42,18 +42,6 @@ var providers_small = {
label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/'
},
- blogger: {
- name: 'Blogger',
- icon: 'http://blogger.com/favicon.ico',
- label: 'Enter your Blogger account:',
- url: 'http://{username}.blogspot.com/'
- },
- technorati: {
- name: 'Technorati',
- icon: 'http://technorati.com/favicon.ico',
- label: 'Enter your Technorati username:',
- url: 'http://technorati.com/people/technorati/{username}/'
- },
myopenid: {
name: 'MyOpenID',
icon: 'http://myopenid.com/favicon.ico',
@@ -69,7 +57,7 @@ var providers_small = {
aol: {
name: 'AOL',
icon: 'http://aol.com/favicon.ico',
- label: 'Enter your AOL screenname:',
+ label: 'Enter your AOL username:',
url: 'http://openid.aol.com/{username}'
},
verisign: {
@@ -77,7 +65,7 @@ var providers_small = {
icon: 'http://verisign.com/favicon.ico',
label: 'Enter your Verisign username:',
url: 'http://{username}.pip.verisignlabs.com/'
- },
+ }
};
var providers = $.extend({}, providers_large, providers_small);
@@ -94,8 +82,9 @@ var openid = {
input_id: null,
provider_url: null,
provider_id: null,
+ localsignin_id: null,
- init: function(input_id, localloginurl) {
+ init: function(input_id, localsignin_id) {
var openid_btns = $('#openid_btns');
@@ -109,16 +98,6 @@ var openid = {
openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
}
- if (localloginurl != "") {
- openid_btns.append(
- '' +
- '' +
- ' Local Account' +
- ''
- );
- }
if (providers_small) {
openid_btns.append('
');
@@ -127,13 +106,25 @@ var openid = {
openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
}
}
+ if (localsignin_id != "") {
+ this.localsignin_id=localsignin_id;
+ openid_btns.append(
+ '' +
+ '' +
+ ' other' +
+ ''
+ );
+ $('#'+this.localsignin_id).hide();
+ }
$('#openid_form').submit(this.submit);
var box_id = this.readCookie();
if (box_id) {
this.signin(box_id, true);
- }
+ }
},
getBoxHTML: function(provider, box_size) {
var label="";
@@ -155,22 +146,36 @@ var openid = {
},
/* Provider image click */
signin: function(box_id, onload) {
-
+
+ if (box_id == 'localsignin') {
+ this.highlight(box_id);
+ $('#openid_input_area').empty();
+ $('#'+this.localsignin_id).show();
+ this.setCookie(box_id);
+ return;
+ }
+ else {
+ if (this.localsignin_id) {
+ $('#'+this.localsignin_id).hide();
+ }
+ }
+
var provider = providers[box_id];
if (! provider) {
return;
}
this.highlight(box_id);
- this.setCookie(box_id);
this.provider_id = box_id;
this.provider_url = provider['url'];
// prompt user for input?
if (provider['label']) {
+ this.setCookie(box_id);
this.useInputBox(provider);
} else {
+ this.setCookie('');
$('#openid_input_area').empty();
if (! onload) {
$('#openid_form').submit();
@@ -242,14 +247,14 @@ var openid = {
var label = provider['label'];
var style = '';
- if (label) {
- html = '
' + label + '
'; - } if (provider['name'] == 'OpenID') { id = this.input_id; value = ''; style = 'background:#FFF url(wikiicons/openidlogin-bg.gif) no-repeat scroll 0 50%; padding-left:18px;'; } + if (label) { + html = ''; + } html += '' + '';