From 3edc9b05df78ee96bf7b3575f9a40916bc88cd48 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 18 Mar 2015 16:22:15 -0400 Subject: [PATCH] CRM-15706 - Additional mailing field help --- js/angular-crmMailing.js | 3 +- .../crmMailing/dialog/recipientOptions.html | 8 +---- partials/crmMailing/publication.html | 2 +- partials/crmUi/field-cb.html | 1 + templates/CRM/Mailing/Form/Test.hlp | 2 +- templates/CRM/Mailing/MailingUI.hlp | 32 +++++++++++++++++++ 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js index 256cda54e8..edbfdce694 100644 --- 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 3d381d04b4..3f5dba8238 100644 --- a/partials/crmMailing/dialog/recipientOptions.html +++ b/partials/crmMailing/dialog/recipientOptions.html @@ -2,8 +2,7 @@
- -
+
-
-

{{ts('Multiple people -- such as spouses, parents, or children -- may sometimes share the same email address.')}}

-

{{ts('To send only one message to the shared address, enable this option. Mail-merge tokens will be filled for only one person.')}}

-

{{ts('To send separate messages for each person, disable this option. Mail-merge tokens will be filled separately for each person.')}}

-
+
diff --git a/templates/CRM/Mailing/Form/Test.hlp b/templates/CRM/Mailing/Form/Test.hlp index 43b6025507..8172e824ec 100644 --- a/templates/CRM/Mailing/Form/Test.hlp +++ b/templates/CRM/Mailing/Form/Test.hlp @@ -30,7 +30,7 @@

{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}

{ts}Enter a single email address or select an existing group and click "Send a Test Mailing." Once you receive the test mailing:{/ts}

    -
  • {ts}Verify the content and formattting.{/ts}
    • +
  • {ts}Verify the content and formatting.{/ts}
  • {ts}If you are using mail-merge tokens, check that they have been replaced with expected values.{/ts}
  • {ts}Click on each included link to make sure they go to the expected web pages.{/ts}
diff --git a/templates/CRM/Mailing/MailingUI.hlp b/templates/CRM/Mailing/MailingUI.hlp index fa1cf8fab4..3820d3736b 100644 --- a/templates/CRM/Mailing/MailingUI.hlp +++ b/templates/CRM/Mailing/MailingUI.hlp @@ -59,4 +59,36 @@ {htxt id="footer"}

{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}

+{/htxt} + +{htxt id="dedupe_email"} +

{ts}Multiple people -- such as spouses, parents, or children -- may sometimes share the same email address.{/ts}

+

{ts}To send only one message to the shared address, enable this option. Mail-merge tokens will be filled for only one person.{/ts}

+

{ts}To send separate messages for each person, disable this option. Mail-merge tokens will be filled separately for each person.{/ts}

+{/htxt} + +{htxt id="visibility"} +

+ {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} +

+ {ts}The options for mailing visibility are:{/ts} +

+
    +
  • + {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} +
    • +
  • + {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} +
    • +
+{/htxt} + +{htxt id="test"} +

{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}

+

{ts}Things to check in a test mailing:{/ts}

+
    +
  • {ts}Verify the content and formatting looks consistent across various email clients.{/ts}
    • +
  • {ts}If you are using mail-merge tokens, check that they have been replaced with expected values.{/ts}
    • +
  • {ts}Click on each included link to make sure they go to the expected web pages.{/ts}
    • +
{/htxt} \ No newline at end of file -- 2.25.1