Merge branch 'ready/more-proxy-utf8-fail'

[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 8137f232f008d1af45be28c976646c9a4367ae99..0400ae6bbf6d0b6d24146f3b135692b79e3acc56 100644 (file)
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -8,12 +8,18 @@ This code is licenced under the New BSD License.
 var providers_large = {
     google: {
         name: 'Google',
 var providers_large = {
     google: {
         name: 'Google',

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

         url: 'https://www.google.com/accounts/o8/id'
     },
         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,63 +27,33 @@ 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 = {
     livejournal: {
         name: 'LiveJournal',
 };
 var providers_small = {
     livejournal: {
         name: 'LiveJournal',

-       icon: 'http://livejournal.com/favicon.ico',
+        icon: 'ikiwiki/openid/livejournal.png',

         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
     flickr: {
         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/{username}/'
+       name: 'Flickr',        
+       icon: 'ikiwiki/openid/goa-account-flickr.png',
+       label: 'Enter your Flickr username:',
+       url: 'http://flickr.com/photos/{username}/'

     },
     wordpress: {
         name: 'Wordpress',
     },
     wordpress: {
         name: 'Wordpress',

-       icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
+       icon: 'ikiwiki/openid/wordpress.png',

         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
         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',
-        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',     
     aol: {
         name: 'AOL',     

-       icon: 'http://aol.com/favicon.ico',
-        label: 'Enter your AOL screenname:',
+        icon: 'ikiwiki/openid/aol.png',
+        label: 'Enter your AOL username:',

         url: 'http://openid.aol.com/{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);
 


@@ -94,8 +70,9 @@ var openid = {
        input_id: null,
        provider_url: null,
        provider_id: null,
        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');
         
         
         var openid_btns = $('#openid_btns');
         


@@ -109,16 +86,6 @@ var openid = {
                openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
 
                openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
 

-       if (localloginurl != "") {
-               openid_btns.append(
-                       '<a href="' + localloginurl + '"' +
-                       ' style="background: #FFF" ' +
-                       'class="openid_large_btn">' +
-                       '<img alt="" width="16" height="16" src="favicon.ico" />' +
-                       ' Local Account' +
-                       '</a>'
-               );
-       }

         if (providers_small) {
                openid_btns.append('<br/>');
                
         if (providers_small) {
                openid_btns.append('<br/>');
                


@@ -127,13 +94,25 @@ var openid = {
                        openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
                }
         }
                        openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
                }
         }

+       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">' +
+                       '<img alt="" width="16" height="16" src="favicon.ico" />' +
+                       ' other' +
+                       '</a>'
+               );
+               $('#'+this.localsignin_id).hide();
+       }

         
         $('#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="";


@@ -155,22 +134,36 @@ var openid = {
     },
     /* Provider image click */
     signin: function(box_id, onload) {
     },
     /* 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);
        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.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.useInputBox(provider);
                } else {

+                       this.setCookie('');

                        $('#openid_input_area').empty();
                        if (! onload) {
                                $('#openid_form').submit();
                        $('#openid_input_area').empty();
                        if (! onload) {
                                $('#openid_form').submit();


@@ -242,14 +235,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"/>';