From b309f5a6223d32275e9bb12c0b68609cc8b2094b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Feb 2015 15:14:58 -0800
Subject: [PATCH] CRM-15856 - crmMailing - Display a warning inline if required
 tokens are missing

When you first fill in the body, we produce a popup on-blur to mention the
missing tokens.  However, when you edit an existing mailing, there is no
blur at first, and it's not clear what's wrong (unless you focus and blur
the problematic field).  This makes the problem more obvious.
---
 css/angular-crmMailing.css         | 3 +++
 partials/crmMailing/body_html.html | 3 +++
 partials/crmMailing/body_text.html | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/css/angular-crmMailing.css b/css/angular-crmMailing.css
index 1d86ccfcc7..1e450405dd 100644
--- a/css/angular-crmMailing.css
+++ b/css/angular-crmMailing.css
@@ -121,3 +121,6 @@ a.crmMailing-submit-button.disabled div:hover, a.crmMailing-submit-button.blocki
   background: none;
 }
 
+.crmMailing-error-link {
+  color: red;
+}
diff --git a/partials/crmMailing/body_html.html b/partials/crmMailing/body_html.html
index e1d23a8949..eb3b404de9 100644
--- a/partials/crmMailing/body_html.html
+++ b/partials/crmMailing/body_html.html
@@ -16,6 +16,9 @@ Required vars: mailing
         ng-blur="checkTokens(mailing, 'body_html', 'insert:body_html')"
         ></textarea>
       <span ng-model="body_html_tokens" crm-ui-validate="hasAllTokens(mailing, 'body_html')"></span>
+      <div ng-show="htmlForm.$error.crmUiValidate" class="crmMailing-error-link">
+        {{ts('Required tokens are missing.')}} <a class="helpicon" ng-click="checkTokens(mailing, 'body_html', 'insert:body_html')"></a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/partials/crmMailing/body_text.html b/partials/crmMailing/body_text.html
index f3ac7c7598..971940194d 100644
--- a/partials/crmMailing/body_text.html
+++ b/partials/crmMailing/body_text.html
@@ -16,6 +16,9 @@ Required vars: mailing, crmMailingConst
         ng-blur="checkTokens(mailing, 'body_text', 'insert:body_text')"
         ></textarea>
       <span ng-model="body_text_tokens" crm-ui-validate="hasAllTokens(mailing, 'body_text')"></span>
+      <div ng-show="textForm.$error.crmUiValidate" class="crmMailing-error-link">
+        {{ts('Required tokens are missing.')}} <a class="helpicon" ng-click="checkTokens(mailing, 'body_text', 'insert:body_text')"></a>
+      </div>
     </div>
   </div>
 </div>
-- 
2.25.1