aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-08 15:57:39 -0400
committerJoey Hess <joey@kitenet.net>2010-05-08 15:57:39 -0400
commitc3e9215e1fcb604c3ee01119fdf7cf13724c3812 (patch)
treed52efb71b310fdd70a7f7e2799132605d4fd4391 /templates
parentf735e2d1b3ced6dc1e246e61be0256302ff5eb14 (diff)
downloadikiwiki-c3e9215e1fcb604c3ee01119fdf7cf13724c3812.tar
ikiwiki-c3e9215e1fcb604c3ee01119fdf7cf13724c3812.tar.gz
moved non-openid signin form into same page as openid selector; show/hide as buttons are pressed
Diffstat (limited to 'templates')
-rw-r--r--templates/openid-selector.tmpl31
1 files changed, 17 insertions, 14 deletions
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 7e5ae9a01..b4d0e314f 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -2,21 +2,18 @@
<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>
+
<input type="hidden" name="do" value="signin" />
<input type="hidden" name="action" value="verify" />
<div id="openid_choice">
@@ -29,9 +26,15 @@ $(document).ready(function() {
<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>Local Account:</h2>
+</noscript>
+</TMPL_IF>
+<TMPL_VAR NONOPENIDFORM>
+</div>