From 1df7ed88a129f662645dce59c346d9296230796b Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Mon, 26 Feb 2018 18:29:50 +0530
Subject: [PATCH] CRM-21805: Fixed fields and labels in find participants

---
 .../Form/Search/ContactSearchFields.tpl        | 18 ++++++++++++++----
 templates/CRM/Event/Form/Search/Common.tpl     | 10 ++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/templates/CRM/Contact/Form/Search/ContactSearchFields.tpl b/templates/CRM/Contact/Form/Search/ContactSearchFields.tpl
index 53aef6858c..dded60f42c 100644
--- a/templates/CRM/Contact/Form/Search/ContactSearchFields.tpl
+++ b/templates/CRM/Contact/Form/Search/ContactSearchFields.tpl
@@ -1,12 +1,16 @@
 <tr>
   <td class="font-size12pt">
-    {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}
+    {$form.sort_name.label}
+    <br>
+    {$form.sort_name.html|crmAddClass:'twenty'}
   </td>
   <td>{$form.buttons.html}</td>
 </tr>
 <tr>
   {if $form.contact_tags}
-    <td><label>{$form.contact_tags.label}</label>
+    <td>
+      <label>{$form.contact_tags.label}</label>
+      <br>
       {$form.contact_tags.html}
     </td>
   {else}
@@ -14,7 +18,9 @@
   {/if}
 
   {if $form.group}
-    <td><label>{$form.group.label}</label>
+    <td>
+      <label>{$form.group.label}</label>
+      <br>
       {$form.group.html}
     </td>
   {else}
@@ -22,7 +28,11 @@
   {/if}
 </tr>
 <tr class="crm-event-search-form-block-deleted_contacts">
-  <td>{$form.contact_type.label}&nbsp;&nbsp;{$form.contact_type.html}<br></td>
+  <td>
+    {$form.contact_type.label}
+    <br>
+    {$form.contact_type.html}
+  </td>
   <td>
     {if $form.deleted_contacts}
       {$form.deleted_contacts.html}&nbsp;&nbsp;{$form.deleted_contacts.label}
diff --git a/templates/CRM/Event/Form/Search/Common.tpl b/templates/CRM/Event/Form/Search/Common.tpl
index 53439c3c8e..e6ef194d5f 100644
--- a/templates/CRM/Event/Form/Search/Common.tpl
+++ b/templates/CRM/Event/Form/Search/Common.tpl
@@ -33,16 +33,10 @@
   <td class="crm-event-form-block-event_type_id"> {$form.event_type_id.label}<br />{$form.event_type_id.html} </td>
 </tr>
 <tr>
-  <td colspan="2"><label>{ts}Event Dates{/ts}</label></td>
+  {include file="CRM/Core/DateRange.tpl" fieldName="event" from='_start_date_low' to='_end_date_high' label="<label>Event Dates</label>"}
 </tr>
 <tr>
-{include file="CRM/Core/DateRange.tpl" fieldName="event" from='_start_date_low' to='_end_date_high'}
-</tr>
-<tr>
-  <td><label>{ts}Registration Date{/ts}</label></td>
-</tr>
-<tr>
-{include file="CRM/Core/DateRange.tpl" fieldName="participant" from='_register_date_low' to='_register_date_high'}
+  {include file="CRM/Core/DateRange.tpl" fieldName="participant" from='_register_date_low' to='_register_date_high' label="<label>Registration Date</label>"}
 </tr>
 <tr>
   <td class="crm-event-form-block-participant_status"><label>{$form.participant_status_id.label}</label>
-- 
2.25.1