UI updates according to hawkular prototype

hawkular · Oct 5, 2015 · 94f3392 · 94f3392
1 parent 0bfaaf3
commit 94f3392
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/app-server-details.html b/console/src/main/scripts/plugins/metrics/html/app-details/app-server-details.html
@@ -16,7 +16,7 @@
   <ng-include ng-repeat="tab in tabs.availableTabs" src="tab.src" ng-if="tabs.activeTab === tab.id" ng-controller="tab.controller"></ng-include>
 
   <div class="hk-nav-tabs-container pull-right">
-    <button type="button" class="btn btn-primary" data-ng-click="tabs.requestExportJDR()" data-ng-disabled="tabs.jdrGenerating">
+    <button type="button" class="btn btn-default" data-ng-click="tabs.requestExportJDR()" data-ng-disabled="tabs.jdrGenerating">
       Export JDR
     </button>
   </div>

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-datasources.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-datasources.html
@@ -9,7 +9,7 @@
 
       <div class="hk-container-separator">
         <div class="btn-group" dropdown auto-close="always">
-          <button id="simple-btn-keyboard-nav" type="button" class="btn btn-primary" dropdown-toggle>
+          <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdown-toggle>
             Sort {{vm.sortInv ? 'Z - A' : 'A - Z'}}  <span class="caret"></span>
           </button>
           <ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav">
@@ -51,7 +51,7 @@
       </div>
     </div>
     <div class="hk-panel-collapse-area" ng-class="{'hk-collapsed' : !vm.expandedList[ds.id]}">
-      <a href="#" ng-click="vm.expandedList[ds.id] = !vm.expandedList[ds.id]"><span ng-hide="vm.expandedList[ds.id]">View Metrics</span><span ng-show="vm.expandedList[ds.id]">Hide Metrics</span><i class="fa" ng-class="vm.expandedList[ds.id] ? 'fa-angle-up' : 'fa-angle-down'"></i></a>
+      <a href="#" ng-click="vm.expandedList[ds.id] = !vm.expandedList[ds.id]"><span ng-hide="vm.expandedList[ds.id]">View Metrics</span><span ng-show="vm.expandedList[ds.id]">Hide Metrics</span><i class="fa" ng-class="vm.expandedList[ds.id] ? 'fa-chevron-circle-up' : 'fa-chevron-circle-down'"></i></a>
     </div>
 
     <div class="hk-collapsible-area" ng-class="{ 'hide': !vm.expandedList[ds.id]}" ng-if="vm.expandedList[ds.id]">
@@ -62,23 +62,23 @@ <h3 class="pull-left">
           <button class="btn btn-link hk-trigger" ng-click="vm.showAllAlerts = !vm.showAllAlerts" tooltip-trigger
                   tooltip-placement="top" tooltip="Expand/collapse">
             <i class="fa" ng-show="ds.alertList.length > 0"
-               ng-class="vm.showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> JVM Alerts
+               ng-class="vm.showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> Datasource Alerts
             <span ng-show="ds.alertList.length > 0">
               ({{vm.showAllAlerts ? ds.alertList.length : vm.math.min(ds.alertList.length, 3)}} of {{ds.alertList.length}})
             </span>
           </button>
         </h3>
-        <span class="hk-settings pull-right">
+        <span class="hk-settings pull-left">
           <a href="#" ng-click="vm.openSetup(ds.id)">
-            <i class="fa fa-cog"></i>Datasource Alert Settings
+            <i class="fa fa-cog"></i>Alert Settings
           </a>
         </span>
       </div>
       <div class="clearfix">
         <!-- No Alerts -->
         <div class="panel panel-default alert alert-info" ng-show="ds.alertList.length === 0">
           <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-          <div class="hk-event">No Alerts have been fired in this category and time range.</div>
+          <div class="hk-event">No Alerts.</div>
         </div>
         <!-- Alerts exist -->
         <hk-alert-panel-list class="clearfix" hk-alert-list="ds.alertList"

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
@@ -34,7 +34,7 @@ <h3 class="pull-left">
     <!-- No Alerts -->
     <div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
       <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-      <div>No alerts have been fired in this category and time range.</div>
+      <div>No alerts.</div>
     </div>
     <!-- Alerts exist -->
     <div class="panel panel-default alert alert-danger" ng-repeat="alert in vm.alertList | limitTo: (showAllAlerts ? 100000 : 3) track by $index">

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-jvm.html
@@ -38,17 +38,17 @@ <h3 class="pull-left">
         </span>
       </button>
     </h3>
-    <span class="hk-settings pull-right">
+    <span class="hk-settings pull-left">
       <a href="#" ng-controller="JvmAlertController as jac" ng-click="jac.openSetup()">
-        <i class="fa fa-cog"></i>JVM Alert Settings
+        <i class="fa fa-cog"></i>Alert Settings
       </a>
     </span>
   </div>
   <div class="clearfix">
     <!-- No Alerts -->
     <div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
       <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-      <div class="hk-event">No Alerts have been fired in this category and time range.</div>
+      <div class="hk-event">No Alerts.</div>
     </div>
     <!-- Alerts exist -->
     <hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList"

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-web.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-web.html
@@ -28,17 +28,17 @@ <h3 class="pull-left">Web Status</h3>
     <h3 class="pull-left">
       <button class="btn btn-link hk-trigger" ng-click="showAllAlerts = !showAllAlerts" tooltip-trigger tooltip-placement="top" tooltip="Expand/collapse"><i class="fa" ng-show="vm.alertList.length > 0" ng-class="showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i> Web Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : vm.math.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span></button>
     </h3>
-    <span class="hk-settings pull-right">
+    <span class="hk-settings pull-left">
       <a href="#" ng-controller="WebAlertController as wac" ng-click="wac.openSetup()">
-        <i class="fa fa-cog"></i>Web Alert Settings
+        <i class="fa fa-cog"></i>Alert Settings
       </a>
     </span>
   </div>
   <div class="clearfix">
     <!-- No Alerts -->
     <div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
       <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-      <div>No alerts have been fired in this category and time range.</div>
+      <div>No alerts.</div>
     </div>
     <!-- Alerts exist -->
     <!-- Alerts exist -->

diff --git a/console/src/main/scripts/plugins/metrics/html/url-alerts.html b/console/src/main/scripts/plugins/metrics/html/url-alerts.html
@@ -12,7 +12,7 @@
   <section id="hk-alerts" class="hk-tab-content">
     <div class="hk-info-top clearfix">
       <h3 class="pull-left">Alerts <span>({{(mac.alertList).length}})</span></h3>
-      <span class="hk-settings pull-right">
+      <span class="hk-settings pull-left">
         <a href="#" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Response Time Alert Settings</a>
         <a href="#" ng-controller="MetricsAvailabilityController as vm" ng-click="vm.openAvailabilitySetup()">
           <i class="fa fa-cog"></i>Availability Alert Settings</a>

diff --git a/console/src/main/scripts/plugins/metrics/html/url-availability.html b/console/src/main/scripts/plugins/metrics/html/url-availability.html
@@ -59,16 +59,16 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
           Availability Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : MetricsAvailabilityController.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span>
         </button>
       </h3>
-      <span class="hk-settings pull-right">
-        <a href="#" ng-click="vm.openAvailabilitySetup()"><i class="fa fa-cog"></i>Availability Alert Settings</a>
+      <span class="hk-settings pull-left">
+        <a href="#" ng-click="vm.openAvailabilitySetup()"><i class="fa fa-cog"></i>Alert Settings</a>
       </span>
     </div>
 
     <div class="clearfix">
       <!-- No Alerts -->
       <div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
         <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-        <div class="hk-event">No Alerts have been fired in this category and time range.</div>
+        <div class="hk-event">No Alerts.</div>
       </div>
       <!-- Alerts exist -->
       <hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList"

diff --git a/console/src/main/scripts/plugins/metrics/html/url-response-time.html b/console/src/main/scripts/plugins/metrics/html/url-response-time.html
@@ -44,13 +44,13 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
           <i class="fa" ng-show="vm.alertList.length > 0" ng-class="showAllAlerts ? 'fa-minus-square-o' : 'fa-plus-square-o'"></i>
           Response Time Alerts <span ng-show="vm.alertList.length > 0">({{showAllAlerts ? vm.alertList.length : MetricsViewController.min(vm.alertList.length, 3)}} of {{vm.alertList.length}})</span></button>
       </h3>
-      <span class="hk-settings pull-right"><a href="#" ng-controller="MetricsAlertController as mac" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Response Time Alert Settings</a></span>
+      <span class="hk-settings pull-left"><a href="#" ng-controller="MetricsAlertController as mac" ng-click="mac.openResponseSetup()"><i class="fa fa-cog"></i>Alert Settings</a></span>
     </div>
     <div class="clearfix">
       <!-- No Alerts -->
       <div class="panel panel-default alert alert-info" ng-show="vm.alertList.length === 0">
         <div class="hk-alert-icon"><i class="fa fa-flag gray"></i></div>
-        <div>No alerts have been fired in this category and time range.</div>
+        <div>No alerts.</div>
       </div>
       <!-- Alerts exist -->
       <hk-alert-panel-list class="clearfix" hk-alert-list="vm.alertList" hk-limit="(showAllAlerts ? 100000 : 3)"></hk-alert-panel-list>