thoughts

[git.ikiwiki.info.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 bf14fd3d58785a488665bb0883c63790dce15281..2c72f19fb1c20d96d296c063c222cbef09d20f7f 100644 (file)
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -6,14 +6,15 @@ This code is licenced under the New BSD License.
 */
 
 var providers_large = {
 */
 
 var providers_large = {

-    google: {
-        name: 'Google',
-       icon: 'http://google.com/favicon.ico',
-        url: 'https://www.google.com/accounts/o8/id'
+    verisign: {
+        name: 'Verisign',
+        icon: 'ikiwiki/openid/verisign.png',
+        label: 'Enter your Verisign username:',
+        url: 'http://{username}.pip.verisignlabs.com/'

     },
     yahoo: {
         name: 'Yahoo',      
     },
     yahoo: {
         name: 'Yahoo',      

-       icon: 'http://yahoo.com/favicon.ico',
+        icon: 'ikiwiki/openid/goa-account-yahoo.png',

         url: 'http://me.yahoo.com/'
     },    
     openid: {
         url: 'http://me.yahoo.com/'
     },    
     openid: {


@@ -21,51 +22,9 @@ var providers_large = {
        icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null
        icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null

-    },
+    }

 };
 var providers_small = {
 };
 var providers_small = {

-    livejournal: {
-        name: 'LiveJournal',
-       icon: 'http://livejournal.com/favicon.ico',
-        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',
-        label: 'Enter your Wordpress.com username:',
-        url: 'http://{username}.wordpress.com/'
-    },
-    myopenid: {
-        name: 'MyOpenID',
-       icon: 'http://myopenid.com/favicon.ico',
-        label: 'Enter your MyOpenID username:',
-        url: 'http://{username}.myopenid.com/'
-    },
-    claimid: {
-        name: 'ClaimID',
-       icon: 'http://claimid.com/favicon.ico',
-        label: 'Enter your ClaimID username:',
-        url: 'http://claimid.com/{username}'
-    },
-    aol: {
-        name: 'AOL',     
-       icon: 'http://aol.com/favicon.ico',
-        label: 'Enter your AOL username:',
-        url: 'http://openid.aol.com/{username}'
-    },
-    verisign: {
-        name: 'Verisign',
-       icon: 'http://verisign.com/favicon.ico',
-        label: 'Enter your Verisign username:',
-        url: 'http://{username}.pip.verisignlabs.com/'
-    },

 };
 var providers = $.extend({}, providers_large, providers_small);
 
 };
 var providers = $.extend({}, providers_large, providers_small);
 


@@ -84,7 +43,7 @@ var openid = {
        provider_id: null,
        localsignin_id: null,
        
        provider_id: null,
        localsignin_id: null,
        

-    init: function(input_id, localsignin_id) {
+    init: function(input_id, localsignin_id, localsignin_label) {

         
         var openid_btns = $('#openid_btns');
         
         
         var openid_btns = $('#openid_btns');
         


@@ -97,33 +56,40 @@ var openid = {
         for (id in providers_large) {
                openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
         for (id in providers_large) {
                openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }

-
-        if (providers_small) {
-               openid_btns.append('<br/>');
-               
-               for (id in providers_small) {
-               
-                       openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
-               }
-        }
+       if (localsignin_label != "") {
+               this.localsignin_label=localsignin_label;
+       }
+       else {
+               this.localsignin_label="other";
+       }

        if (localsignin_id != "") {
                this.localsignin_id=localsignin_id;
                openid_btns.append(
                        '<a href="javascript: openid.signin(\'localsignin\');"' +
                        ' style="background: #FFF" ' +
        if (localsignin_id != "") {
                this.localsignin_id=localsignin_id;
                openid_btns.append(
                        '<a href="javascript: openid.signin(\'localsignin\');"' +
                        ' style="background: #FFF" ' +

-                       'class="localsignin openid_small_btn">' +
+                       'class="localsignin openid_large_btn">' +

                        '<img alt="" width="16" height="16" src="favicon.ico" />' +
                        '<img alt="" width="16" height="16" src="favicon.ico" />' +

-                       ' other' +
+                       ' ' + this.localsignin_label +

                        '</a>'
                );
                        '</a>'
                );

+               $('#'+this.localsignin_id).hide();

        }
        }

+
+        if (providers_small) {
+               openid_btns.append('<br/>');
+               
+               for (id in providers_small) {
+               
+                       openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
+               }
+        }

         
         $('#openid_form').submit(this.submit);
         
         var box_id = this.readCookie();
         if (box_id) {
                this.signin(box_id, true);
         
         $('#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="";
     },
     getBoxHTML: function(provider, box_size) {
        var label="";


@@ -246,14 +212,14 @@ var openid = {
                var label = provider['label'];
                var style = '';
                
                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 (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"/>';
                
                html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
                                        '<input id="openid_submit" type="submit" value="Login"/>';