Merge pull request #2375 from colemanw/master

[civicrm-core.git] / templates / CRM / Contribute / Form / SoftCredit.tpl

diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl
index 878f22203d248e23af26531a24e8f94292e1cfeb..71bec1c2b4509beb1af412182ce6f61b05352bb3 100644 (file)
--- a/templates/CRM/Contribute/Form/SoftCredit.tpl
+++ b/templates/CRM/Contribute/Form/SoftCredit.tpl
@@ -24,7 +24,23 @@
  +--------------------------------------------------------------------+
 *}
 {* template for adding form elements for soft credit form*}
-
+{if $honor_block_is_active}
+  {crmRegion name="contribution-soft-credit-block"}
+    <legend>{$honor_block_title}</legend>
+    <div class="crm-section honor_block_text-section">
+      {$honor_block_text}
+    </div>
+    {if $form.soft_credit_type_id.html}
+      <div class="crm-section {$form.soft_credit_type_id.name}-section">
+        <div class="content" >
+          {$form.soft_credit_type_id.html}
+          <span class="crm-clear-link">(<a href="#" title="unselect" onclick="unselectRadio('soft_credit_type_id', '{$form.formName}');enableHonorType(); return false;">{ts}clear{/ts}</a>)</span>
+          <div class="description">{ts}Select an option to reveal honoree information fields.{/ts}</div>
+        </div>
+      </div>
+    {/if}
+  {/crmRegion}
+{else}
 <table class="form-layout-compressed crm-soft-credit-block">
   {section name='i' start=1 loop=$rowCount}
     {assign var='rowNumber' value=$smarty.section.i.index}
@@ -37,10 +53,13 @@
           {assign var='createNewStatus' value=false}
         {/if}
         {include file="CRM/Contact/Form/NewContact.tpl" noLabel=true skipBreak=true blockNo=$rowNumber
-        prefix="soft_credit_" showNewSelect=$createNewStatus}
+        prefix="soft_credit_" showNewSelect=$createNewStatus focus=false}
       </td>
       <td>
         {$form.soft_credit_amount.$rowNumber.label}&nbsp;{$form.soft_credit_amount.$rowNumber.html|crmAddClass:eight}
+      </td>
+      <td>
+        {$form.soft_credit_type.$rowNumber.label}&nbsp;{$form.soft_credit_type.$rowNumber.html|crmAddClass:eight}
         &nbsp;<a class="delete-link" row-no={$rowNumber} href="#">{ts}delete{/ts}</a>
       </td>
     </tr>
@@ -52,3 +71,4 @@
     </td>
   </tr>
 </table>
+{/if}