X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/32a79523bbb4051a9a528a148a6db82e9fdd20d6..HEAD:/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 544ba8936..056110384 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: {
@@ -30,24 +30,18 @@ var providers_small = {
label: 'Enter your Livejournal username:',
url: 'http://{username}.livejournal.com/'
},
+ flickr: {
+ name: 'Flickr',
+ icon: 'http://flickr.com/favicon.ico',
+ label: 'Enter your Flickr username:',
+ url: 'http://flickr.com/photos/{username}/'
+ },
wordpress: {
name: 'Wordpress',
- icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
+ icon: 'https://s2.wp.com/i/favicon.ico',
label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/'
},
- gmail: {
- name: 'Gmail',
- icon: 'http://mail.google.com/favicon.ico',
- label: 'Enter your Gmail address:',
- url: 'http://google.com/profiles/{email_username}/'
- },
- flickr: {
- name: 'Flickr',
- icon: 'http://www.flickr.com/favicon.ico',
- label: 'Enter your Flickr username:',
- url: 'http://flickr.com/photos/{username}/'
- },
myopenid: {
name: 'MyOpenID',
icon: 'http://myopenid.com/favicon.ico',
@@ -71,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);
@@ -88,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');
@@ -111,15 +106,17 @@ var openid = {
openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
}
}
- if (localloginurl != "") {
+ if (localsignin_id != "") {
+ this.localsignin_id=localsignin_id;
openid_btns.append(
- '' +
+ 'class="localsignin openid_small_btn">' +
'' +
- ' Local Account' +
+ ' other' +
''
);
+ $('#'+this.localsignin_id).hide();
}
$('#openid_form').submit(this.submit);
@@ -127,7 +124,7 @@ var openid = {
var box_id = this.readCookie();
if (box_id) {
this.signin(box_id, true);
- }
+ }
},
getBoxHTML: function(provider, box_size) {
var label="";
@@ -149,7 +146,20 @@ 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;
@@ -178,7 +188,6 @@ var openid = {
var url = openid.provider_url;
if (url) {
url = url.replace('{username}', $('#openid_username').val());
- url = url.replace('{email_username}', $('#openid_username').val().split('@')[0]);
openid.setOpenIdUrl(url);
}
if(openid.ajaxHandler) {
@@ -238,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 += '' + '';