From 4bbc2108f9d410a90bee15d2bd62833452d0b80b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 11 Oct 2016 09:45:38 +0200
Subject: [PATCH] feat(alerting): add pause button to alert list

---
 pkg/api/alerting.go                                   | 3 +++
 public/app/features/alerting/partials/alert_list.html | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index a8d2171344e..c0cba3a481e 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -270,13 +270,16 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
 	}
 
 	var response models.AlertStateType = models.AlertStateNoData
+	pausedState := "un paused"
 	if cmd.Paused {
 		response = models.AlertStatePaused
+		pausedState = "paused"
 	}
 
 	result := map[string]interface{}{
 		"alertId": cmd.AlertId,
 		"state":   response,
+		"message": "alert " + pausedState,
 	}
 
 	return Json(200, result)
diff --git a/public/app/features/alerting/partials/alert_list.html b/public/app/features/alerting/partials/alert_list.html
index da4e3b3a695..685aa1f2db8 100644
--- a/public/app/features/alerting/partials/alert_list.html
+++ b/public/app/features/alerting/partials/alert_list.html
@@ -29,13 +29,13 @@
         <div class="card-item card-item--alert">
           <div class="card-item-header">
             <div class="card-item-type">
-              <a class="card-item-cog" href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert" bs-tooltip="'Edit alert rule'">
+              <a class="card-item-cog" bs-tooltip="'Pausing an alert rule prevents it from executing'" ng-click="ctrl.pauseAlertRule(alert.id)">
+								<i class="fa fa-pause"></i>
+							</a>
+							<a class="card-item-cog" href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert" bs-tooltip="'Edit alert rule'">
                 <i class="icon-gf icon-gf-settings"></i>
               </a>
             </div>
-						<div class="card-item-header">
-							<a class="card-item-cog" ng-click="ctrl.pauseAlertRule(alert.id)">pause</a>
-						</div>
           </div>
           <div class="card-item-body">
             <div class="card-item-details">