From 5db72c3221cff7f76836babdb9eee63192f17922 Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Thu, 22 Mar 2018 17:30:53 +0530
Subject: [PATCH] Fix template structure

---
 CRM/Contact/Form/Merge.php             | 2 +-
 templates/CRM/Campaign/Form/Search.tpl | 1 -
 templates/CRM/Group/Form/Edit.tpl      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index 2c6a299186..53045ac971 100644
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -244,7 +244,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
       'type' => 'next',
       'name' => $this->next ? ts('Merge and go to Next Pair') : ts('Merge'),
       'isDefault' => TRUE,
-      'icon' => $this->next ? 'circle-triangle-e' : 'check',
+      'icon' => $this->next ? 'fa-play-circle' : 'check',
     );
 
     if ($this->next || $this->prev) {
diff --git a/templates/CRM/Campaign/Form/Search.tpl b/templates/CRM/Campaign/Form/Search.tpl
index 5d6e53c854..3799799538 100644
--- a/templates/CRM/Campaign/Form/Search.tpl
+++ b/templates/CRM/Campaign/Form/Search.tpl
@@ -51,7 +51,6 @@
       </div>
       <div class="crm-search-results">
        {* This section displays the rows along and includes the paging controls *}
-       <p></p>
        {include file="CRM/Campaign/Form/Selector.tpl" context="Search"}
       </div>
     </fieldset>
diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index e515ef3f0f..00041fb9ef 100644
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -76,7 +76,7 @@
   </tr>
 
   <tr class="crm-group-form-block-isReserved">
-    <td class="report-label">{$form.is_reserved.label}</td>
+    <td class="label">{$form.is_reserved.label}</td>
     <td>{$form.is_reserved.html}
       <span class="description">{ts}If reserved, only users with 'administer reserved groups' permission can disable, delete, or change settings for this group. The reserved flag does NOT affect users ability to add or remove contacts from a group.{/ts}</span>
     </td>
-- 
2.25.1