Move div pair into OnBehalfOf.tpl with condition on front-end

diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index ac3fe8804f1813ab797413ecae22a5430afa98f8..6ce70a689892351f869e26ece83a29d0b9a76e8d 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -25,9 +25,7 @@
 *}
 {* Callback snippet: On-behalf profile *}
 {if $snippet and !empty($isOnBehalfCallback)}
-<div class="crm-public-form-item crm-section">
-  {include file="CRM/Contribute/Form/Contribution/OnBehalfOf.tpl" context="front-end"}
-</div>
+{include file="CRM/Contribute/Form/Contribution/OnBehalfOf.tpl" context="front-end"}
 {* Callback snippet: Load payment processor *}
 {elseif $snippet}
 {include file="CRM/Core/BillingBlock.tpl"}

diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index 1f44085988d471d0c2fde4ac141abd9ef5cc70bc..8b5eee6d358f62a729481c9b062779311746ee47 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -31,6 +31,9 @@
  *}
 
 {if $buildOnBehalfForm or $onBehalfRequired}
+{if $context eq 'front-end'}
+<div class="crm-public-form-item crm-section">
+{/if}
 <fieldset id="for_organization" class="for_organization-group">
 <legend>{$fieldSetTitle}</legend>
   {if ( $relatedOrganizationFound or $onBehalfRequired ) and !$organizationName}
@@ -135,6 +138,9 @@
 </div>
 <div>{$form.mode.html}</div>
 </fieldset>
+{if $context eq 'front-end'}
+</div>
+{/if}
 {/if}
 {if empty($snippet)}
 {literal}