X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FContribute%2FForm%2FSelector.tpl;h=7d8c47b520161a108d4e13cabd494d0deeed0e85;hb=94d4ec0206bf482f443216865f5bcc43b552df7c;hp=10e975d032252dc3bbfc29e9474e91b2ba592d09;hpb=2845ec4b2e5fef3bf9586a8d491f02b0bb0489bb;p=civicrm-core.git

diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index 10e975d032..7d8c47b520 100644
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -32,6 +32,9 @@
       {if !$single and $context eq 'Search' }
         <th scope="col" title="Select Rows">{$form.toggleSelect.html}</th>
       {/if}
+      {if !$single}
+      <th scope="col"></th>
+      {/if}
       {foreach from=$columnHeaders item=header}
         <th scope="col">
           {if $header.sort}
@@ -56,7 +59,8 @@
             {assign var=cbName value=$row.checkbox}
             <td>{$form.$cbName.html}</td>
           {/if}
-          <td>{$row.contact_type} &nbsp; <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
+          <td>{$row.contact_type}</td>
+          <td><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
         {/if}
         <td class="crm-contribution-amount">
           {if !$row.contribution_soft_credit_amount}
@@ -65,32 +69,37 @@
             </a>
           {/if}
           {if $row.amount_level }<br/>({$row.amount_level}){/if}
-          {if $row.contribution_recur_id}<br/>{ts}(Recurring Contribution){/ts}{/if}
+          {if $row.contribution_recur_id}<br/>{ts}(Recurring){/ts}{/if}
         </td>
         {if $softCreditColumns}
           <td class="right bold crm-contribution-soft_credit_amount">
             <span class="nowrap">{$row.contribution_soft_credit_amount|crmMoney:$row.currency}</span>
           </td>
         {/if}
-        <td class="crm-contribution-type crm-contribution-type_{$row.financial_type_id} crm-financial-type crm-financial-type_{$row.financial_type_id}">
-          {$row.financial_type}
-        </td>
-        <td class="crm-contribution-source">
-          {$row.contribution_source}
-        </td>
-        <td class="crm-contribution-receive_date">
-          {$row.receive_date|crmDate}
-        </td>
-        <td class="crm-contribution-thankyou_date">
-          {$row.thankyou_date|crmDate}
-        </td>
-        <td class="crm-contribution-status">
-          {$row.contribution_status}<br/>
-          {if $row.cancel_date}
-            {$row.cancel_date|crmDate}
+      {foreach from=$columnHeaders item=column}
+        {assign var='columnName' value=$column.field_name}
+        {if !$columnName}{* if field_name has not been set skip, this helps with not changing anything not specifically edited *}
+        {elseif $columnName === 'total_amount'}{* rendered above as soft credit columns = confusing *}
+        {elseif $column.type === 'actions'}{* rendered below as soft credit column handling = not fixed *}
+        {elseif $columnName == 'contribution-status'}
+          <td class="crm-contribution-status">
+            {$row.contribution_status}<br/>
+            {if $row.cancel_date}
+              {$row.cancel_date|crmDate}
+            {/if}
+          </td>
+        {else}
+          {if $column.type == 'date'}
+            <td class="crm-contribution-{$columnName}">
+              {$row.$columnName|crmDate}
+            </td>
+          {else}
+          <td class="crm-{$columnName} crm-{$columnName}_{$row.columnName}">
+            {$row.$columnName}
+          </td>
           {/if}
-        </td>
-        <td class="crm-contribution-product_name">{$row.product_name}</td>
+        {/if}
+      {/foreach}
         {if $softCreditColumns}
           <td class="crm-contribution-soft_credit_name">
             <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contribution_soft_credit_contact_id`"}">{$row.contribution_soft_credit_name}</a>