From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 22 Jul 2014 19:25:17 +0000 (-0700)
Subject: CRM-15001 - clarify field label, terminology and help text.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bbfb237b450ac6cc26178674b64ec1369f30173c;p=civicrm-core.git

CRM-15001 - clarify field label, terminology and help text.

----------------------------------------
* CRM-15001:
  https://issues.civicrm.org/jira/browse/CRM-15001
---

diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php
index 076a2f3c3c..0d764aaa30 100644
--- a/CRM/Admin/Form/ScheduleReminders.php
+++ b/CRM/Admin/Form/ScheduleReminders.php
@@ -199,7 +199,7 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
       );
     }
 
-    $limitOptions = array(1 => ts('Limit to'), 0 => ts('Addition to'));
+    $limitOptions = array(1 => ts('Limit to'), 0 => ts('Also include'));
     $this->add('select', 'limit_to', ts('Limit Options'), $limitOptions);
 
     $this->add('select', 'recipient', ts('Recipients'), $sel5[$recipient],
diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl
index e77c78b896..1dfe67dfc1 100644
--- a/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -231,69 +231,63 @@
     });
   });
 
-     function populateRecipient( ) {
-         var recipient = cj("#recipient option:selected").val();
+  function populateRecipient( ) {
+    var recipient = cj("#recipient option:selected").val();
     var entity = cj("#entity_0 option:selected").val();
     var postUrl = "{/literal}{crmURL p='civicrm/ajax/populateRecipient' h=0}{literal}";
 
-    if(recipientMapping[recipient] == 'Participant Status' || recipientMapping[recipient] == 'participant_role') {
-          var elementID = '#recipient_listing';
-             cj( elementID ).html('');
-          cj.post(postUrl, {recipient: recipientMapping[recipient]},
-            function ( response ) {
-          response = eval( response );
-          for (i = 0; i < response.length; i++) {
-                         cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
-                    }
-    });
-          cj("#recipientList").show();
-                cj('#is_recipient_listing').val(1);
+    if (recipientMapping[recipient] == 'Participant Status' || recipientMapping[recipient] == 'participant_role') {
+      var elementID = '#recipient_listing';
+      cj( elementID ).html('');
+      cj.post(postUrl, {recipient: recipientMapping[recipient]},
+      function ( response ) {
+        response = eval( response );
+        for (i = 0; i < response.length; i++) {
+          cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
+        }
+      });
+      cj("#recipientList").show();
+      cj('#is_recipient_listing').val(1);
     } else {
-       cj("#recipientList").hide();
-       cj('#is_recipient_listing').val('');
+      cj("#recipientList").hide();
+      cj('#is_recipient_listing').val('');
     }
-
-    if (entityMapping[entity] == 'civicrm_activity') {
-       cj("#recipientLabel").text("Recipient(s)");
-    } else {
-        cj("#recipientLabel").text("Limit Recipients");
+  }
+  
+  function buildSelect( selectID ) {
+    var elementID = '#' +  selectID;
+    cj( elementID ).html('');
+    var mappingID = cj('#entity_0').val();
+    var postUrl = "{/literal}{crmURL p='civicrm/ajax/mapping' h=0}{literal}";
+    cj.post( postUrl, { mappingID: mappingID},
+    function ( response ) {
+      response = eval( response );
+      for (i = 0; i < response.length; i++) {
+        cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
+      }
     }
-     }
-     function buildSelect( selectID ) {
-         var elementID = '#' +  selectID;
-         cj( elementID ).html('');
-   var mappingID = cj('#entity_0').val();
-         var postUrl = "{/literal}{crmURL p='civicrm/ajax/mapping' h=0}{literal}";
-         cj.post( postUrl, { mappingID: mappingID},
-             function ( response ) {
-                 response = eval( response );
-                 for (i = 0; i < response.length; i++) {
-                     cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
-                 }
-             }
-         );
-
-     }
+    );
+  }
 
- function buildSelect1( selectID ) {
-         var elementID = '#' +  selectID;
-         cj( elementID ).html('');
-   var mappingID = cj('#entity_0').val();
-         var postUrl1 = "{/literal}{crmURL p='civicrm/ajax/mapping1' h=0}{literal}";
+  function buildSelect1( selectID ) {
+    var elementID = '#' +  selectID;
+    cj( elementID ).html('');
+    var mappingID = cj('#entity_0').val();
+    var postUrl1 = "{/literal}{crmURL p='civicrm/ajax/mapping1' h=0}{literal}";
 
-   cj('#is_recipient_listing').val('');
-         cj.post( postUrl1, { mappingID: mappingID},
-             function ( result ) {
-                 var responseResult = cj.parseJSON(result);
-                 var response       = eval(responseResult.sel5);
-                 recipientMapping   = eval(responseResult.recipientMapping);
-                 for (i = 0; i < response.length; i++) {
-                     cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
-                 }
-     populateRecipient();
-             }
-         );
-     }
+    cj('#is_recipient_listing').val('');
+    cj.post( postUrl1, { mappingID: mappingID},
+    function ( result ) {
+      var responseResult = cj.parseJSON(result);
+      var response       = eval(responseResult.sel5);
+      recipientMapping   = eval(responseResult.recipientMapping);
+      for (i = 0; i < response.length; i++) {
+        cj( elementID ).get(0).add(new Option(response[i].name, response[i].value), document.all ? i : null);
+      }
+      populateRecipient();
+    }
+    );
+  }
 
  </script>
  {/literal}
diff --git a/templates/CRM/Admin/Page/ScheduleReminders.hlp b/templates/CRM/Admin/Page/ScheduleReminders.hlp
index 8028a071a2..370da0fae7 100644
--- a/templates/CRM/Admin/Page/ScheduleReminders.hlp
+++ b/templates/CRM/Admin/Page/ScheduleReminders.hlp
@@ -24,7 +24,8 @@
  +--------------------------------------------------------------------+
 *}
 {htxt id="recipient"}
-  {ts}Only send reminders to participants with the status(es) selected above AND who match this criteria. If you select Manual Recipients - only those people will receive the reminder (AND only if they are ALSO participants with the selected status).{/ts}
+  <p>{ts}Select 'Limit to' if you want to only send reminders to contacts with the criteria selected above AND who ALSO match this criteria. If you select 'Choose Recipients' - only the chosen contacts will receive the reminder (AND only if they ALSO match the criteria above).{/ts}</p>
+  <p>{ts}Select 'Also include' if you want to also send reminders to contacts who match this criteria. If you select 'Choose Recipients' - the chosen contacts will also receive the reminder (in ADDITION TO the contacts who match the criteria above).{/ts}
 {/htxt}
 
 {htxt id="id-from_name_email-title"}