Merge pull request #1749 from mlutfy/4.4-crm13548

CRM-13548: Activity Search Form: make the activity_role more obvious by placing it under the contact name field, to which it relates.

templates/CRM/Activity/Form/Search/Common.tpl

@@ -23,6 +23,26 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
+<tr>
+  <td>
+  {$form.activity_role.html}
+    <span class="crm-clear-link">
+      (<a href="#" title="unselect"
+          onclick="unselectRadio('activity_role', '{$form.formName}');
+            return false;">
+        {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>
 {if $form.activity_type_id}
   <td><label>{ts}Activity Type(s){/ts}</label>
@@ -49,16 +69,16 @@
   </td>
 {/if}
 
-{if $form.activity_tags }
+{if $form.activity_tags}
   <td><label>{ts}Activity Tag(s){/ts}</label>
-    <div id ="Tags" class="listing-box">
+    <div id="Tags" class="listing-box">
       {foreach from=$form.activity_tags item="tag_val"}
         <div class="{cycle values='odd-row,even-row'}">
           {$tag_val.html}
         </div>
       {/foreach}
   </td>
-  {else}
+{else}
   <td>&nbsp;</td>
 {/if}
 </tr>
@@ -69,24 +89,18 @@
 </tr>
 <tr>
   <td>
-  {$form.activity_role.html}
-    <span class="crm-clear-link">
-      (<a href="#" title="unselect"
-          onclick="unselectRadio('activity_role', '{$form.formName}');
-            return false;">
-        {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>
+  {$form.activity_subject.label}<br />
+  {$form.activity_subject.html|crmAddClass:big}
   </td>
   <td colspan="2">
+  {$form.activity_status.label}<br />
+  {$form.activity_status.html}
+  </td>
+</tr>
+<tr>
+  {* td intentionally left blank to align the 'is test' widget on the right *}
+  <td></td>
+  <td colspan="2">
   {$form.activity_test.label} {help id="is-test" file="CRM/Contact/Form/Search/Advanced"}
     &nbsp; {$form.activity_test.html}
     <span class="crm-clear-link">
@@ -94,16 +108,6 @@
     </span>
   </td>
 </tr>
-<tr>
-  <td>
-  {$form.activity_subject.label}<br />
-  {$form.activity_subject.html|crmAddClass:big}
-  </td>
-  <td colspan="2">
-  {$form.activity_status.label}<br />
-  {$form.activity_status.html}
-  </td>
-</tr>
 
 <tr><td colspan="3">{include file="CRM/common/Tag.tpl" tagsetType='activity'}</td></tr>