Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / templates / login-selector.tmpl

diff --git a/templates/login-selector.tmpl b/templates/login-selector.tmpl
index e3a91fef2c85b9d2ff9c45e8d7bf86b7364bcfd4..3e7045c63d3b770fdd12a278a5470132cb0f8d3f 100644 (file)
--- 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>