From 1dda695b2c83ff1696a460deec48cd39189c7d66 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 19 Mar 2015 11:34:38 -0400 Subject: [PATCH] CRM-15706 - More mailing help additions/fixes --- partials/crmCaseType/edit.html | 2 +- partials/crmCaseType/list.html | 2 +- partials/crmMailing/preview.html | 4 ++-- partials/crmMailing/responses.html | 15 +++--------- partials/crmMailing/tracking.html | 10 ++------ partials/crmMailingAB/selectWinner.html | 2 +- partials/crmMailingAB/setup.html | 5 ++-- templates/CRM/Mailing/Form/Settings.tpl | 5 +++- templates/CRM/Mailing/MailingUI.hlp | 32 +++++++++++++++++++++++++ 9 files changed, 48 insertions(+), 29 deletions(-) diff --git a/partials/crmCaseType/edit.html b/partials/crmCaseType/edit.html index d4dd55ff73..93ec51e837 100644 --- a/partials/crmCaseType/edit.html +++ b/partials/crmCaseType/edit.html @@ -4,7 +4,7 @@ Required vars: caseType -->
-
+
Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type (learn more...).
diff --git a/partials/crmCaseType/list.html b/partials/crmCaseType/list.html index b5bd475d4d..a4d08bd17b 100644 --- a/partials/crmCaseType/list.html +++ b/partials/crmCaseType/list.html @@ -2,7 +2,7 @@ Controller: CaseTypeListsCtrl Required vars: caseTypes --> -
+
A Case Type describes a group of related tasks, interactions, or processes.
diff --git a/partials/crmMailing/preview.html b/partials/crmMailing/preview.html index 6831c7032a..41681e1c68 100644 --- a/partials/crmMailing/preview.html +++ b/partials/crmMailing/preview.html @@ -25,7 +25,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
{{ts('Send test email to:')}} - +
{{ts('Send test email to group:')}} - +
-
- {{ts('Recipients\' replies are sent to a CiviMail specific address instead of the sender\'s address so they can be stored within CiviCRM.')}} -
-
+
-
- {{ts('If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.')}} -
-
+
-
- {{ts('If a recipient replies to this mailing, send an automated reply using the selected message.')}} -
diff --git a/partials/crmMailing/tracking.html b/partials/crmMailing/tracking.html index 85beb3803b..f6da0acd2e 100644 --- a/partials/crmMailing/tracking.html +++ b/partials/crmMailing/tracking.html @@ -4,17 +4,11 @@ Required vars: mailing -->
-
+
-
- {{ts('Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.')}} -
-
+
-
- {{ts('Track the number of times recipients open this mailing in their email software.')}} -
diff --git a/partials/crmMailingAB/selectWinner.html b/partials/crmMailingAB/selectWinner.html index 3e1f31e737..0c2db4f602 100644 --- a/partials/crmMailingAB/selectWinner.html +++ b/partials/crmMailingAB/selectWinner.html @@ -1,6 +1,6 @@
-
+
{{ts('After selecting %1 as the winner, one must schedule the delivery for the final mailing.', {1: mailingTitle})}}
diff --git a/partials/crmMailingAB/setup.html b/partials/crmMailingAB/setup.html index 8e18587842..8a889e2586 100644 --- a/partials/crmMailingAB/setup.html +++ b/partials/crmMailingAB/setup.html @@ -1,8 +1,7 @@
-
- {{ts('A/B testing allows you to send two test mailings to a random subset of your recipients. After collecting and - comparing metrics, the more successful mailing will be sent to the remaining recipients.')}} +
+ {{ts('A/B testing allows you to send two test mailings to a random subset of your recipients. After collecting and comparing metrics, the more successful mailing will be sent to the remaining recipients.')}}
{$form.url_tracking.label} {$form.url_tracking.html} - {ts}Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automaticallly re-written to route through your CiviCRM server prior to redirecting to the target page.{/ts} + + {ts}Track the number of times recipients click each link in this mailing.{/ts} + {ts}NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.{/ts} + {$form.open_tracking.label} {$form.open_tracking.html} diff --git a/templates/CRM/Mailing/MailingUI.hlp b/templates/CRM/Mailing/MailingUI.hlp index 3820d3736b..8a16bfdeab 100644 --- a/templates/CRM/Mailing/MailingUI.hlp +++ b/templates/CRM/Mailing/MailingUI.hlp @@ -91,4 +91,36 @@
  • {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} + +{htxt id="url_tracking"} +

    + {ts}Track the number of times recipients click each link in this mailing.{/ts} +

    + {ts}NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.{/ts} +

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

    + {ts}Track the number of times recipients open this mailing in their email software.{/ts} +

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

    + {ts}Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.{/ts} +

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

    + {ts}If a recipient replies to this mailing, send an automated reply using the selected message.{/ts} +

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

    + {ts}If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.{/ts} +

    {/htxt} \ No newline at end of file -- 2.25.1