diff options
| author | Gunnar Mills <gmills@us.ibm.com> | 2018-09-11 11:23:38 -0500 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-09-12 15:26:22 +0000 |
| commit | 264c5b8a131fbb554fa4804cc77095a741a0c7e7 (patch) | |
| tree | abbd445752335db76691c9030c6bfbce530b466b /app/login | |
| parent | f8f19f95fd5dc55373e9f50a3f11f37b121a4de4 (diff) | |
| download | phosphor-webui-264c5b8a131fbb554fa4804cc77095a741a0c7e7.tar.gz phosphor-webui-264c5b8a131fbb554fa4804cc77095a741a0c7e7.zip | |
Highlight correct fields on errors
If the error is 'Invalid username or password', the 'Username'
and 'Password' fields now becomes red.
On any other error (e.g. Server unreachable) the
'BMC Host or BMC IP Address' field is red.
Before the 'BMC Host or BMC IP Address' and 'Username'
were red on all errors.
Resolves openbmc/phosphor-webui#17
Tested: See correct fields highlighted.
Change-Id: I55514cfb428170cd125ec01eb4c7184fbadd3894
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/login')
| -rw-r--r-- | app/login/controllers/login-controller.html | 6 | ||||
| -rw-r--r-- | app/login/controllers/login-controller.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/login/controllers/login-controller.html b/app/login/controllers/login-controller.html index 16c5e82..2d1ec99 100644 --- a/app/login/controllers/login-controller.html +++ b/app/login/controllers/login-controller.html @@ -13,13 +13,13 @@ <div class="columns large-6 disabled"> <form id="login__form" action=""> <label >BMC Host or BMC IP Address</label> - <input type="text" ng-model="host" required ng-class="{error: error}" autofocus ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> + <input type="text" ng-model="host" required ng-class="{'error': error && description != 'Invalid username or password'}" autofocus ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> <label for="username">Username</label> - <input type="text" id="username" name="username" required ng-model="username" ng-class="{error: error}" ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> + <input type="text" id="username" name="username" required ng-model="username" ng-class="{'error': description == 'Invalid username or password'}" ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> <label for="password">Password</label> - <input type="password" id="password" name="password" class="" required ng-model="password" ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> + <input type="password" id="password" name="password" required ng-class="{'error': description == 'Invalid username or password'}" ng-model="password" ng-keydown="tryLogin(host, username, password, $event)" ng-disabled="dataService.loading"> <input id="login__submit" class="btn-primary submit" type="button" value="Log in" role="button" ng-click="login(host, username, password)" ng-class="{error: error}" ng-disabled="dataService.loading"> diff --git a/app/login/controllers/login-controller.js b/app/login/controllers/login-controller.js index eb8e303..8877df7 100644 --- a/app/login/controllers/login-controller.js +++ b/app/login/controllers/login-controller.js @@ -24,7 +24,7 @@ window.angular && (function(angular) { }; $scope.login = function(host, username, password) { $scope.error = false; - $scope.description = false; + $scope.description = 'Error logging in'; if (!username || username == '' || !password || password == '' || !host || host == '') { |
