Header and nav changes based on user feedback.
- Changed "page last refreshed" label to "Data last refreshed"
- Changed "Configuration" label to "Server Configuration"
- adding flashing of header timestamp on click of "refresh" button
- moved "Server LED" under Server Configuration
Change-Id: I9971fd96da94514a7edc8e4977591c4de85f70c9
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 7ce9b98..4d680d1 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -13,7 +13,7 @@
<div class="header__functions">
<a href="#/server-health/event-log" class="header__server-health">Server health <i class="icon icon-angle"></i><span class="status-light__error">{{dataService.server_health}}</span></a>
<a href="#/server-control/power-operations" class="header__server-power" role="button">Server power <i class="icon icon-angle"></i><span ng-class="{'status-light__error': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state}}</span></a>
- <p class="header__refresh">Page last refreshed <span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span></p>
+ <p class="header__refresh">Data last refreshed<span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span></p>
<button class="header__page-refresh" ng-click="refresh()"><span>Refresh</span><svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91"><path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/></button>
</div>
</div>
diff --git a/app/common/directives/app-header.js b/app/common/directives/app-header.js
index 23038a1..a2f510e 100644
--- a/app/common/directives/app-header.js
+++ b/app/common/directives/app-header.js
@@ -42,6 +42,14 @@
$scope.refresh = function(){
$scope.loadServerStatus();
+
+ //Add flash class to header timestamp on click of refresh
+ var myEl = angular.element( document.querySelector( '.header__refresh' ) );
+ myEl.addClass('flash');
+ setTimeout(function () {
+ myEl.removeClass("flash");
+ },2000);
+
}
var loginListener = $rootScope.$on('user-logged-in', function(event, arg){
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 4328108..036f674 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -56,7 +56,7 @@
l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3C23,21.7,21.7,23,20,23z"/>
</svg>
- Configuration</span></button>
+ Server Configuration</span></button>
</li>
<li>
<button class="btn-users" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')" tabindex="5">
@@ -72,12 +72,12 @@
<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">Sensors</a></li>
- <li ng-class="{'active': (path == '/server-health/unit-id')}">
- <a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Server LED</a></li>
</ul>
<ul class="nav__second-level btn-control" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'server-control')}">
<li ng-class="{'active': (path == '/server-control' || path == '/server-control/power-operations')}">
<a href="#/server-control/power-operations" ng-click="closeSubnav()">Server power operations</a></li>
+ <li ng-class="{'active': (path == '/server-health/unit-id')}">
+ <a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Server LED</a></li>
<li ng-class="{'active': (path == '/server-control/bmc-reboot')}">
<a href="#/server-control/bmc-reboot" tabindex="8" ng-click="closeSubnav()">Reboot BMC</a></li>
<li ng-class="{'active': (path == '/server-control/remote-console')}">
diff --git a/app/common/styles/base/utility.scss b/app/common/styles/base/utility.scss
index bd91f59..1131d82 100644
--- a/app/common/styles/base/utility.scss
+++ b/app/common/styles/base/utility.scss
@@ -109,4 +109,23 @@
background-color: rgba(0,0,0,.5);
-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
}
+}
+
+.flash {
+ animation-name: flash;
+ animation-timing-function: ease-out;
+ animation-duration: 1s;
+ -webkit-animation-name: flash;
+ -webkit-animation-timing-function: ease-out;
+ -webkit-animation-duration: 1s;
+ color: $white;
+}
+@-webkit-keyframes flash {
+ from { background: $field__focus; }
+ to { background: none; }
+}
+
+@keyframes flash {
+ 0% { background: $field__focus; }
+ 100% { background: none; }
}
\ No newline at end of file
diff --git a/app/common/styles/layout/header.scss b/app/common/styles/layout/header.scss
index 1e25653..1ca6daf 100644
--- a/app/common/styles/layout/header.scss
+++ b/app/common/styles/layout/header.scss
@@ -158,8 +158,8 @@
}
.header__refresh {
color: $darkgrey;
- line-height: 1.8;
- margin-top: -4px;
+ line-height: 1.4;
+ border-radius: 6px;
span {
@include fontCourierBold;
}