From b0c14036aae529d71f78e1b9eaa66ffc49f46c25 Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Thu, 25 Jan 2018 12:16:08 +0530
Subject: [PATCH 1/2] CRM-21708: Fixed page structure by adding/removing
 classes

---
 templates/CRM/Admin/Page/ConfigTaskList.tpl                   | 2 +-
 templates/CRM/Admin/Page/MessageTemplates.tpl                 | 2 +-
 templates/CRM/Contact/Form/Search/Builder.tpl                 | 2 +-
 .../CRM/Event/Form/Registration/AdditionalParticipant.tpl     | 2 +-
 templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl  | 2 +-
 templates/CRM/Event/Import/Form/MapField.tpl                  | 4 ++--
 templates/CRM/Export/Form/Select.tpl                          | 2 +-
 templates/CRM/Grant/Form/Selector.tpl                         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl
index 0c665420d339..3d39bee30c3f 100644
--- a/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -26,7 +26,7 @@
 {capture assign="linkTitle"}{ts}Edit settings{/ts}{/capture}
 {capture assign="adminMenu"}{crmURL p="civicrm/admin" q="reset=1"}{/capture}
 
-<div id="help" class="description">
+<div class="help">
     {ts 1=$adminMenu}Use this checklist to review and complete configuration tasks for your site. You will be redirected back to this checklist after saving each setting. Settings which you have not yet reviewed will be <span class="status-overdue">displayed in red</span>. After you have visited a page, the links will <span class="status-pending">display in green</span>  (although you may still need to revisit the page to complete or update the settings). You can access this page again from the <a href="%1">Administer CiviCRM</a> menu at any time.{/ts}
 </div>
 
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index a2795be12ed7..38cef9f675c5 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -81,7 +81,7 @@
     </div>
   </div>
 
-  <div id="crm-submit-buttons">{$form.buttons.html}</div>
+  <div id="crm-submit-buttons" class="crm-submit-buttons">{$form.buttons.html}</div>
   </fieldset>
 {/if}
 
diff --git a/templates/CRM/Contact/Form/Search/Builder.tpl b/templates/CRM/Contact/Form/Search/Builder.tpl
index 694d457872d7..535d44387cc5 100644
--- a/templates/CRM/Contact/Form/Search/Builder.tpl
+++ b/templates/CRM/Contact/Form/Search/Builder.tpl
@@ -35,7 +35,7 @@
         {* Table for adding search criteria. *}
         {include file="CRM/Contact/Form/Search/table.tpl"}
         <div class="clear"></div>
-        <div id="crm-submit-buttons">
+        <div id="crm-submit-buttons" class="crm-submit-buttons">
           {$form.buttons.html}
         </div>
       </div>
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index be71a9955469..33342cf838be 100644
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -70,7 +70,7 @@
   {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost}
 </div>
 
-<div id="crm-submit-buttons">
+<div id="crm-submit-buttons" class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl"}
 </div>
 </div>
diff --git a/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl b/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
index fedf18ce9b86..52c41830b53f 100644
--- a/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
+++ b/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
@@ -28,7 +28,7 @@
         {$statusMsg}
   </div>
 
-  <div id="crm-submit-buttons">
+  <div id="crm-submit-buttons" class="crm-submit-buttons">
   {include file="CRM/common/formButtons.tpl" location="bottom"}
   </div>
 </div>
diff --git a/templates/CRM/Event/Import/Form/MapField.tpl b/templates/CRM/Event/Import/Form/MapField.tpl
index 3af808265d83..0ac6b25fa298 100644
--- a/templates/CRM/Event/Import/Form/MapField.tpl
+++ b/templates/CRM/Event/Import/Form/MapField.tpl
@@ -39,7 +39,7 @@
  <table class="form-layout">
    <tr>
      <td>
-  <div id="crm-submit-buttons">
+  <div id="crm-submit-buttons" class="crm-submit-buttons">
          {include file="CRM/common/formButtons.tpl" location="top"}
   </div>
      </td>
@@ -51,7 +51,7 @@
    </tr>
    <tr>
      <td>
-  <div id="crm-submit-buttons">
+  <div id="crm-submit-buttons" class="crm-submit-buttons">
          {include file="CRM/common/formButtons.tpl" location="bottom"}
   </div>
      </td>
diff --git a/templates/CRM/Export/Form/Select.tpl b/templates/CRM/Export/Form/Select.tpl
index 9eff03d891e8..a5d475055f22 100644
--- a/templates/CRM/Export/Form/Select.tpl
+++ b/templates/CRM/Export/Form/Select.tpl
@@ -60,7 +60,7 @@
   <div class="crm-section crm-export-mergeOptions-section">
     <div class="label crm-label-mergeOptions">{ts}Merge Options{/ts} {help id="id-export_merge_options"}</div>
     <div class="content crm-content-mergeOptions">
-        &nbsp;{$form.mergeOption.html}
+      {$form.mergeOption.html}
     </div>
     <div id='greetings' class="content crm-content-greetings class='hiddenElement'">
       <table class="form-layout-compressed">
diff --git a/templates/CRM/Grant/Form/Selector.tpl b/templates/CRM/Grant/Form/Selector.tpl
index 664a0cf2a7f6..c471084205af 100644
--- a/templates/CRM/Grant/Form/Selector.tpl
+++ b/templates/CRM/Grant/Form/Selector.tpl
@@ -30,7 +30,7 @@
 {strip}
 <table class="selector row-highlight">
   <thead class="sticky">
-  <tr class="columnheader">
+  <tr>
   {if ! $single and $context eq 'Search' }
      <th scope="col" title="Select Rows">{$form.toggleSelect.html}</th>
   {/if}

From 2731695215176439da1971898692c9fb9610657d Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Thu, 25 Jan 2018 14:26:19 +0530
Subject: [PATCH 2/2] CRM-21708: Removed unwanted IDs

---
 templates/CRM/Event/Import/Form/MapField.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Event/Import/Form/MapField.tpl b/templates/CRM/Event/Import/Form/MapField.tpl
index 0ac6b25fa298..584b5fafee24 100644
--- a/templates/CRM/Event/Import/Form/MapField.tpl
+++ b/templates/CRM/Event/Import/Form/MapField.tpl
@@ -39,7 +39,7 @@
  <table class="form-layout">
    <tr>
      <td>
-  <div id="crm-submit-buttons" class="crm-submit-buttons">
+  <div class="crm-submit-buttons">
          {include file="CRM/common/formButtons.tpl" location="top"}
   </div>
      </td>
@@ -51,7 +51,7 @@
    </tr>
    <tr>
      <td>
-  <div id="crm-submit-buttons" class="crm-submit-buttons">
+  <div class="crm-submit-buttons">
          {include file="CRM/common/formButtons.tpl" location="bottom"}
   </div>
      </td>