From d7c49356273630f31828dec052dec6ca9b84db8f Mon Sep 17 00:00:00 2001
From: chi zhang <Chi.Zhang1@huawei.com>
Date: Fri, 14 Nov 2014 17:50:43 -0800
Subject: [PATCH] fixed: 1. server confidential 2. unchanged username and
 password on review page.

Change-Id: Iaa60fa5c599196efd0d092f846b0d7f0c09eb785
---
 v2/src/app/appDev.js                        |  4 ++--
 v2/src/app/services.js                      |  2 +-
 v2/src/app/wizard/global.tpl.html           | 12 +++++++++++-
 v2/src/app/wizard/server_selection.tpl.html |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/v2/src/app/appDev.js b/v2/src/app/appDev.js
index d768680..dc5b610 100644
--- a/v2/src/app/appDev.js
+++ b/v2/src/app/appDev.js
@@ -709,8 +709,8 @@ compassAppDev.run(function($httpBackend, settings, $http) {
         var config = {
             "os_config": {
                 "server_credentials": {
-                    "username": "root",
-                    "password": "huawei"
+                    "username": "",
+                    "password": ""
                 },
                 "partition": {
                     "/var": {
diff --git a/v2/src/app/services.js b/v2/src/app/services.js
index b3f8aa9..c19903b 100644
--- a/v2/src/app/services.js
+++ b/v2/src/app/services.js
@@ -465,7 +465,7 @@ define(['angular','uiBootstrap'], function(ng, uiBootstrap) {
             };
 
             wizard.getServerCredentials = function() {
-                return angular.copy(wizard.server_credentials);
+                return wizard.server_credentials;
             }
             wizard.setServiceCredentials = function(credentials) {
                 wizard.service_credentials = credentials;
diff --git a/v2/src/app/wizard/global.tpl.html b/v2/src/app/wizard/global.tpl.html
index fc1d891..cc1ccba 100644
--- a/v2/src/app/wizard/global.tpl.html
+++ b/v2/src/app/wizard/global.tpl.html
@@ -177,7 +177,14 @@
                 <div class="form-group">
                     <div>
                         <label class="col-sm-4 control-label no-padding-right">
-                            Server Credentials
+                            <h4> Server Credentials: </h4>
+                        </label>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div>
+                        <label class="col-sm-4 control-label no-padding-right">
+                            User Name
                             <span class="text-danger">*</span>
                         </label>
                         <div class="col-sm-8">
@@ -189,8 +196,10 @@
                 <div class="form-group">
                     <div>
                         <label class="col-sm-4 control-label no-padding-right">
+                            Password
                             <span class="text-danger">*</span>
                         </label>
+                        </label>
                         <div class="col-sm-8">
                             <input type="password" class="col-xs-10 col-sm-5" placeholder="Password" name="server-password" ng-model="server_credentials.password" required>
                         </div>
@@ -200,6 +209,7 @@
                 <div class="form-group">
                     <div>
                         <label class="col-sm-4 control-label no-padding-right">
+                            Confirm Password
                             <span class="text-danger">*</span>
                         </label>
                         <div class="col-sm-8">
diff --git a/v2/src/app/wizard/server_selection.tpl.html b/v2/src/app/wizard/server_selection.tpl.html
index 92ad3cd..014ca71 100644
--- a/v2/src/app/wizard/server_selection.tpl.html
+++ b/v2/src/app/wizard/server_selection.tpl.html
@@ -109,4 +109,4 @@
             </table>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file