CRM-10551: Allow deletion of blanked location-based fields

[civicrm-core.git] / partials / crmMailing / body_html.html

diff --git a/partials/crmMailing/body_html.html b/partials/crmMailing/body_html.html
index 6805929dad14489cc792266db306121ff1140ef9..9182a2575690c3a5f738eded06effb05c72dd4e9 100644 (file)
--- a/partials/crmMailing/body_html.html
+++ b/partials/crmMailing/body_html.html
@@ -2,9 +2,23 @@
 Required vars: mailing
 -->
 <div ng-form="htmlForm" crm-ui-id-scope>
-  <div style="float: right;">
-    <input crm-mailing-token crm-for="htmlForm.body_html"/>
-  </div>
+  <div ng-controller="EmailBodyCtrl">
+    <div style="float: right;">
+      <input crm-mailing-token on-select="$broadcast('insert:body_html', token.name)" tabindex="-1"/>
+    </div>
 
-  <textarea crm-ui-id="htmlForm.body_html" crm-ui-richtext name="body_html" ng-model="mailing.body_html"></textarea>
-</div>
\ No newline at end of file
+    <div>
+      <textarea
+        crm-ui-id="htmlForm.body_html"
+        crm-ui-richtext name="body_html"
+        crm-ui-insert-rx="insert:body_html"
+        ng-model="mailing.body_html"
+        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>