Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-48-43

[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 f0fd7ca870a1d87ff0b0c19bde4162b857a5085a..1c1497bf4f0729693871e3fff85fd1bdd40ecb3b 100644 (file)
--- a/templates/CRM/Mailing/Page/Browse.tpl
+++ b/templates/CRM/Mailing/Page/Browse.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -37,7 +37,7 @@
 
 {if $showLinks}
     <div class="action-link">
-       <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon email-icon"></div>{ts}{$linkTitle}{/ts}</span></a><br/><br/>
+      <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon email-icon"></div>{ts}{$linkTitle}{/ts}</span></a><br/><br/>
     </div>
 {/if}
 {include file="CRM/Mailing/Form/Search.tpl"}
@@ -47,30 +47,17 @@
     {include file="CRM/common/pagerAToZ.tpl"}
 
     {strip}
-    <table class="selector">
+    <table class="selector row-highlight">
       <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>
@@ -119,7 +103,7 @@
     <div class="status messages">
         <table class="form-layout">
             <tr><div class="icon inform-icon"></div>
-               {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts} 
+               {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts}
       </tr>
                 <div class="spacer"></div>
                 <ul>
@@ -150,6 +134,6 @@
             {capture assign=crmURL}{crmURL p=$newMassUrl q='reset=1'}{/capture}
             {capture assign=archiveURL}{crmURL p='civicrm/mailing/browse/archived' q='reset=1'}{$qVal}{/capture}
             {ts 1=$componentName}There are no Scheduled or Sent %1.{/ts}
-           {if $showLinks}{ts 1=$crmURL}You can <a href='%1'>create and send one</a>{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the <a href='%1'>Archived %2</a>{/ts}{/if}.          
+      {if $showLinks}{ts 1=$crmURL}You can <a href='%1'>create and send one</a>{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the <a href='%1'>Archived %2</a>{/ts}{/if}.
    </div>
 {/if}