add inventory templates
Change-Id: I735465dc2d6ab0583586ece23380ea8570f024fa
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 9fbf8fc..6a0fb14 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -38,8 +38,8 @@
</ul>
<ul class="nav__second-level btn-health" ng-style="navStyle" ng-class="{opened: firstLevel == 'health'}">
<li ng-class="{'active': (path == '/overview/log')}"><a href="#/overview/log" tabindex="7">Event log</a></li>
- <li><a href="">FRU Information</a></li>
- <li ng-class="{'active': (path == '/overview/sensors-overview')}"><a href="#/overview/sensors-overview">Sensor data</a></li>
+ <li ng-class="{'active': (path == '/overview/inventory-overview')}"><a href="#/overview/inventory-overview">Hardware Inventory</a></li>
+ <li ng-class="{'active': (path == '/overview/sensors-overview') || (path == '/overview/sensors')}"><a href="#/overview/sensors-overview">Sensor data</a></li>
<li ng-class="{'active': (path == '/overview/power-consumption')}"><a href="" tabindex="4">Power consumption</a></li>
<li ng-class="{'active': (path == '/overview/unit-id')}"><a href="#/overview/unit-id" tabindex="6">Unit id</a></li>
<li><a href="">Diagnostics</a></li>
diff --git a/app/common/styles/base/colors.scss b/app/common/styles/base/colors.scss
index affd094..76f65a9 100644
--- a/app/common/styles/base/colors.scss
+++ b/app/common/styles/base/colors.scss
@@ -50,8 +50,9 @@
$critical-darkbg: #ff5c49;
$medium-lightbg: #dc267f;
$medium-darkbg: #FF509E;
-$warning-lightbg: rgb(255, 127, 0);
+$warning-lightbg: #ff836f;
$warning-darkbg: #ffb000;
+$low-lightbg: #c42cd6;
$normal: #00baa1;
// Threshold graphs
@@ -59,6 +60,12 @@
$thresh-warning: #ff806c;
$thresh-normal: #8ee9d4;
+//Inventory
+$active: #c6b6f5;
+$inactive: $medium-lightbg;
+$present: #b1bef3;
+$not-present: $medium-lightbg;
+
// Links
$links: #648FFF;
$links__hover: $lightbg__primary;
diff --git a/app/common/styles/base/core.scss b/app/common/styles/base/core.scss
index 13ba9e6..18f78aa 100644
--- a/app/common/styles/base/core.scss
+++ b/app/common/styles/base/core.scss
@@ -17,6 +17,7 @@
}
&:hover {
color: $links__hover;
+ text-decoration: underline;
}
:focus {
color: $links;
diff --git a/app/common/styles/base/mixins.scss b/app/common/styles/base/mixins.scss
index 6caeba7..3313a88 100644
--- a/app/common/styles/base/mixins.scss
+++ b/app/common/styles/base/mixins.scss
@@ -57,6 +57,21 @@
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #b8c1c1'></polygon></svg>");
}
+//Offset allows to subtract a custom padding/margin offset
+@mixin calcColumn-4 ($offset: 0) {
+ min-width: calc(100% * (1/4) - #{$offset});
+}
+
+
+@mixin calcColumn-3 ($offset: 0){
+ min-width: calc(100% * (1/3) - #{$offset});
+}
+
+@mixin calcSplitColumn ($offset: 0) {
+ min-width: calc(100% * (1/2) - #{$offset});
+}
+
+
@mixin indeterminate-bar {
background-image: repeating-linear-gradient(-45deg, rgba(251, 234, 174, 0.35), rgba(251, 234, 174, 0.35) 25px, rgba(244, 176, 0, 0.45) 25px, rgba(244, 176, 0, 0.45) 50px);
-webkit-animation: progress 2s linear infinite;
diff --git a/app/common/styles/base/typography.scss b/app/common/styles/base/typography.scss
index f293f3d..9d498da 100644
--- a/app/common/styles/base/typography.scss
+++ b/app/common/styles/base/typography.scss
@@ -50,4 +50,20 @@
font-weight: 700;
margin-bottom: 0;
margin-top: 2em;
+}
+
+.content-label {
+ color: darken($lightgrey, 10%);
+ text-transform: uppercase;
+ font-weight: 700;
+ font-size: .75em;
+ margin-bottom: 3px;
+}
+
+.courier-normal {
+ font-family: "Courier New", Helvetica, arial, sans-serif;
+}
+.courier-bold {
+ font-family: "Courier New", Helvetica, arial, sans-serif;
+ font-weight: 700;
}
\ No newline at end of file
diff --git a/app/common/styles/elements/accordion.scss b/app/common/styles/elements/accordion.scss
index ba6d2fd..9cf310f 100644
--- a/app/common/styles/elements/accordion.scss
+++ b/app/common/styles/elements/accordion.scss
@@ -1,7 +1,7 @@
// Accordion
-#header__actions-bar {
+.header__actions-bar {
padding-top: 1em;
padding-right: 1em;
background: $darkpurple;
@@ -45,8 +45,9 @@
// Single event log card
.accord-row {
position: relative;
- border-top: 1px solid $lightgrey;
+ border: 1px solid $lightgrey;
padding: 1em 1em 1em 0em;
+ margin: .65em 0;
background: $white;
overflow: hidden;
&.active,
@@ -55,6 +56,7 @@
}
&:hover {
background: $lightblue;
+ cursor: pointer;
}
&:last-child {
border-bottom: 1px solid $lightgrey;
diff --git a/app/common/styles/elements/tags.scss b/app/common/styles/elements/tags.scss
index cb483d6..8a480c9 100644
--- a/app/common/styles/elements/tags.scss
+++ b/app/common/styles/elements/tags.scss
@@ -122,12 +122,17 @@
border-color: rgba($medium-lightbg, 1);
}
&.warn-priority {
- background: rgba($warning-lightbg, .5);
border-color: $warning-lightbg;
+ background-image: url(/assets/images/warn-slash.svg);
+ background-color: rgba($thresh-warning, .3);
}
&.normal-priority {
background: rgba( $normal, .4);
}
+ &.disabled {
+ background: rgba( $darkgrey, .2);
+ border-color: rgba( $darkgrey, .2);
+ }
&.event-resolved {
background: $purple;
padding: 2px 1em;