CRM-15706 - Additional mailing field help

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index 256cda54e88f641b2466e9b74288066ae7a35065..edbfdce694a14953aee8b3f1ddab9596a6bc2c3c 100644 (file)
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -336,8 +336,9 @@
   // Note: Expects $scope.model to be an object with properties:
   //   - "mailing" (APIv3 mailing object)
   //   - "fields" (list of fields)
-  angular.module('crmMailing').controller('EditRecipOptionsDialogCtrl', function EditRecipOptionsDialogCtrl($scope) {
+  angular.module('crmMailing').controller('EditRecipOptionsDialogCtrl', function EditRecipOptionsDialogCtrl($scope, crmUiHelp) {
     $scope.ts = CRM.ts(null);
+    $scope.help = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
   });
 
   // Controller for the "Preview Mailing Component" segment

diff --git a/partials/crmMailing/dialog/recipientOptions.html b/partials/crmMailing/dialog/recipientOptions.html
index 3d381d04b453b4ed2235953f092532b9deead334..3f5dba823829173aa88779061ff78b9640c7697a 100644 (file)
--- a/partials/crmMailing/dialog/recipientOptions.html
+++ b/partials/crmMailing/dialog/recipientOptions.html
@@ -2,8 +2,7 @@
   <div class="crm-block" ng-form="editRecipOptionsForm" crm-ui-id-scope>
     <div class="crm-group">
 
-      <!-- FIXME: ts is not working here. -->
-      <div crm-ui-field="{title: 'Dedupe by email'}" crm-layout="checkbox">
+      <div crm-ui-field="{title: ts('Dedupe by email'), help: help('dedupe_email')}" crm-layout="checkbox">
         <input
           type='checkbox'
           ng-model='model.mailing.dedupe_email'
@@ -11,11 +10,6 @@
           ng-false-value="'0'"
           />
       </div>
-      <div class="crm-section" id="help">
-        <p>{{ts('Multiple people -- such as spouses, parents, or children -- may sometimes share the same email address.')}}</p>
-        <p>{{ts('To send only one message to the shared address, enable this option. Mail-merge tokens will be filled for only one person.')}}</p>
-        <p>{{ts('To send separate messages for each person, disable this option. Mail-merge tokens will be filled separately for each person.')}}</p>
-      </div>
 
       <div crm-ui-field="{name: 'editRecipOptionsForm.location_type_id', title: ts('Location Type')}">
         <select

diff --git a/partials/crmMailing/publication.html b/partials/crmMailing/publication.html
index fd4e2f378f6e89b0896b2a16f0b194ca3070bbfd..4b89c62cb4fcbcc9ecd6d5c275b17f578a691760 100644 (file)
--- a/partials/crmMailing/publication.html
+++ b/partials/crmMailing/publication.html
@@ -1,6 +1,6 @@
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{name: 'subform.visibility', title: ts('Mailing Visibility')}">
+    <div crm-ui-field="{name: 'subform.visibility', title: ts('Mailing Visibility'), help: help('visibility')}">
       <select
         crm-ui-id="subform.visibility"
         name="visibility"

diff --git a/partials/crmUi/field-cb.html b/partials/crmUi/field-cb.html
index 3c0c4732c67ca149d9c1c4b3e8bf8591b483e7db..fe1a2ab94d5525463e170629cbe42011281a42ac 100644 (file)
--- a/partials/crmUi/field-cb.html
+++ b/partials/crmUi/field-cb.html
@@ -4,4 +4,5 @@
     {{crmUiField.title}}
   </span>
 </label>
+<a crm-ui-help="help" ng-if="crmUiField.help"></a>
 <div class="clear"></div>

diff --git a/templates/CRM/Mailing/Form/Test.hlp b/templates/CRM/Mailing/Form/Test.hlp
index 43b602550788a9604345659bdc667bcdd093ed50..8172e824ecb8aca1ed311e4bf9e6302251dd0cd6 100644 (file)
--- a/templates/CRM/Mailing/Form/Test.hlp
+++ b/templates/CRM/Mailing/Form/Test.hlp
@@ -30,7 +30,7 @@
 <p>{ts}It's a good idea to test your mailing by sending it to yourself and/or a selected group of people in your organization. You can also view your content in the preview panel below.{/ts}</p>
 <p>{ts}Enter a single email address or select an existing group and click "Send a Test Mailing." Once you receive the test mailing:{/ts}</p>
 <ul>
-<li>{ts}Verify the content and formattting.{/ts}</li>
+<li>{ts}Verify the content and formatting.{/ts}</li>
 <li>{ts}If you are using mail-merge tokens, check that they have been replaced with expected values.{/ts}</li>
 <li>{ts}Click on each included link to make sure they go to the expected web pages.{/ts}</li>
 </ul>

diff --git a/templates/CRM/Mailing/MailingUI.hlp b/templates/CRM/Mailing/MailingUI.hlp
index fa1cf8fab4cf967ad5a1b434b6ccb72450dcc3f8..3820d3736b5aaf14ed4cfbccfce3219998c25634 100644 (file)
--- a/templates/CRM/Mailing/MailingUI.hlp
+++ b/templates/CRM/Mailing/MailingUI.hlp
@@ -59,4 +59,36 @@
 
 {htxt id="footer"}
   <p>{ts}You may choose to include a pre-configured Footer block below your message. This is a good place to include the required unsubscribe, opt-out and postal address tokens.{/ts}</p>
+{/htxt}
+
+{htxt id="dedupe_email"}
+  <p>{ts}Multiple people -- such as spouses, parents, or children -- may sometimes share the same email address.{/ts}</p>
+  <p>{ts}To send only one message to the shared address, enable this option. Mail-merge tokens will be filled for only one person.{/ts}</p>
+  <p>{ts}To send separate messages for each person, disable this option. Mail-merge tokens will be filled separately for each person.{/ts}</p>
+{/htxt}
+
+{htxt id="visibility"}
+  <p>
+    {ts}This option controls who can view the contents of this email on your website. The link can be included by inserting the "Mailing permalink" token (place it in a link when composing in HTML mode).{/ts}
+  </p><p>
+    {ts}The options for mailing visibility are:{/ts}
+  </p>
+  <ul>
+    <li>
+      {ts}"Public Pages" will make the content of this mailing viewable everyone who has the permission "view public CiviMail content". Note that even people who did not receive the mailing would be able to find it via search engines.{/ts}
+    </li>
+    <li>
+      {ts}"User and User Admin Only" means that only users that received the mailing or administrators can view this email on your website; users must be logged in to view the message.{/ts}
+    </li>
+  </ul>
+{/htxt}
+
+{htxt id="test"}
+  <p>{ts}It's a good idea to test your mailing by sending it to yourself and/or a selected group of people in your organization.{/ts}</p>
+  <p>{ts}Things to check in a test mailing:{/ts}</p>
+  <ul>
+    <li>{ts}Verify the content and formatting looks consistent across various email clients.{/ts}</li>
+    <li>{ts}If you are using mail-merge tokens, check that they have been replaced with expected values.{/ts}</li>
+    <li>{ts}Click on each included link to make sure they go to the expected web pages.{/ts}</li>
+  </ul>
 {/htxt}
\ No newline at end of file