start on sensors redesign.
Change-Id: Iab823cc3f4643a567b85a036c9dd4d78db02ad05
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 661b4a5..4891c61 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -74,9 +74,9 @@
<li ng-class="{'active': (path == '/server-health/event-log')}">
<a href="#/server-health/event-log" tabindex="3" ng-click="closeSubnav()">Event log</a></li>
<li ng-class="{'active': (path == '/server-health/inventory-overview' || path == '/server-health/inventory')}" ng-click="closeSubnav()">
- <a href="#/server-health/inventory-overview" tabindex="4">Hardware inventory</a></li>
+ <a href="#/server-health/inventory-overview" tabindex="4">Hardware status</a></li>
<li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}">
- <a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="5">Sensor data</a></li>
+ <a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="5">Sensors</a></li>
<!--<li ng-class="{'active': (path == '/server-health/power-consumption')}"><a href="#/server-health/power-consumption" tabindex="4" ng-click="closeSubnav()">Power consumption</a></li>-->
<li ng-class="{'active': (path == '/server-health/unit-id')}">
<a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Server indicator</a></li>
diff --git a/app/common/styles/elements/toggle-filter.scss b/app/common/styles/elements/toggle-filter.scss
index 6e061a4..1a7d602 100644
--- a/app/common/styles/elements/toggle-filter.scss
+++ b/app/common/styles/elements/toggle-filter.scss
@@ -11,12 +11,13 @@
margin-right: 2em;
margin-bottom: 1em;
button {
- margin: 3px -4px;
+ margin: 3px -3px;
padding: .6em 2em;
min-height: 2.1em;
font-size: .9em;
font-weight: 700;
border-radius: 0;
+ display: inline-block;
&.first,
&.last {
border-radius: 3px;
diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index 960a2d9..98a8339 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -28,7 +28,7 @@
<p class="inline inventory__device-col">System</p>
<p class="inline inventory__function-col"></p>
<p class="inline inventory__assoc-event"></p>
- <button class="accord-trigger float-right" ng-class="{'active': inv.meta}" ng-click="inv.meta = ! inv.meta"></button>
+ <button class="accord-trigger float-right" ng-class="{'active': inv.meta}"></button>
<div class="row inventory__metadata" ng-class="{'active': inv.meta}">
<div class="column large-9 no-padding">
<div class="inline inventory__metadata-block">
@@ -162,12 +162,12 @@
</div>
</div>
<!-- hardware item w/ sub categories -->
- <div class="inventory__group" ng-class="{'active': inv2.meta}" ng-click="inv2.meta = ! inv2.meta">
+ <div class="inventory__group" ng-class="{'active': invCpu.meta}" ng-click="invCpu.meta = ! invCpu.meta">
<p class="inline inventory__device-col">CPU 0</p>
<p class="inline inventory__function-col"></p>
<p class="inline inventory__assoc-event"><a href="#/server-health/event-log">View 3 events</a></p>
- <button class="accord-trigger float-right" ng-class="{'active': inv2.meta}" ng-click="inv2.meta = ! inv2.meta"></button>
- <div class="row inventory__metadata" ng-class="{'active': inv2.meta}">
+ <button class="accord-trigger float-right" ng-class="{'active': invCpu.meta}"></button>
+ <div class="row inventory__metadata" ng-class="{'active': invCpu.meta}">
<div class="column large-9 no-padding">
<div class="inline inventory__metadata-block">
<p class="content-label">Name</p>
@@ -175,11 +175,11 @@
</div>
<div class="inline inventory__metadata-block">
<p class="content-label">Serial Number</p>
- <p class="courier-bold">2230123ab-04</p>
+ <p class="courier-bold">YA3933853282</p>
</div>
<div class="inline inventory__metadata-block">
<p class="content-label">Part Number</p>
- <p class="courier-bold">12355123ab</p>
+ <p class="courier-bold">01HL982</p>
</div>
<div class="inline inventory__metadata-block">
<p class="content-label">Manufacturer</p>
@@ -195,7 +195,7 @@
</div>
<div class="inline inventory__metadata-block">
<p class="content-label">Field replaceable</p>
- <p class="courier-bold">Not replaceable</p>
+ <p class="courier-bold">Replaceable</p>
</div>
<div class="inline inventory__metadata-block">
<p class="content-label">Higher level FRU</p>
diff --git a/app/server-health/controllers/sensors-controller.html b/app/server-health/controllers/sensors-controller.html
index 15cd997..caad20e 100644
--- a/app/server-health/controllers/sensors-controller.html
+++ b/app/server-health/controllers/sensors-controller.html
@@ -15,7 +15,7 @@
<div class="content__search">
<label for="content__search-input">Sensors Search</label>
<input id="content__search-input" type="text" placeholder="Filter issues" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
- <input id="content__search-submit" type="submit" class="btn btn-secondary" value="Submit" ng-click="doSearchOnClick()"/>
+ <input id="content__search-submit" type="submit" class="btn btn-primary" value="Submit" ng-click="doSearchOnClick()"/>
</div>
<div class="toggle-filter">
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index fda154a..fc80405 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -1,6 +1,6 @@
<div id="sensors-overview">
<div class="row column">
- <h1>Sensors data</h1>
+ <h1>Sensors</h1>
</div>
<section class="row column">
<div class="page-header">
@@ -12,9 +12,9 @@
<section class="row column">
<!-- search -->
<div class="content__search">
- <label for="content__search-input">Event Log Search</label>
+ <label for="content__search-input">Sensors Search</label>
<input id="content__search-input" type="text" placeholder="Filter issues" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
- <input id="content__search-submit" type="submit" class="btn btn-secondary" value="Submit" ng-click="doSearchOnClick()"/>
+ <input id="content__search-submit" type="submit" class="btn btn-primary" value="Filter" ng-click="doSearchOnClick()"/>
</div>
<div class="toggle-filter">
<button class="inline first btn-primary" ng-click="toggleSeverityAll()"
@@ -26,9 +26,6 @@
<button class="inline" ng-click="toggleSeverity('warning')"
ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
</button>
- <button class="inline last" ng-click="toggleSeverity('normal')"
- ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
- </button>
</div>
</section> <!-- end search -->