Changeset 7500 for trunk/www/main.jsp

Timestamp:

Aug 8, 2018, 12:57:12 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2124: Add support for a third field in the login form

Added an extra field getExtraField() to the LoginFormAction interface. A default implementation should provide backwards compatibility to existing implementations.

The login forms have been updated to display the extra field if it is present. The entered value is added to the LoginRequest as an attribute with name extraValue.

File:

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

trunk/www/main.jsp

@@ -102 +102 @@
   FieldInfo loginField = loginAction.getLoginField();
   FieldInfo passwordField = loginAction.getPasswordField();
+  FieldInfo extraField = loginAction.getExtraField();
   %>
   <base:page type="default">
@@ -150 +151 @@
                 <%=loginAction.rememberLastLogin() ? "" : "autocomplete=\"off\" data-use-last-login=\"0\""%>
                 maxlength="100" 
-                tabindex="0">
+                tabindex="1">
               </td>
             </tr>
@@ -162 +163 @@
                 <%=valueIfNotNull("placeholder=\"", passwordField.getPlaceHolder(), "\"") %>
                 maxlength="80"
-                tabindex="0">
+                tabindex="2">
               </td>
-              <td><base:button 
+              <td <%=extraField != null?"rowspan=\"2\"" : "" %> style="vertical-align: bottom;"><base:button 
                 id="btnLogin"
                 subclass="<%=denyLogin ? "disabled" : ""%>"
                 image="login.png" title="Login" 
-                tooltip="<%=HTML.encodeTags(broadcastTitle)%>" /></td>
+                tooltip="<%=HTML.encodeTags(broadcastTitle)%>" tabindex="4" /></td>
             </tr>
+            <%
+            if (extraField != null)
+            {
+              %>
+              <tr <%=valueIfNotNull("class=\"", extraField.getClazz(), "\"")%> id="extra-row">
+                <th class="bg-filled-100"><%=extraField.getPrompt() %></th>
+                <td><input class="text" name="extraField" id="extraField"
+                  type="<%=extraField.hasHiddenCharacters() ? "password" : "text"%>"
+                  <%=denyLogin ? "disabled" : ""%>
+                  <%=valueIfNotNull("style=\"", extraField.getStyle(), "\"") %>
+                  <%=valueIfNotNull("title=\"", extraField.getTooltip(), "\"") %>
+                  <%=valueIfNotNull("placeholder=\"", extraField.getPlaceHolder(), "\"") %>
+                  maxlength="80"
+                  tabindex="3">
+                </td>
+              </tr>
+              <%
+            }
+            %>
             <tr>
               <th class="bg-filled-100 subprompt"></th>