changelog

[ikiwiki.git] / 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 59a59c0843f03479bfcf5e54488afa2e4d355b82..0561103843adb093883c0aa437e4ca25fa36b4b2 100644 (file)
--- 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: {
@@ -38,7 +38,7 @@ var providers_small = {
     },
     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/'
     },
@@ -65,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);
 
@@ -82,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');
         
@@ -105,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(
-                       '<a href="' + localloginurl + '"' +
+                       '<a href="javascript: openid.signin(\'localsignin\');"' +
                        ' style="background: #FFF" ' +
-                       'class="openid_small_btn">' +
+                       'class="localsignin openid_small_btn">' +
                        '<img alt="" width="16" height="16" src="favicon.ico" />' +
-                       ' Local Account' +
+                       ' other' +
                        '</a>'
                );
+               $('#'+this.localsignin_id).hide();
        }
         
         $('#openid_form').submit(this.submit);
@@ -121,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="";
@@ -143,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;
@@ -231,14 +247,14 @@ var openid = {
                var label = provider['label'];
                var style = '';
                
-               if (label) {
-                       html = '<p>' + label + '</p>';
-               }
                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 = '<label for="'+ id +'" class="block">' + label + '</label>';
+               }
                html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
                                        '<input id="openid_submit" type="submit" value="Login"/>';