Mailing Report: when scheduled, displays stats so that we can see recipient count...

diff --git a/templates/CRM/Mailing/Page/Report.tpl b/templates/CRM/Mailing/Page/Report.tpl
index c264a2b2dba04321e052c9fa78218ac118ce17ea..a7bf50da864c80ea028a92f1a030659dd6898f30 100644 (file)
--- a/templates/CRM/Mailing/Page/Report.tpl
+++ b/templates/CRM/Mailing/Page/Report.tpl
@@ -9,60 +9,56 @@
 *}
 <fieldset>
 <legend>{ts}Delivery Summary{/ts}</legend>
-{if $report.jobs.0.start_date}
-  {strip}
-  <table class="crm-info-panel">
-    <tr><td class="label"><a href="{$report.event_totals.links.queue}">{ts}Intended Recipients{/ts}</a></td>
-        <td>{$report.event_totals.queue}</td>
-        <td>{$report.event_totals.actionlinks.queue}</td></tr>
-    <tr><td class="label"><a href="{$report.event_totals.links.delivered}">{ts}Successful Deliveries{/ts}</a></td>
-        <td>{$report.event_totals.delivered} ({$report.event_totals.delivered_rate|string_format:"%0.2f"}%)</td>
-        <td>{$report.event_totals.actionlinks.delivered}</td></tr>
-  {if $report.mailing.open_tracking}
-    <tr><td class="label"><a href="{$report.event_totals.links.opened}&distinct=1">{ts}Unique Opens{/ts}</a></td>
-        <td>{$report.event_totals.opened} ({$report.event_totals.opened_rate|string_format:"%0.2f"}%)</td>
-        <td>{$report.event_totals.actionlinks.opened_unique}</td></tr>
-    <tr><td class="label"><a href="{$report.event_totals.links.opened}">{ts}Total Opens{/ts}</a></td>
-        <td>{$report.event_totals.total_opened}</td>
-        <td>{$report.event_totals.actionlinks.opened}</td></tr>
-  {/if}
-  {if $report.mailing.url_tracking}
-    <tr><td class="label"><a href="{$report.event_totals.links.clicks}">{ts}Click-throughs{/ts}</a></td>
-        <td>{$report.event_totals.url} ({$report.event_totals.clickthrough_rate|string_format:"%0.2f"}%)</td>
-        <td>{$report.event_totals.actionlinks.clicks}</td></tr>
-  {/if}
-  <tr><td class="label"><a href="{$report.event_totals.links.forward}">{ts}Forwards{/ts}</a></td>
-      <td>{$report.event_totals.forward}</td>
-      <td>{$report.event_totals.actionlinks.forward}</td></tr>
-  <tr><td class="label"><a href="{$report.event_totals.links.reply}">{ts}Replies{/ts}</a></td>
-      <td>{$report.event_totals.reply}</td>
-      <td>{$report.event_totals.actionlinks.reply}</td></tr>
-  <tr><td class="label"><a href="{$report.event_totals.links.bounce}">{ts}Bounces{/ts}</a></td>
-      <td>{$report.event_totals.bounce} ({$report.event_totals.bounce_rate|string_format:"%0.2f"}%)</td>
-      <td>{$report.event_totals.actionlinks.bounce}</td></tr>
-  <tr><td class="label"><a href="{$report.event_totals.links.unsubscribe}">{ts}Unsubscribe Requests{/ts}</a></td>
-      <td>{$report.event_totals.unsubscribe} ({$report.event_totals.unsubscribe_rate|string_format:"%0.2f"}%)</td>
-      <td>{$report.event_totals.actionlinks.unsubscribe}</td></tr>
-  <tr><td class="label"><a href="{$report.event_totals.links.optout}">{ts}Opt-out Requests{/ts}</a></td>
-      <td>{$report.event_totals.optout} ({$report.event_totals.optout_rate|string_format:"%0.2f"}%)</td>
-      <td>{$report.event_totals.actionlinks.optout}</td></tr>
-  <tr><td class="label">{ts}Scheduled Date{/ts}</td>
-      <td colspan=2>{$report.jobs.0.scheduled_date}</td></tr>
-  <tr><td class="label">{ts}Status{/ts}</td>
-      <td colspan=2>{$report.jobs.0.status}</td></tr>
-  <tr><td class="label">{ts}Start Date{/ts}</td>
-      <td colspan=2>{$report.jobs.0.start_date}</td></tr>
-  <tr><td class="label">{ts}End Date{/ts}</td>
-      <td colspan=2>{$report.jobs.0.end_date}</td></tr>
-  </table>
-  {/strip}
-{else}
-    <div class="messages status no-popup">
-        {ts}<strong>Delivery has not yet begun for this mailing.</strong> If the scheduled delivery date and time is past, ask the system administrator or technical support contact for your site to verify that the automated mailer task ('cron job') is running - and how frequently.{/ts} {docURL page="user/advanced-configuration/email-system-configuration"}
-    </div>
+{if !$report.jobs.0.start_date}
+  <div class="messages status no-popup">
+    {ts}<strong>Delivery has not yet begun for this mailing.</strong> If the scheduled delivery date and time is past, ask the system administrator or technical support contact for your site to verify that the automated mailer task ('cron job') is running - and how frequently.{/ts} {docURL page="user/advanced-configuration/email-system-configuration"}
+  </div>
+{/if}
+<table class="crm-info-panel">
+  <tr><td class="label"><a href="{$report.event_totals.links.queue}">{ts}Intended Recipients{/ts}</a></td>
+      <td>{$report.event_totals.queue}</td>
+      <td>{$report.event_totals.actionlinks.queue}</td></tr>
+  <tr><td class="label"><a href="{$report.event_totals.links.delivered}">{ts}Successful Deliveries{/ts}</a></td>
+      <td>{$report.event_totals.delivered} ({$report.event_totals.delivered_rate|string_format:"%0.2f"}%)</td>
+      <td>{$report.event_totals.actionlinks.delivered}</td></tr>
+{if $report.mailing.open_tracking}
+  <tr><td class="label"><a href="{$report.event_totals.links.opened}&distinct=1">{ts}Unique Opens{/ts}</a></td>
+      <td>{$report.event_totals.opened} ({$report.event_totals.opened_rate|string_format:"%0.2f"}%)</td>
+      <td>{$report.event_totals.actionlinks.opened_unique}</td></tr>
+  <tr><td class="label"><a href="{$report.event_totals.links.opened}">{ts}Total Opens{/ts}</a></td>
+      <td>{$report.event_totals.total_opened}</td>
+      <td>{$report.event_totals.actionlinks.opened}</td></tr>
 {/if}
+{if $report.mailing.url_tracking}
+  <tr><td class="label"><a href="{$report.event_totals.links.clicks}">{ts}Click-throughs{/ts}</a></td>
+      <td>{$report.event_totals.url} ({$report.event_totals.clickthrough_rate|string_format:"%0.2f"}%)</td>
+      <td>{$report.event_totals.actionlinks.clicks}</td></tr>
+{/if}
+<tr><td class="label"><a href="{$report.event_totals.links.forward}">{ts}Forwards{/ts}</a></td>
+    <td>{$report.event_totals.forward}</td>
+    <td>{$report.event_totals.actionlinks.forward}</td></tr>
+<tr><td class="label"><a href="{$report.event_totals.links.reply}">{ts}Replies{/ts}</a></td>
+    <td>{$report.event_totals.reply}</td>
+    <td>{$report.event_totals.actionlinks.reply}</td></tr>
+<tr><td class="label"><a href="{$report.event_totals.links.bounce}">{ts}Bounces{/ts}</a></td>
+    <td>{$report.event_totals.bounce} ({$report.event_totals.bounce_rate|string_format:"%0.2f"}%)</td>
+    <td>{$report.event_totals.actionlinks.bounce}</td></tr>
+<tr><td class="label"><a href="{$report.event_totals.links.unsubscribe}">{ts}Unsubscribe Requests{/ts}</a></td>
+    <td>{$report.event_totals.unsubscribe} ({$report.event_totals.unsubscribe_rate|string_format:"%0.2f"}%)</td>
+    <td>{$report.event_totals.actionlinks.unsubscribe}</td></tr>
+<tr><td class="label"><a href="{$report.event_totals.links.optout}">{ts}Opt-out Requests{/ts}</a></td>
+    <td>{$report.event_totals.optout} ({$report.event_totals.optout_rate|string_format:"%0.2f"}%)</td>
+    <td>{$report.event_totals.actionlinks.optout}</td></tr>
+<tr><td class="label">{ts}Scheduled Date{/ts}</td>
+    <td colspan=2>{$report.jobs.0.scheduled_date}</td></tr>
+<tr><td class="label">{ts}Status{/ts}</td>
+    <td colspan=2>{$report.jobs.0.status}</td></tr>
+<tr><td class="label">{ts}Start Date{/ts}</td>
+    <td colspan=2>{$report.jobs.0.start_date}</td></tr>
+<tr><td class="label">{ts}End Date{/ts}</td>
+    <td colspan=2>{$report.jobs.0.end_date}</td></tr>
+</table>
 </fieldset>
-
 <fieldset>
 <legend>{ts}Recipients{/ts}</legend>
 {if $report.group.include|@count}
@@ -149,7 +145,7 @@
 {/if}
 
 <fieldset>
-<legend>{ts}Content / Components{/ts}</legend>
+<legend>{ts}Content{/ts}</legend>
 {strip}
 <table class="crm-info-panel">
 {if $report.mailing.body_text}