Updating login structure

Updated login structure with a field where user can manually add server hostname if it is not populated automatically

Change-Id: I147c2c15869131540e327bda26c05b59d78e01d5
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/app/login/controllers/login-controller.html b/app/login/controllers/login-controller.html
index 162ede3..77ca583 100644
--- a/app/login/controllers/login-controller.html
+++ b/app/login/controllers/login-controller.html
@@ -9,23 +9,19 @@
     <div class="row">
         <div class="columns large-6 login__desc">
             <h1>OpenBMC for IBM Power Systems</h1>
-            <ul class="login__server-info">
-                <li><p class="login__info-label">API version</p><p>X.XX.XXX</p></li>
-                <li><p class="login__info-label">Server ID</p><p>XXXXXXXXXXXXXXXX</p></li>
-                <li><p class="login__info-label">Server model</p><p>Power XX-XXXXX</p></li>
-                <li><p class="login__info-label">Server power</p><p class="status-light__disabled">Indeterminate</p></li>
-                <li><p class="login__info-label">Status message</p><!--<p>BMC was reset by user</p>--></li>
-            </ul>
         </div>
         <div class="columns large-6 disabled">
             <form id="login__form" action="">
+                <label >Host</label>
+                <input type="text" ng-model="host" required  ng-class="{error: error}" 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(username, password, $event)" ng-disabled="dataService.loading" autofocus>
+                <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">
 
                 <label for="password">Password</label>
-                <input type="password" id="password" name="password" class="" required ng-model="password" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
+                <input type="password" id="password" name="password" class="" required 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(username, password)" ng-class="{error: error}" 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">
 
                 <p class="login__error-msg" role="alert" ng-if="error">Incorrect username or password</p>
                 <p class="login__error-msg" role="alert" ng-if="server_unreachable">Server unreachable</p>
diff --git a/app/login/controllers/login-controller.js b/app/login/controllers/login-controller.js
index d8e8951..79ee477 100644
--- a/app/login/controllers/login-controller.js
+++ b/app/login/controllers/login-controller.js
@@ -21,6 +21,7 @@ window.angular && (function (angular) {
             '$routeParams',
             function($scope, $window, APIUtils, dataService, userModel, $routeParams){
                 $scope.dataService = dataService;
+                $scope.host = $scope.dataService.host.replace(/^https?\:\/\//ig, '');
 
                 if($routeParams.fake_login &&
                    $routeParams.fake_login === 'fake_login'){
@@ -28,19 +29,22 @@ window.angular && (function (angular) {
                     $window.location.hash = '#/overview/server';
                 }
 
-                $scope.tryLogin = function(username, password, event){
+                $scope.tryLogin = function(host, username, password, event){
                     if(event.keyCode === 13){
-                        $scope.login(username, password);
+                        $scope.login(host, username, password);
                     }
                 }; 
-                $scope.login = function(username, password){
+                $scope.login = function(host, username, password){
                     $scope.error = false;
                     $scope.server_unreachable = false;
 
                     if(!username || username == "" ||
-                       !password || password == ""){
+                       !password || password == "" ||
+                       !host || host == ""
+                       ){
                         return false;
                     }else{
+                        $scope.dataService.setHost(host);
                         userModel.login(username, password, function(status, unreachable){
                             if(status){
                                 $scope.$emit('user-logged-in',{});