Remove tooltips and add spinners

(cherry picked from commit 8a1795f82b63e91981057696f936c1b9627343f5)
ManageIQ · Dec 25, 2016 · fe43bcc · fe43bcc
1 parent 5273d7b
commit fe43bcc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/app/assets/stylesheets/metrics.scss b/app/assets/stylesheets/metrics.scss
@@ -55,4 +55,7 @@
   .timeline-date-input {
     width: 250px;
   }
+  h3 {
+    margin-top: 5px;
+  }
 }
diff --git a/app/views/ems_container/_show_ad_hoc_metrics.html.haml b/app/views/ems_container/_show_ad_hoc_metrics.html.haml
@@ -18,30 +18,34 @@
       .spinner.spinner-lg.loading{"ng-if" => "loadingMetrics"}
       .col-md-12{"pf-list-view" => "", "config" => "listConfig", "items" => "items"}
         .list-view-pf-body.row
-          .col-md-2.col-sm-6.no-wrap{"tooltip" => "{{item.tags.group_id}}", "tooltip-placement" => "bottom"}
-            {{item.tags.group_id}}
-          .col-md-4.col-sm-6.no-wrap{"tooltip" => "{{item.id}}", "tooltip-placement" => "bottom"}
+          .col-md-6.col-sm-6.no-wrap
             {{item.id}}
           .col-md-6.col-sm-12.no-wrap
             .row
-              .col-md-7.col-sm-6.no-wrap{"tooltip" => "{{item.maxTimestamp | date:'yyyy-MM-dd hh:mm:ss'}}", "tooltip-placement" => "bottom"}
+              .col-md-7.col-sm-6.no-wrap
                 %strong
                   = _("Most Recent")
                 %span.time-stamp
                   {{item.last_timestamp | date:'yyyy-MM-dd hh:mm:ss'}}
-              .col-md-5.col-sm-6.no-wrap{"tooltip" => "{{item.last_value || '-'}}", "tooltip-placement" => "bottom"}
-                %span.last-value
-                  {{item.last_value || "-"}}
-                %span.last-value
-                  {{item.percent_change}}
+              .col-md-5.col-sm-6.no-wrap
+                .spinner.spinner-sm.loading{ "ng-if" => "!item.last_value" }
+                %span.last-value{ "ng-if" => "item.last_value" }
+                  {{item.last_value}}
         %list-expanded-content
+          .row
+            .col-md-8.col-sm-12.no-wrap
+              %h3
+                = _("Tag list")
+            .col-md-4.col-sm-12.no-wrap
+              %h3
+                = _("Recent values")
           .row
             .col-md-8.col-sm-12.no-wrap
               .row{"ng-repeat" => "(key, value) in $parent.item.tags"}
                 .col-md-3.col-sm-6.no-wrap.metric-no-padding
                   %strong.pull-right
                     {{key}}
-                .col-md-9.col-sm-9.no-wrap{"tooltip" => "{{value}}", "tooltip-placement" => "bottom"}
+                .col-md-9.col-sm-6.no-wrap
                   {{value}}
             .col-md-4.col-sm-12.no-wrap
               .row{"ng-repeat" => "(timestamp, value) in $parent.item.lastValues"}