From 0bdcd04cab68a25a54e4a46ab4e53482dd95312f Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Wed, 21 Mar 2018 14:24:31 +0530
Subject: [PATCH] Fix template structure

---
 templates/CRM/Event/Form/Task/Batch.tpl       | 12 +++---------
 templates/CRM/Event/Form/Task/PickProfile.tpl |  7 +++----
 templates/CRM/Event/Form/Task/SaveSearch.tpl  | 12 +++++-------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index 8821f9342c..f70eec3fae 100644
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -24,7 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="batch-update crm-block crm-form-block crm-event-batch-form-block">
-<fieldset>
   <div class="help">
     {if $context EQ 'statusChange'} {* Update Participant Status task *}
       {ts}Update the status for each participant individually below, or change all statuses to:{/ts}
@@ -108,15 +107,10 @@
              </tr>
             {/foreach}
            </tr>
-           <tr>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-              <td> {if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl"}
-              </td>
-           </tr>
          </table>
-
-</fieldset>
+<div class="crm-submit-buttons">
+{if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl"}
+</div>
 </div>
 
 {if $context EQ 'statusChange'} {* Update Participant Status task *}
diff --git a/templates/CRM/Event/Form/Task/PickProfile.tpl b/templates/CRM/Event/Form/Task/PickProfile.tpl
index c7d221f973..2264fd06cf 100644
--- a/templates/CRM/Event/Form/Task/PickProfile.tpl
+++ b/templates/CRM/Event/Form/Task/PickProfile.tpl
@@ -33,10 +33,9 @@
            <td>&nbsp;</td>
            <td>{include file="CRM/Event/Form/Task.tpl"}</td>
         </tr>
-        <tr>
-           <td>&nbsp;</td>
-           <td>{include file="CRM/common/formButtons.tpl" location="bottom"}</td>
-        </tr>
     </table>
+    <div class="crm-submit-buttons">
+      {include file="CRM/common/formButtons.tpl" location="bottom"}
+    </div>
 </div>
 
diff --git a/templates/CRM/Event/Form/Task/SaveSearch.tpl b/templates/CRM/Event/Form/Task/SaveSearch.tpl
index 81887a6bbd..d05ef2468f 100644
--- a/templates/CRM/Event/Form/Task/SaveSearch.tpl
+++ b/templates/CRM/Event/Form/Task/SaveSearch.tpl
@@ -24,8 +24,8 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-event-savesearch-form-block">
-<fieldset>
-    <legend>{ts}Smart Group{/ts}</legend>
+
+  <h3>{ts}Smart Group{/ts}</h3>
 
   <div class="help">
     <p>{ts}This smart group will stay up-to-date with all contacts who meet the search criteria.{/ts}</p>
@@ -56,11 +56,9 @@
    <tr>
       <td colspan="2" class="label">{include file="CRM/Event/Form/Task.tpl"}</td>
    </tr>
-   <tr>
-      <td colspan="2">{include file="CRM/common/formButtons.tpl" location="bottom"}</td>
-   </tr>
 </table>
-
-</fieldset>
+<div class="crm-submit-buttons">
+{include file="CRM/common/formButtons.tpl" location="bottom"}
+</div>
 </div>
 
-- 
2.25.1