X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f8add0adb327a6514bbfc1773e1fc9577c98fa32..e0ce38dc42f461539a7c8f0594b95473d4494689:/templates/login-selector.tmpl?ds=sidebyside

diff --git a/templates/login-selector.tmpl b/templates/login-selector.tmpl
index e3a91fef2..3e7045c63 100644
--- a/templates/login-selector.tmpl
+++ b/templates/login-selector.tmpl
@@ -6,7 +6,7 @@ $(document).ready(function() {
 		'openid_identifier',
 		{
 			<TMPL_IF LOGIN_SELECTOR_OPENID>'openid': 1,</TMPL_IF>
-			<TMPL_IF LOGIN_SELECTOR_EMAIL>'email': 1,</TMPL_IF>
+			<TMPL_IF LOGIN_SELECTOR_EMAILAUTH>'email': 1,</TMPL_IF>
 		},
 		'<TMPL_IF OTHERFORM>otherform</TMPL_IF>',
 		'<TMPL_VAR OTHERFORM_LABEL>'
@@ -27,27 +27,30 @@ $(document).ready(function() {
 		</div>
 
 		<div id="login_input_area">
-		<div>
-		<h3>OpenId login:</h3>
 		<TMPL_IF LOGIN_SELECTOR_OPENID>
-			<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>
+				<h3>OpenId login:</h3>
+				<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>
-		</div>
-		<div>
-		<h3>Email login:</h3>
-		<TMPL_IF LOGIN_SELECTOR_EMAIL>
-			<label for="email_address" class="block">Enter your email address:</label>
-			<input id="email_address" name="Email_entry" type="text" value="<TMPL_VAR ESCAPE=HTML EMAIL_ADDRESS>"/>
-			<input id="email_submit" type="submit" value="Login"/>
+		<TMPL_IF LOGIN_SELECTOR_EMAILAUTH>
+			<div>
+				<h3>Email login:</h3>
+				<label for="email_address" class="block">Enter your email address:</label>
+				<input id="email_address" name="Email_entry" type="text" value="<TMPL_VAR ESCAPE=HTML EMAIL_ADDRESS>"/>
+				<input id="email_submit" type="submit" value="Login"/>
+			</div>
 		</TMPL_IF>
 		</div>
-		</div>
 
 		<TMPL_IF LOGIN_ERROR>
 		<div class="error"><TMPL_VAR LOGIN_ERROR></div>
 		</TMPL_IF>
+		<TMPL_IF LOGIN_INFO>
+		<TMPL_VAR LOGIN_INFO>
+		</TMPL_IF>
 	</div>
 </form>