HAWKULAR-538 Design adjustments

hawkular · Oct 7, 2015 · de92b10 · de92b10
1 parent ceabd7c
commit de92b10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/alerts-center-detail.html b/console/src/main/scripts/plugins/metrics/html/alerts-center-detail.html
@@ -1,17 +1,17 @@
 <div class="hk-alert-center-detail">
 
-  <!--<div class="hk-screen-top-nav">-->
-    <!--<div class="container">-->
-      <!--<div class="row hk-top-row">-->
+  <div class="hk-screen-top-nav">
+    <div class="container">
+      <div class="row hk-top-row">
         <div class="col-xs-6">
-          <a href="/hawkular-ui/alerts-center" class="back">&laquo; Alert Center List</a>
+          <a href="/hawkular-ui/alerts-center" class="back">&laquo; All Alerts</a>
         </div>
-
+      </div>
       <div class="hk-heading">
         <h1>Alert Center</h1>
       </div>
-    <!--</div>-->
-  <!--</div>-->
+    </div>
+  </div>
 
   <div class="container">
 
@@ -37,7 +37,7 @@ <h2>{{acd.description}}</h2>
              data-content="e = environment, f = feed, r = the resource id"><i class="fa fa-info-circle"></i></a>
         </dt>
         <dd>{{acd.detailAlert.context.resourcePath}}</dd>
-        <dt>Feed Id:</dt>
+        <dt>Feed Id</dt>
         <dd>{{acd.feedId}}</dd>
         <dt><span class="hide">Actions</span>
         <dd>

diff --git a/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html b/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html
@@ -4,22 +4,21 @@ <h1 class="text-center">Alert Center</h1>
   <!-- No Alerts -->
   <div ng-show="ac.alertsList.length === 0">
     <div class="hk-info-top clearfix">
-      <h3>Alerts</h3>
-
-      <div class="blank-slate-pf">
-        <div class="blank-slate-pf-icon">
-          <i class="fa fa-cubes"></i>
-        </div>
-        <h1>No Alerts.</h1>
+      <h3>Alerts ({{ac.alertsList.length}})</h3>
+    </div>
+    <div class="blank-slate-pf">
+      <div class="blank-slate-pf-icon">
+        <i class="fa fa-flag"></i>
       </div>
+      <h1>No Alerts.</h1>
     </div>
   </div>
 
   <!-- have alerts -->
   <div ng-show="ac.alertsList.length > 0">
 
     <div class="hk-info-top clearfix">
-      <h3 class="pull-left">Alerts({{ac.alertsList.length}})</h3>
+      <h3 class="pull-left">Alerts ({{ac.alertsList.length}})</h3>
       <span class="hk-update pull-right" data-toggle="tooltip" data-placement="top" title="Last update">
         <i class="fa fa-clock-o" ng-click="ac.getAlerts()"></i>{{ac.lastUpdateDate | date:'HH:mm'}}</span>
     </div>
@@ -53,10 +52,10 @@ <h3 class="pull-left">Alerts({{ac.alertsList.length}})</h3>
           <td>{{alert.trigger.description}}</td>
           <td>{{alert.ctime | date:'d MMM yyyy, HH:mm'}}</td>
           <td>{{alert.context.resourcePath}}</td>
-          <td><i class="fa  fa-chevron-circle-right fa-lg" style="color:#00a8e1;"
+          <td><a class="btn btn-link"><i class="fa fa-chevron-circle-right fa-lg"
                  tooltip="View Details" tooltip-trigger tooltip-placement="top"
                  ng-click="ac.showDetailPage(alert.alertId)">
-              </i>
+              </i></a>
           </td>
         </tr>
         </tbody>

diff --git a/console/src/main/scripts/plugins/metrics/less/metrics.less b/console/src/main/scripts/plugins/metrics/less/metrics.less
@@ -1745,10 +1745,6 @@ section {
   }
 }
 
-.hk-alert-center .hk-info-top h3 {
-  margin-bottom: 0;
-}
-
 
 // Datasources tab