manual merge of fixes for CRM-13981

[civicrm-core.git] / templates / CRM / Pledge / Page / UserDashboard.tpl

diff --git a/templates/CRM/Pledge/Page/UserDashboard.tpl b/templates/CRM/Pledge/Page/UserDashboard.tpl
index 1956c33d7abc096f09c4ca47439e0e6e209c95e5..846111e7f57b11d5f2da9a4803ee0599bab4aae2 100644 (file)
--- a/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -81,7 +81,8 @@
     <tr class="columnheader">
         <th>{ts}Pledger{/ts}</th>
         <th>{ts}Amount{/ts}</th>
-  <th>{ts}Financial Type{/ts}</th>
+        <th>{ts}Type{/ts}</th>
+        <th>{ts}Financial Type{/ts}</th>
         <th>{ts}Create date{/ts}</th>
         <th>{ts}Acknowledgment Sent{/ts}</th>
    <th>{ts}Acknowledgment Date{/ts}</th>
@@ -92,6 +93,7 @@
      <tr id='rowid{$row.honorId}' class="{cycle values="odd-row,even-row"}">
      <td class="crm-pledge-display_name"><a href="{crmURL p="civicrm/contact/view" q="reset=1&cid=`$row.honorId`"}" id="view_contact">{$row.display_name}</a></td>
      <td class="crm-pledge-amount">{$row.amount|crmMoney:$row.pledge_currency}</td>
+     <td class="crm-pledge-honor-type">{$row.honor_type}</td>
            <td class="crm-pledge-type">{$row.type}</td>
            <td class="crm-pledge-create_date">{$row.create_date|truncate:10:''|crmDate}</td>
            <td align="center">{if $row.acknowledge_date}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}</td>