From 15d950ce35ffeeae8e9398a92b8739e4d1e7e997 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Wed, 22 Aug 2018 18:06:05 +0200
Subject: [PATCH] update copy/ux for configuring alerting notification
 reminders

---
 .../alerting/partials/notification_edit.html  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html
index 7e9997452f9..faa168d0acd 100644
--- a/public/app/features/alerting/partials/notification_edit.html
+++ b/public/app/features/alerting/partials/notification_edit.html
@@ -34,26 +34,27 @@
       </gf-form-switch>
       <gf-form-switch
           class="gf-form"
-          label="Send reminder"
+          label="Send reminders"
           label-class="width-12"
           checked="ctrl.model.sendReminder"
-          tooltip="Choose to either notify on state change (default) or at every interval">
+          tooltip="Send additional notifications for triggered alerts">
       </gf-form-switch>
-      <div class="gf-form">
-        <span class="alert alert-info width-30" ng-if="ctrl.model.sendReminder">
-          Alert reminders are sent after rules are evaluated. Therefore the highest alert rule interval (of alert rules using this notification channel) must be lower than the reminder frequency.
-        </span>
-      </div>
       <div class="gf-form-inline">
         <div class="gf-form" ng-if="ctrl.model.sendReminder">
-            <span class="gf-form-label width-12">Reminder frequency</span>
-            <input type="text" placeholder="Select or specify custom" class="gf-form-input width-15" ng-model="ctrl.model.frequency"
-              bs-typeahead="ctrl.getFrequencySuggestion" data-min-length=0 ng-required="ctrl.model.sendReminder">
-            <info-popover mode="right-absolute">
-              Select at what interval you want reminder's to be sent after alerts being triggered, e.g. 30s, 1m, 10m, 30m or 1h etc.
+          <span class="gf-form-label width-12">Send reminder every
+            <info-popover mode="right-normal" position="top center">
+              Specify how often reminders should be sent, e.g. every 30s, 1m, 10m, 30m or 1h etc.
             </info-popover>
+          </span>
+          <input type="text" placeholder="Select or specify custom" class="gf-form-input width-15" ng-model="ctrl.model.frequency"
+            bs-typeahead="ctrl.getFrequencySuggestion" data-min-length=0 ng-required="ctrl.model.sendReminder">
         </div>
       </div>
+      <div class="gf-form">
+          <span class="alert alert-info width-30" ng-if="ctrl.model.sendReminder">
+            Alert reminders are sent after rules are evaluated. Therefore a reminder can never be sent earlier than a configured alert rule evaluation interval.
+          </span>
+        </div>
     </div>
 
     <div class="gf-form-group" ng-include src="ctrl.notifierTemplateId">