use labels

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index b4d0e314f5ad0cd2997cafc8a138c5be892a715d..c12df519f5967f9da8821431d90cb3ac88cf9162 100644 (file)
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -12,7 +12,9 @@ $(document).ready(function() {
 
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
        <fieldset>
 
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
        <fieldset>

-               <legend>Select your account provider</legend>
+               <script>
+               $('fieldset').append("<legend>Select your account provider</legend>");
+               </script>

                
                <input type="hidden" name="do" value="signin" />
                <input type="hidden" name="action" value="verify" />
                
                <input type="hidden" name="do" value="signin" />
                <input type="hidden" name="action" value="verify" />


@@ -20,6 +22,7 @@ $(document).ready(function() {
                        <div id="openid_btns"></div>
                </div>
                <div id="openid_input_area">
                        <div id="openid_btns"></div>
                </div>
                <div id="openid_input_area">

+                       <label for="openid_identifier" class="block">Enter your OpenID:</label>

                        <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
                        <input id="openid_submit" type="submit" value="Login"/>
                </div>
                        <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
                        <input id="openid_submit" type="submit" value="Login"/>
                </div>

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index bf14fd3d58785a488665bb0883c63790dce15281..4eaa613d978e39dda431c20088629c5be3dc9420 100644 (file)
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -246,14 +246,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"/>';