Merge pull request #2495 from civicrm/4.4

[civicrm-core.git] / templates / CRM / Mailing / Page / Browse.tpl

diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl
index 9eb2f3090281a5c43e26be693a2506e730941e68..f474b6841d1f829f1ccae796126d15e4c3ac3ea7 100644 (file)
--- a/templates/CRM/Mailing/Page/Browse.tpl
+++ b/templates/CRM/Mailing/Page/Browse.tpl
@@ -50,27 +50,14 @@
     <table class="selector">
       <thead class="sticky">
       {foreach from=$columnHeaders item=header}
-        {if $unscheduled} {* Hide columnns not relevant for unscheduled mailings. *}
-            {if $header.sort NEQ 'scheduled_by' && $header.sort NEQ 'scheduled_date' && $header.sort NEQ 'start_date' & $header.sort NEQ 'end_date'}
-            <th>
-              {if $header.sort}
-                {assign var='key' value=$header.sort}
-                {$sort->_response.$key.link}
-              {else}
-                {$header.name}
-              {/if}
-            </th>
-            {/if}
-        {elseif $header.sort NEQ 'created_date'}
-            <th>
-              {if $header.sort}
-                {assign var='key' value=$header.sort}
-                {$sort->_response.$key.link}
-              {else}
-                {$header.name}
-              {/if}
-            </th>
-        {/if}
+        <th>
+          {if $header.sort}
+            {assign var='key' value=$header.sort}
+            {$sort->_response.$key.link}
+          {else}
+            {$header.name}
+          {/if}
+        </th>
       {/foreach}
       </thead>
 
@@ -80,15 +67,12 @@
         <td class="crm-mailing-name">{$row.name}</td>
         <td class="crm-mailing-status crm-mailing_status-{$row.status}">{$row.status}</td>
         <td class="crm-mailing-created_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.created_id}>{$row.created_by}</a></td>
-        {if $unscheduled}
-            <td class="crm-mailing-created_date">{$row.created_date}</td>
-        {else}
-            <td class="crm-mailing-scheduled_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.scheduled_id}>{$row.scheduled_by}</a></td>
-            <td class="crm-mailing-scheduled">{$row.scheduled}</td>
-            <td class="crm-mailing-start">{$row.start}</td>
-            <td class="crm-mailing-end">{$row.end}</td>
-        {/if}
-      {if call_user_func(array('CRM_Campaign_BAO_Campaign','isCampaignEnable'))}
+        <td class="crm-mailing-created_date">{$row.created_date}</td>
+        <td class="crm-mailing-scheduled_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.scheduled_id}>{$row.scheduled_by}</a></td>
+        <td class="crm-mailing-scheduled">{$row.scheduled}</td>
+        <td class="crm-mailing-start">{$row.start}</td>
+        <td class="crm-mailing-end">{$row.end}</td>
+       {if call_user_func(array('CRM_Campaign_BAO_Campaign','isCampaignEnable'))}
           <td class="crm-mailing-campaign">{$row.campaign}</td>
       {/if}
         <td>{$row.action|replace:'xx':$row.id}</td>