CRM-17620 - Improve contribution results table layout

diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php
index 98fb7b10b3e46de68eb9093268df294c01b26ddd..d7c007b8afc98015a8ba2bc70322a46f25dae852 100644 (file)
--- a/CRM/Contribute/Selector/Search.php
+++ b/CRM/Contribute/Selector/Search.php
@@ -526,10 +526,8 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
           ),
         )
       );
-    $pre = array();
     if (!$this->_single) {
       $pre = array(
-        array('desc' => ts('Contact Type')),
         array(
           'name' => ts('Name'),
           'sort' => 'sort_name',
@@ -537,12 +535,6 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
         ),
       );
     }
-    $pre[] = array(
-      array(
-        'desc' => '',
-        array(),
-      ),
-    );
     self::$_columnHeaders = array_merge($pre, self::$_columnHeaders);
     if ($this->_includeSoftCredits) {
       self::$_columnHeaders = array_merge(

diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index b2994bb0fc51b8c61e9b31a7a84fa479f8738722..6afb58f55c7e603072e4ab5ece17e4b07a850e16 100644 (file)
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -62,21 +62,16 @@
           <td>{$form.$cbName.html}</td>
    {/if}
 
-    <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>
+      <td>{$row.contact_type} &nbsp; <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
     {/if}
-    <td>
-      <a class="crm-expand-row" href="{crmURL p='civicrm/payment' q="view=transaction&component=contribution&action=browse&cid=`$row.contact_id`&id=`$row.contribution_id`&selector=1"}"></a>
+    <td class="crm-contribution-amount">
+      <a class="nowrap bold crm-expand-row" title="{ts}view payments{/ts}" href="{crmURL p='civicrm/payment' q="view=transaction&component=contribution&action=browse&cid=`$row.contact_id`&id=`$row.contribution_id`&selector=1"}">
+      &nbsp;
+      {if !$row.contribution_soft_credit_amount}{$row.total_amount|crmMoney:$row.currency}{/if}
+      </a>
+      {if $row.amount_level }<br /> ({$row.amount_level}){/if}
+      {if $row.contribution_recur_id}<br /> {ts}(Recurring Contribution){/ts}{/if}
     </td>
-    {if $row.contribution_soft_credit_amount}
-      <td class="right bold crm-contribution-amount">&nbsp;</td>
-    {else}
-      <td class="right bold crm-contribution-amount"><span class="nowrap">{$row.total_amount|crmMoney:$row.currency}</span> {if $row.amount_level }<br /> ({$row.amount_level}){/if}
-      {if $row.contribution_recur_id}
-  <br /> {ts}(Recurring Contribution){/ts}
-      {/if}
-      </td>
-    {/if}
     {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}