Changeset 7537 for trunk/www/main.jsp

Timestamp:

Nov 28, 2018, 9:07:39 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

Redesign of the login form to avoid things that "jump" around when switching login manager.

File:

• trunk/www/main.jsp (modified) (2 diffs)

trunk/www/main.jsp

@@ -130 +130 @@
     <input type="hidden" name="deviceToken" value="">
     
-    <table style="margin: auto; width: 700px;">
+    <table style="margin: auto; width: 700px;" id="the-login-form">
     <tr>
     <td>
       <%
-      if (loginAction.getHelp() != null)
-      {
-        %>
-        <div class="messagecontainer help" style="margin-bottom: 1em; font-style: italic;" id="login-help">
-        <%=loginAction.getHelp() %>
-        </div>
-        <%
-      }
-      if (error != null) 
-      {
-        %>
-        <div class="messagecontainer error" style="margin-top: 1em; margin-bottom: 1em;"><%=error%></div>
-        <%
-      }
       if (allForms.size() > 1)
       {
@@ -171 +157 @@
         %>
         <input type="hidden" name="loginForm" value="<%=selectedLoginForm%>">
+        <%
+      }
+      if (loginAction.getHelp() != null)
+      {
+        %>
+        <div class="messagecontainer help" style="margin-bottom: 1em; font-style: italic;" id="login-help">
+        <%=loginAction.getHelp() %>
+        </div>
+        <%
+      }
+      if (error != null) 
+      {
+        %>
+        <div class="messagecontainer error" style="margin-top: 1em; margin-bottom: 1em;"><%=error%></div>
         <%
       }