Merge pull request #722 from cardosogabriel/Alerts

Alerts and Server Overview
hawkular · Dec 15, 2015 · 247d038 · 247d038
2 parents 2cc5eb5 + c214c34
commit 247d038
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/directives/alert-info.html b/console/src/main/scripts/plugins/metrics/html/directives/alert-info.html
@@ -5,7 +5,7 @@
       <i class="fa fa-cog"></i>Definitions
     </a>
   </p>
-  <h2 class="card-pf-title">{{title}} Alerts <span class="label label-default">{{list.length}}</span></h2>
+  <h2 class="card-pf-title">{{title}} Alerts <span class="label label-default" ng-show="list.length">{{list.length}}</span></h2>
 </div>
 
 <!-- No Alerts -->

diff --git a/console/src/main/scripts/plugins/metrics/html/directives/overview/label-editor.html b/console/src/main/scripts/plugins/metrics/html/directives/overview/label-editor.html
@@ -12,7 +12,7 @@
           <input type="text" class="form-control" ng-model="label.value">
         </div>
         <div class="pull-right label-buttons">
-          <button type="button" ng-click="confirmDropDown()" class="btn btn-default"><span>Ok</span></button>
+          <button type="button" ng-click="confirmDropDown()" class="btn btn-default"><span>Save</span></button>
           <button type="button" ng-click="closeDropDown()" class="btn btn-default"><span>Cancel</span></button>
         </div>
       </form>

diff --git a/console/src/main/scripts/plugins/metrics/html/directives/overview/server-details.html b/console/src/main/scripts/plugins/metrics/html/directives/overview/server-details.html
@@ -28,7 +28,7 @@ <h2 class="card-pf-title">Server Details</h2>
                 label="label"
                 close="vm.closeDropDown()">
                 <span class="label label-primary label-clickable">{{label.key}} : {{label.value}}
-                  <i ng-click="vm.removeLabel(index, $event)" class="fa fa-times remove-label"></i>
+                  <span ng-click="vm.removeLabel(index, $event)" class="pficon-close remove-label"></span>
                 </span>
               </hk-detail-label-editor>
             </div>

diff --git a/console/src/main/scripts/plugins/metrics/html/partials/trigger-alerts-sidebar.html b/console/src/main/scripts/plugins/metrics/html/partials/trigger-alerts-sidebar.html
@@ -1,28 +1,41 @@
 <div class="col-lg-3 col-md-4">
   <div class="card-pf card-pf-utilization">
     <div class="card-pf-heading">
-      <h2 class="card-pf-title">Alerts <span class="label label-default">{{tc.alertList.length}}</span></h2>
+      <h2 class="card-pf-title">Alerts <span class="label label-default" ng-show="tc.alertList.length">{{tc.alertList.length}}</span></h2>
+    </div>
 
+    <!-- No Alerts -->
+    <div class="card-pf-body" ng-hide="tc.alertList.length > 0">
+      <div class="hk-box-v-item">
+        <div class="hk-display-table">
+          <div class="hk-icon-container">
+            <i class="fa fa-flag gray"></i>
+          </div>
+          <div class="hk-info-container">
+            <p class="hk-info-info">No Alerts.</p>
+          </div>
+        </div>
+      </div>
     </div>
-    <div class="card-pf-body">
-      <div ng-show="tc.alertList.length > 0">
-        <div class="hk-box-v-item" ng-repeat="alert in tc.alertList">
-          <div class="hk-display-table">
-            <div class="hk-icon-container">
-              <i class="fa fa-exclamation-triangle hk-warning"></i>
-            </div>
-            <div class="hk-info-container">
-              <div class="hk-info-heading">{{alert.trigger.description | truncate: 50}}</div>
-              <p class="hk-info-info">{{alert.ctime | date:'d MMM yyyy, HH:mm'}}</p>
-            </div>
-            <div class="hk-icon-container">
-              <a ng-href="{{tc.getAlertRoute(alert.id)}}" class="btn btn-link" tooltip-trigger tooltip="View Details">
-                <i class="fa fa-chevron-circle-right"></i>
-              </a>
-            </div>
+
+    <div class="card-pf-body" ng-show="tc.alertList.length > 0">
+      <div class="hk-box-v-item" ng-repeat="alert in tc.alertList">
+        <div class="hk-display-table">
+          <div class="hk-icon-container">
+            <i class="fa fa-exclamation-triangle hk-warning"></i>
+          </div>
+          <div class="hk-info-container">
+            <div class="hk-info-heading">{{alert.trigger.description | truncate: 50}}</div>
+            <p class="hk-info-info">{{alert.ctime | date:'d MMM yyyy, HH:mm'}}</p>
+          </div>
+          <div class="hk-icon-container">
+            <a ng-href="{{tc.getAlertRoute(alert.id)}}" class="btn btn-link" tooltip-trigger tooltip="View Details">
+              <i class="fa fa-chevron-circle-right"></i>
+            </a>
           </div>
         </div>
       </div>
     </div>
+
   </div>
 </div>
diff --git a/console/src/main/scripts/plugins/metrics/less/metrics.less b/console/src/main/scripts/plugins/metrics/less/metrics.less
@@ -2560,10 +2560,13 @@ section {
 }
 
 .remove-label {
-  vertical-align: text-bottom;
+  color: rgba(255,255,255,0.8);
   cursor: pointer;
+  margin-left: 5px;
+  margin-right: 0;
+  vertical-align: middle;
 
-  &:hover{
+  &:hover {
     color: white;
   }
 }