more UI changes to search screen

diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl
index 3d636b4820b7d32d2a8e644bcc19cf9d39fef72a..2a92179aa09829508d09893e878dd3a154652cc2 100644 (file)
--- a/templates/CRM/Activity/Form/Search.tpl
+++ b/templates/CRM/Activity/Form/Search.tpl
@@ -25,31 +25,40 @@
 *}
 {* Search form and results for Activities *}
 <div class="crm-form-block crm-search-form-block">
-<div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if $rows}collapsed{/if}">
- <div class="crm-accordion-header crm-master-accordion-header">
-        {ts}Edit Search Criteria{/ts}
-</div><!-- /.crm-accordion-header -->
-<div class="crm-accordion-body">
-  <div id="searchForm" class="form-item">
-    {strip}
-        <table class="form-layout">
-        <tr>
-           <td class="font-size12pt" colspan="3">
-               {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}&nbsp;&nbsp;&nbsp;{$form.buttons.html}
-           </td>
-        </tr>
+  <div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if $rows}collapsed{/if}">
+    <div class="crm-accordion-header crm-master-accordion-header">
+      {ts}Edit Search Criteria{/ts}
+    </div>
+    <!-- /.crm-accordion-header -->
+    <div class="crm-accordion-body">
+      <div id="searchForm" class="form-item">
+        {strip}
+          <table class="form-layout">
+            <tr>
+              <td class="font-size12pt" colspan="3">
+                {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}
+                &nbsp;&nbsp;&nbsp;{$form.buttons.html}
+                <div>
+                  <div class="description font-italic">{ts}Complete OR partial name{/ts}
+                    <span class="contact-name-option option-1">{ts} of the Source Contact{/ts}</span>
+                    <span class="contact-name-option option-2">{ts} of the Assignee Contact{/ts}</span>
+                    <span class="contact-name-option option-3">{ts} of the Target Contact{/ts}</span>
+                  </div>
+                </div>
+              </td>
+            </tr>
 
-        {include file="CRM/Activity/Form/Search/Common.tpl"}
+            {include file="CRM/Activity/Form/Search/Common.tpl"}
 
-        <tr>
-           <td colspan="3">{$form.buttons.html}</td>
-        </tr>
-        </table>
-    {/strip}
+            <tr>
+              <td colspan="3">{$form.buttons.html}</td>
+            </tr>
+          </table>
+        {/strip}
+      </div>
+    </div>
   </div>
 </div>
-</div>
-</div>
 
 {if $rowsEmpty || $rows }
 <div class="crm-content-block">

diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl
index 28730b37a3cf8759ad42d15ee5dbcb26da890eb0..66ae230c74d10cd42ba55b2b77b9a4cd05151067 100644 (file)
--- a/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/templates/CRM/Activity/Form/Search/Common.tpl
@@ -25,7 +25,7 @@
 *}
 <tr>
   <td>
-  {$form.activity_role.html}
+    {$form.activity_role.html}
     <span class="crm-clear-link">
       (<a href="#" title="unselect"
           onclick="unselectRadio('activity_role', '{$form.formName}');
@@ -33,14 +33,6 @@
         {ts}clear{/ts}
       </a>)
     </span>
-
-    <div>
-      <div class="description font-italic">{ts}Complete OR partial name{/ts}
-        <span class="contact-name-option option-1">{ts} of the Source Contact{/ts}</span>
-        <span class="contact-name-option option-2">{ts} of the Assignee Contact{/ts}</span>
-        <span class="contact-name-option option-3">{ts} of the Target Contact{/ts}</span>
-      </div>
-    </div>
   </td>
 </tr>
 <tr>