Merge pull request #4737 from natwestmarkets/nwm-contrib/waltz-4735-l…

…ogin-enter-key NWM-Contrib: Login: enter key to submit log in form
finos · Mar 5, 2020 · 7e06da5 · 7e06da5
2 parents 82514c9 + 2eb28d3
commit 7e06da5
Showing 1 changed file with 33 additions and 29 deletions.
diff --git a/waltz-ng/client/navbar/directives/navbar-profile.html b/waltz-ng/client/navbar/directives/navbar-profile.html
@@ -175,35 +175,39 @@ <h3 class="modal-title">
                     <small ng-bind="logoOverlayText"></small>
                 </h3>
             </div>
-
-            <div class="modal-body">
-                <form>
-                    <label>Username</label>
-                    <input class='form-control input-sm'
-                           ng-model="username"
-                           autofocus
-                           placeholder="username">
-
-                    <label>Password</label>
-                    <input class='form-control input-sm'
-                           type="password"
-                           ng-model="password"
-                           placeholder="password">
-                </form>
-            </div>
-
-            <div class="modal-footer">
-                <button class="btn btn-primary"
-                        type="button"
-                        ng-click="ok()">
-                    OK
-                </button>
-                <button class="btn btn-warning"
-                        type="button"
-                        ng-click="cancel()">
-                    Cancel
-                </button>
-            </div>
+            <form name="loginForm"
+                  novalidate>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label>Username</label>
+                        <input class='form-control input-sm'
+                               ng-model="username"
+                               autofocus
+                               required
+                               placeholder="username"/>
+                    </div>
+                    <div class="form-group">
+                        <label>Password</label>
+                        <input class='form-control input-sm'
+                               type="password"
+                               ng-model="password"
+                               placeholder="password"/>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary"
+                            type="submit"
+                            ng-disabled="loginForm.$invalid"
+                            ng-click="ok()">
+                        OK
+                    </button>
+                    <button class="btn btn-warning"
+                            type="button"
+                            ng-click="cancel()">
+                        Cancel
+                    </button>
+                </div>
+            </form>
         </script>
     </li>