Changeset 8037 for branches/3.19-stable

Timestamp:

May 25, 2022, 8:57:40 AM (10 months ago)

Author:

Nicklas Nordborg

Message:

References #2278: Improvements to login page for better extensions

Added a <div id="login-error"> that is always included in the HTML but hidden if there is no current error message.

Location:

branches/3.19-stable/www

Files:

• login.js (modified) (1 diff)
• main.jsp (modified) (1 diff)
• switch.jsp (modified) (2 diffs)

branches/3.19-stable/www/login.js

@@ -307 +307 @@
     
     // Send custom event to let extensions do stuff before submitting
+    Doc.hide('login-error');
     var evt = new CustomEvent('before-login', { cancelable: true, bubbles: true });
     if (frm.dispatchEvent(evt)) 

branches/3.19-stable/www/main.jsp

@@ -174 +174 @@
         <%
       }
-      if (error != null) 
-      {
-        %>
-        <div class="messagecontainer error" style="margin-top: 1em; margin-bottom: 1em;"><%=error%></div>
-        <%
-      }
       %>
+      <div id="login-error" class="messagecontainer error" 
+        style="margin-top: 1em; margin-bottom: 1em;<%=error==null?"display:none;":""%>">
+        <%=error==null?"":error%>
+      </div>
       <table style="width: 100%; border-collapse: separate;">
       <tr>

branches/3.19-stable/www/switch.jsp

@@ -203 +203 @@
             <%=loginAction.getHelp() %>
             </div>
+            <div id="login-error" class="messagecontainer error" 
+              style="margin-top: 1em; margin-bottom: 1em; display:none;">
+            </div>
           </div>
           </td>
@@ -213 +216 @@
         <tr class="dynamic">
           <th></th>
-          <td></td>
+          <td>
+            <div id="login-error" class="messagecontainer error" 
+              style="margin-top: 1em; margin-bottom: 1em; display:none;">
+            </div>
+          </td>
         </tr>
         <%