CRM-19429 - CiviEvent: clarify text for when email is sent on status change

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index de821255b84312074c352e22c852d9bf221cfa88..170271c7058d56558e6e82638684e13378b5bb85 100644 (file)
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -523,7 +523,8 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
     $notifyingStatuses = array_intersect($notifyingStatuses, CRM_Event_PseudoConstant::participantStatus());
     $this->assign('status', TRUE);
     if (!empty($notifyingStatuses)) {
-      $this->assign('notifyingStatuses', implode(', ', $notifyingStatuses));
+      $s = '<em>' . implode('</em>, <em>', $notifyingStatuses) . '</em>';
+      $this->assign('notifyingStatuses', $s);
     }
   }
 

diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index 969c77205ef633b4c8ec75405c91c368b3e04971..b9fba9250efdca2a956140fdb70c10f0af21e2a2 100644 (file)
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -27,15 +27,17 @@
 <fieldset>
   <div class="help">
     {if $context EQ 'statusChange'} {* Update Participant Status task *}
-      {ts}Update the status for each participant individually, OR change all statuses to:{/ts}
+      {ts}Update the status for each participant individually below, or change all statuses to:{/ts}
       {$form.status_change.html}  {help id="id-status_change"}
       {if $status}
         <div class="status">
-          {ts}Participants whose status is changed FROM Pending Pay Later TO Registered or Attended will receive a confirmation email and their payment status will be set to completed. If this is not you want to do, you can change their participant status by editing their event registration record directly.{/ts}
+          <p>{ts}This form <strong>will send email</strong> to contacts only in certain circumstances:{/ts}</p>
+          <ul>
+            <li>{ts}<strong>Resolving "Pay Later" registrations:</strong> Participants whose status is changed from <em>Pending Pay Later</em> to <em>Registered</em> or <em>Attended</em> will receive a confirmation email and their payment status will be set to completed. If this is not you want to do, you can change their participant status by editing their event registration record directly.{/ts}</li>
           {if $notifyingStatuses}
-            <br />
-            {ts 1=$notifyingStatuses}Participants whose status is changed TO any of the following will be automatically notified via email: %1{/ts}
+            <li>{ts 1=$notifyingStatuses}<strong>Special statuses:</strong> Participants whose status is changed to any of the following will be automatically notified via email: %1{/ts}</li>
           {/if}
+          </ul>
         </div>
       {/if}
     {else}