From 9806f96d0d949af842e64d3f74393aa987d3797d Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Tue, 20 Feb 2018 19:35:42 +0000
Subject: [PATCH] CRM-21784 Clean up contribution tab templates

---
 templates/CRM/Contribute/Form/Selector.tpl    |  5 ++---
 .../CRM/Contribute/Page/ContributionRecur.tpl |  6 ++----
 .../Contribute/Page/ContributionTotals.tpl    |  2 +-
 templates/CRM/Contribute/Page/Tab.tpl         | 21 ++++++++-----------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index 57b961e702..3ccd8315e2 100644
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -26,6 +26,7 @@
 {include file="CRM/common/pager.tpl" location="top"}
 
 {strip}
+  <div class="crm-contact-contribute-contributions">
   <table class="selector row-highlight">
     <thead class="sticky">
     <tr>
@@ -45,9 +46,6 @@
     </tr>
     </thead>
 
-    <p class="description">
-      {ts}Click arrow to view payment details.{/ts}
-    </p>
     {counter start=0 skip=1 print=false}
     {foreach from=$rows item=row}
       <tr id="rowid{$row.contribution_id}" class="{cycle values="odd-row,even-row"} {if $row.cancel_date} cancelled{/if} crm-contribution_{$row.contribution_id}">
@@ -107,6 +105,7 @@
     {/foreach}
 
   </table>
+  </div>
 {/strip}
 
 {include file="CRM/common/pager.tpl" location="bottom"}
diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index bce7514e2e..6821532484 100644
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -72,7 +72,7 @@
             <th scope="col">{ts}Start Date{/ts}</th>
             <th scope="col">{ts}Installments{/ts}</th>
             <th scope="col">{ts}Status{/ts}</th>
-            <th scope="col">&nbsp;</th>
+            <th scope="col"></th>
         </tr>
 
         {foreach from=$recurRows item=row}
@@ -83,9 +83,7 @@
                 <td>{$row.start_date|crmDate}</td>
                 <td>{$row.installments}</td>
                 <td>{$row.contribution_status}</td>
-                <td>
-                    {$row.action|replace:'xx':$row.recurId}
-                </td>
+                <td>{$row.action|replace:'xx':$row.recurId}</td>
             </tr>
         {/foreach}
     </table>
diff --git a/templates/CRM/Contribute/Page/ContributionTotals.tpl b/templates/CRM/Contribute/Page/ContributionTotals.tpl
index 20936373ec..888d06c025 100644
--- a/templates/CRM/Contribute/Page/ContributionTotals.tpl
+++ b/templates/CRM/Contribute/Page/ContributionTotals.tpl
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {*Table displays contribution totals for a contact or search result-set *}
-{if $annual.count OR $contributionSummary}
+{if $annual.count OR $contributionSummary.total.count OR $contributionSummary.cancel.count OR $contributionSummary.soft_credit.count}
     <table class="form-layout-compressed">
 
     {if $annual.count}
diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl
index 68690af559..cd38ffa634 100644
--- a/templates/CRM/Contribute/Page/Tab.tpl
+++ b/templates/CRM/Contribute/Page/Tab.tpl
@@ -28,7 +28,7 @@
 {elseif $action eq 4}
     {include file="CRM/Contribute/Form/ContributionView.tpl"}
 {else}
-    <div class="view-content">
+    <div class="contact-summary-contribute-tab view-content">
         <div class="help">
             {if $permission EQ 'edit'}
               {capture assign=newContribURL}{crmURL p="civicrm/contact/view/contribution" q="reset=1&action=add&cid=`$contactId`&context=contribution"}{/capture}
@@ -52,13 +52,12 @@
                 {/if}
                 <br /><br />
             </div>
-      <div class='clear'> </div>
+          <div class='clear'></div>
         {/if}
 
-
         {if $rows}
             {include file="CRM/Contribute/Page/ContributionTotals.tpl" mode="view"}
-            <p> </p>
+          <div class='clear'></div>
             {include file="CRM/Contribute/Form/Selector.tpl"}
         {else}
             <div class="messages status no-popup">
@@ -68,19 +67,17 @@
         {/if}
 
         {if $recur}
-            <div class="solid-border-top">
-                <br /><label>{ts 1=$displayName}Recurring Contributions{/ts}</label>
-            </div>
+          <div class="crm-block crm-contact-contribute-recur">
+            <h3>{ts}Recurring Contributions{/ts}</h3>
             {include file="CRM/Contribute/Page/ContributionRecur.tpl"}
+          </div>
         {/if}
 
         {if $softCredit}
-            <div class="solid-border-top">
-                <br />
-                <div class="label">{ts}Soft credits{/ts} {help id="id-soft_credit"}</div>
-                <div class="spacer"></div>
-            </div>
+          <div class="crm-block crm-contact-contribute-softcredit">
+            <h3>{ts}Soft credits{/ts} {help id="id-soft_credit"}</h3>
             {include file="CRM/Contribute/Page/ContributionSoft.tpl"}
+          </div>
         {/if}
     </div>
 {/if}
-- 
2.25.1