summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJayashankar Padath <jayashankar.padath@in.ibm.com>2018-02-16 15:34:55 +0530
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-03-09 16:04:23 +0000
commita5f48c7466ec81bda4576af0a9b5d0e30dd4608f (patch)
tree6867766f75df9e04d087470074e5ce3e192beec2
parent3c837f45b6149a38e11b35d680ec9e8e64d547da (diff)
downloadphosphor-webui-a5f48c7466ec81bda4576af0a9b5d0e30dd4608f.tar.gz
phosphor-webui-a5f48c7466ec81bda4576af0a9b5d0e30dd4608f.zip
BMC IP changed to BMC host/IP and corrected the value truncation in webgui.
Resolves openbmc/openbmc#2894 Tested: Running GUI locally and verified the new texts. Also made sure that value truncation is not happening. Change-Id: Ic3947b36ef83fe5cb37190a848c85156cc072afd Signed-off-by: Jayashankar Padath <jayashankar.padath@in.ibm.com>
-rw-r--r--app/common/directives/app-header.html2
-rw-r--r--app/common/styles/layout/header.scss2
-rw-r--r--app/overview/controllers/system-overview-controller.html4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 3464518..484d906 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -11,7 +11,7 @@
</button>-->
<div class="inline header__server-name">
<p class="header__hostname">{{dataService.hostname}}</p>
- <p class="header__server-ip courier-bold">BMC IP address {{dataService.server_id}}</p>
+ <p class="header__server-ip courier-bold">BMC host/IP address {{dataService.server_id}}</p>
</div>
<div class="header__functions" ng-class="{'active' : toggle}">
<a class="header__info" ng-click="toggle = !toggle"><span>Server Info</span><i class="icon icon-angle" aria-hidden="true"></i></a>
diff --git a/app/common/styles/layout/header.scss b/app/common/styles/layout/header.scss
index e2d5260..e14a5e6 100644
--- a/app/common/styles/layout/header.scss
+++ b/app/common/styles/layout/header.scss
@@ -64,7 +64,7 @@ header {
padding: .4em 0 0 1em;
height: 100%;
background: transparent;
- max-width: 350px;
+ max-width: 600px;
white-space: nowrap;
overflow: hidden;
.header__hostname {
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 3ec7e6e..094fac0 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -44,7 +44,7 @@
<p class="courier-bold overview__hostname">{{dataService.hostname}}</p>
</li>
<li class="overview__metadata-block">
- <p class="content-label">BMC IP address</p>
+ <p class="content-label">BMC Host/IP address</p>
<p class="courier-bold">{{dataService.server_id}}</p>
</li>
<li class="overview__metadata-block">
@@ -179,4 +179,4 @@
</div>
</div>
</section>
-<div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_server_name}"></div> \ No newline at end of file
+<div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_server_name}"></div>
OpenPOWER on IntegriCloud