CRM-15706 - More mailing help additions/fixes

diff --git a/partials/crmCaseType/edit.html b/partials/crmCaseType/edit.html
index d4dd55ff73d4b6a452b5000516ee9eeaf590ca59..93ec51e837636c0d69868084d2a11761a981ce1c 100644 (file)
--- a/partials/crmCaseType/edit.html
+++ b/partials/crmCaseType/edit.html
@@ -4,7 +4,7 @@ Required vars: caseType
 -->
 <form name="editCaseTypeForm" unsaved-warning-form>
 <div class="crm-block crm-form-block crmCaseType">
-  <div id="help">
+  <div class="help">
     Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type (<a href="http://book.civicrm.org/user/current/case-management/setup/" target="_blank">learn more...</a>).
   </div>
   <div class="crm-submit-buttons">

diff --git a/partials/crmCaseType/list.html b/partials/crmCaseType/list.html
index b5bd475d4d24152a6aa90feaf1a78309628637cd..a4d08bd17b9e0e0ae5c025430da7ba33cb6e23ca 100644 (file)
--- a/partials/crmCaseType/list.html
+++ b/partials/crmCaseType/list.html
@@ -2,7 +2,7 @@
 Controller: CaseTypeListsCtrl
 Required vars: caseTypes
 -->
-<div id="help">
+<div class="help">
   A Case Type describes a group of related tasks, interactions, or processes.
 </div>
 

diff --git a/partials/crmMailing/preview.html b/partials/crmMailing/preview.html
index 6831c7032a619844bf8ee045fad8439f9ee97195..41681e1c683d732913a313d32537d2e2a76d53d4 100644 (file)
--- a/partials/crmMailing/preview.html
+++ b/partials/crmMailing/preview.html
@@ -25,7 +25,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
   <div class="preview-contact" ng-form>
     <div>
       {{ts('Send test email to:')}}
-      <a crm-ui-help="hs({id: 'test'})"></a>
+      <a crm-ui-help="hs({id: 'test', title: ts('Test Email')})"></a>
     </div>
     <div>
       <input
@@ -41,7 +41,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
   <div class="preview-group" ng-form>
     <div>
       {{ts('Send test email to group:')}}
-      <a crm-ui-help="hs({id: 'test'})"></a>
+      <a crm-ui-help="hs({id: 'test', title: ts('Test Email')})"></a>
     </div>
     <div>
       <select

diff --git a/partials/crmMailing/responses.html b/partials/crmMailing/responses.html
index 3ba9c6372d424caf196f3a602ee901b95ed28532..cf56f00796c57d34b80963bc6b2db6538ae79ea9 100644 (file)
--- a/partials/crmMailing/responses.html
+++ b/partials/crmMailing/responses.html
@@ -4,7 +4,7 @@ Required vars: mailing, crmMailingConst
 -->
 <div class="crm-block" ng-form="responseForm" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{title: ts('Track Replies')}" crm-layout="checkbox">
+    <div crm-ui-field="{title: ts('Track Replies'), help: hs('override_verp')}" crm-layout="checkbox">
       <!-- Comparing data-model and UI of "override_verp", note that true/false are inverted (enabled==0,disabled==1) -->
       <span ng-controller="EmailAddrCtrl">
         <input
@@ -17,21 +17,12 @@ Required vars: mailing, crmMailingConst
           />
       </span>
     </div>
-    <div class="crm-section" id="help">
-      {{ts('Recipients\' replies are sent to a CiviMail specific address instead of the sender\'s address so they can be stored within CiviCRM.')}}
-    </div>
-    <div crm-ui-field="{title: ts('Forward Replies')}" crm-layout="checkbox" ng-show="'0' == mailing.override_verp">
+    <div crm-ui-field="{title: ts('Forward Replies'), help: hs('forward_replies')}" crm-layout="checkbox" ng-show="'0' == mailing.override_verp">
       <input name="forward_replies" type="checkbox" ng-model="mailing.forward_replies" ng-true-value="'1'" ng-false-value="'0'" />
     </div>
-    <div class="crm-section" id="help" ng-show="'0' == mailing.override_verp">
-      {{ts('If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.')}}
-    </div>
-    <div crm-ui-field="{title: ts('Auto-Respond to Replies')}" crm-layout="checkbox" ng-show="'0' == mailing.override_verp">
+    <div crm-ui-field="{title: ts('Auto-Respond to Replies'), help: hs('auto_responder')}" crm-layout="checkbox" ng-show="'0' == mailing.override_verp">
       <input name="auto_responder" type="checkbox" ng-model="mailing.auto_responder" ng-true-value="'1'" ng-false-value="'0'" />
     </div>
-    <div class="crm-section" id="help" ng-show="'0' == mailing.override_verp">
-      {{ts('If a recipient replies to this mailing, send an automated reply using the selected message.')}}
-    </div>
   </div>
 </div>
 

diff --git a/partials/crmMailing/tracking.html b/partials/crmMailing/tracking.html
index 85beb3803b2e3fff26e75450ab9ba328d250d0f9..f6da0acd2ed220b379ef1f7c987695e6af170d02 100644 (file)
--- a/partials/crmMailing/tracking.html
+++ b/partials/crmMailing/tracking.html
@@ -4,17 +4,11 @@ Required vars: mailing
 -->
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{name: 'subform.url_tracking', title: ts('Track Click Throughs')}" crm-layout="checkbox">
+    <div crm-ui-field="{name: 'subform.url_tracking', title: ts('Track Click Throughs'), help: hs('url_tracking')}" crm-layout="checkbox">
       <input crm-ui-id="subform.url_tracking" name="url_tracking" type="checkbox" ng-model="mailing.url_tracking" ng-true-value="'1'" ng-false-value="'0'" />
     </div>
-    <div class="crm-section" id="help">
-      {{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.')}}
-    </div>
-    <div crm-ui-field="{name: 'subform.open_tracking', title: ts('Track Opens')}" crm-layout="checkbox">
+    <div crm-ui-field="{name: 'subform.open_tracking', title: ts('Track Opens'), help: hs('open_tracking')}" crm-layout="checkbox">
       <input crm-ui-id="subform.open_tracking" name="open_tracking" type="checkbox" ng-model="mailing.open_tracking" ng-true-value="'1'" ng-false-value="'0'" />
     </div>
-    <div class="crm-section" id="help">
-      {{ts('Track the number of times recipients open this mailing in their email software.')}}
-    </div>
   </div>
 </div>

diff --git a/partials/crmMailingAB/selectWinner.html b/partials/crmMailingAB/selectWinner.html
index 3e1f31e7370943e7800d6ceed4f7573c4f410dc5..0c2db4f60248cdf28fd86ddad406610dcea2a851 100644 (file)
--- a/partials/crmMailingAB/selectWinner.html
+++ b/partials/crmMailingAB/selectWinner.html
@@ -1,6 +1,6 @@
 <div ng-controller="CrmMailingABWinnerDialogCtrl">
   <form novalidate name="winnerForm">
-    <div id="help">
+    <div class="help">
       {{ts('After selecting %1 as the winner, one must schedule the delivery for the final mailing.', {1: mailingTitle})}}
     </div>
 

diff --git a/partials/crmMailingAB/setup.html b/partials/crmMailingAB/setup.html
index 8e18587842aacdabc804bc2b185a433a409f8c26..8a889e258603b2c0a71a7a8ff8df80b2adbeb3ac 100644 (file)
--- a/partials/crmMailingAB/setup.html
+++ b/partials/crmMailingAB/setup.html
@@ -1,8 +1,7 @@
 <div class="crm-block" ng-form="setupForm" crm-ui-id-scope>
   <div class="crm-group">
-    <div id="help" ng-if="fields.help">
-      {{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.')}}
+    <div class="help" ng-if="fields.help">
+      {{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.')}}
     </div>
     <div crm-ui-field="{name: 'setupForm.abName', title: ts('Name'), help: hs('name')}" ng-if="fields.abName">
       <input

diff --git a/templates/CRM/Mailing/Form/Settings.tpl b/templates/CRM/Mailing/Form/Settings.tpl
index 360079ac399f6d505deca5ceb88f4cfa5ba1e3b2..a7b286220a63929c89c9d051678273935bb79110 100644 (file)
--- a/templates/CRM/Mailing/Form/Settings.tpl
+++ b/templates/CRM/Mailing/Form/Settings.tpl
@@ -59,7 +59,10 @@ CRM.$(function($) {
     <table class="form-layout"><tr class="crm-mailing-settings-form-block-url_tracking">
     <td class="label">{$form.url_tracking.label}</td>
         <td>{$form.url_tracking.html}
-            <span class="description">{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}</span>
+            <span class="description">
+              {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}
+            </span>
         </td></tr><tr class="crm-mailing-settings-form-block-open_tracking">
     <td class="label">{$form.open_tracking.label}</td>
         <td>{$form.open_tracking.html}

diff --git a/templates/CRM/Mailing/MailingUI.hlp b/templates/CRM/Mailing/MailingUI.hlp
index 3820d3736b5aaf14ed4cfbccfce3219998c25634..8a16bfdeabd5cc3e5d1285df699d74b931660007 100644 (file)
--- a/templates/CRM/Mailing/MailingUI.hlp
+++ b/templates/CRM/Mailing/MailingUI.hlp
@@ -91,4 +91,36 @@
     <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}
+
+{htxt id="url_tracking"}
+  <p>
+    {ts}Track the number of times recipients click each link in this mailing.{/ts}
+  </p><p>
+    {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}
+  </p>
+{/htxt}
+
+{htxt id="open_tracking"}
+  <p>
+    {ts}Track the number of times recipients open this mailing in their email software.{/ts}
+  </p>
+{/htxt}
+
+{htxt id="override_verp"}
+  <p>
+    {ts}Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.{/ts}
+  </p>
+{/htxt}
+
+{htxt id="auto_responder"}
+  <p>
+    {ts}If a recipient replies to this mailing, send an automated reply using the selected message.{/ts}
+  </p>
+{/htxt}
+
+{htxt id="forward_replies"}
+  <p>
+    {ts}If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.{/ts}
+  </p>
 {/htxt}
\ No newline at end of file