X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/885ac1de47f001f6dcc2393ac8b14f717c2d1780..7cb42cb1a80854e570b4f19863409ae6cc263680:/templates/openid-selector.tmpl?ds=sidebyside

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 7e5ae9a01..0fd833042 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -1,37 +1,43 @@
-<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
 <script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-	openid.init('openid_identifier', "<TMPL_VAR NONOPENIDURL>");
+	openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>');
 });
 </script>
-	
+
+<noscript>
+<h2>OpenID:</h2>
+</noscript>
+
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
 	<fieldset>
-		<legend>Select your account provider</legend>
-
-		<noscript>
-		<ul>
-		<TMPL_IF NONOPENIDURL>
-		<li><a href="<TMPL_VAR NONOPENIDURL>">Local Account</a></li>
-		</TMPL_IF>
-		<li>OpenID:</div>
-		</noscript>
+		<script>
+		$('fieldset').append("<legend>Select your account provider</legend>");
+		</script>
+		
 		<input type="hidden" name="do" value="signin" />
 		<input type="hidden" name="action" value="verify" />
 		<div id="openid_choice">
 			<div id="openid_btns"></div>
 		</div>
 		<div id="openid_input_area">
-			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
+			<label for="openid_identifier" class="block">Enter your OpenID:</label>
+			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR ESCAPE=HTML OPENID_URL>"/>
 			<input id="openid_submit" type="submit" value="Login"/>
 		</div>
 		<TMPL_IF OPENID_ERROR>
 		<div class="error"><TMPL_VAR OPENID_ERROR></div>
 		</TMPL_IF>
-		<noscript>
-		</li>
-		</ul>
-		</noscript>
 	</fieldset>
 </form>
+
+<div id="nonopenidform">
+<TMPL_IF NONOPENIDFORM>
+<br />
+<noscript>
+<h2>Other:</h2>
+</noscript>
+</TMPL_IF>
+<TMPL_VAR NONOPENIDFORM>
+</div>