From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 20:16:38 +0000 (-0400)
Subject: use labels
X-Git-Tag: 3.20100515~46
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=bf19c01f29a7e740f47354318629e61ad4ee5175

use labels
---

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index b4d0e314f..c12df519f 100644
--- 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>
-		<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" />
@@ -20,6 +22,7 @@ $(document).ready(function() {
 			<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>
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index bf14fd3d5..4eaa613d9 100644
--- 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 = '';
 		
-		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"/>';