Revert "HAWKULAR-478 UxD change: Url list last downtime is no precise…

… enough. This reverts commit 6a9cb78. # Conflicts: # console/src/main/scripts/plugins/metrics/html/availability.html
hawkular · Jul 29, 2015 · 9a1b9b3 · 9a1b9b3
1 parent 47ad1a8
commit 9a1b9b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/availability.html b/console/src/main/scripts/plugins/metrics/html/availability.html
@@ -34,14 +34,12 @@ <h3 class="pull-left">Availability Status</h3>
           <span class="hk-data" ng-show="vm.downtimeDuration" tooltip-trigger tooltip-placement="top"
                 tooltip-popup-delay="1500"
                 tooltip="{{ vm.downtimeDuration | duration:'d\'d \'h\'h \'m\'min \'s\' s\'' }}"><ph
-            ng-repeat="val in vm.downtimeDurationJson">{{val.value}}<span> {{val.unit}}</span></ph></span>
+            ng-repeat="val in vm.downtimeDurationJson">{{val.value}}<span> {{val.unit}} </span></ph></span>
           <span class="hk-item">Total Downtime Duration</span>
         </div>
         <div class="col-sm-3 hk-summary-item">
-          <span class="hk-data"
-                ng-hide="vm.lastDowntime.valueOf() === 0 || (vm.availabilityDataPoints.length === 1 && vm.availabilityDataPoints[0].value === 'down')"> {{ vm.lastDowntime | date:'d MMM HH:mm:ss' }}</span>
-          <span class="hk-data"
-                ng-show="vm.availabilityDataPoints.length === 1 && vm.availabilityDataPoints[0].value === 'down'">Always Down</span>
+          <span class="hk-data" ng-hide="vm.lastDowntime.valueOf() === 0 || (vm.availabilityDataPoints.length === 1 && vm.availabilityDataPoints[0].value === 'down')" am-time-ago="vm.lastDowntime" tooltip-trigger tooltip-placement="top" tooltip-popup-delay="1500" tooltip="{{ vm.lastDowntime | date:'d MMM HH:mm:ss' }}"></span>
+          <span class="hk-data" ng-show="vm.availabilityDataPoints.length === 1 && vm.availabilityDataPoints[0].value === 'down'">Always Down</span>
           <span class="hk-data" ng-show="!vm.lastDowntime || vm.lastDowntime.valueOf() === 0">Always Up</span>
           <span class="hk-item">Last Downtime</span>
         </div>

diff --git a/console/src/main/scripts/plugins/metrics/html/url-list.html b/console/src/main/scripts/plugins/metrics/html/url-list.html
@@ -66,7 +66,7 @@ <h2 ng-show="vm.resourceList.length > 0" class="text-center hk-fade-in">Current
           </div>
           <div class="col-sm-3 hk-summary-item">
             <a href="/hawkular-ui/url/availability/{{res.id}}">
-              <span class="hk-data" ng-show="res.lastDowntime > 0">{{res.lastDowntime| date:'d MMM HH:mm:ss' }}</span>
+              <span class="hk-data" ng-show="res.lastDowntime > 0" am-time-ago="res.lastDowntime"></span>
               <span class="hk-data" ng-show="res.lastDowntime <= 0">n/a</span>
               <span class="hk-item">Last Downtime</span>
             </a>