CRM-21810 changelog panel UI tweaks

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 283319d9c0a4a0be677558d25fa8ec9fee70e82c..f1ebf8283200103462aafbbabef7559463d5fbc8 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -396,9 +396,9 @@ class CRM_Contact_Form_Search_Criteria {
     $form->addElement('text', 'changed_by', ts('Modified By'), NULL);
 
     $dates = array(1 => ts('Added'), 2 => ts('Modified'));
-    $form->addRadio('log_date', NULL, $dates, array('allowClear' => TRUE), '<br />');
+    $form->addRadio('log_date', NULL, $dates, array('allowClear' => TRUE));
 
-    CRM_Core_Form_Date::buildDateRange($form, 'log_date', 1, '_low', '_high', ts('From'), FALSE, FALSE);
+    CRM_Core_Form_Date::buildDateRange($form, 'log_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);
   }
 
   /**

diff --git a/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl b/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
index 3a5f4cf44a0e9447feb137ee70c233b5cb0f7fdb..42d294d6ada09a0aeb51122ccb985b200d69d7e9 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
@@ -26,24 +26,24 @@
 <div id="changelog" class="form-item">
   <table class="form-layout">
     <tr>
-      <td>
-        <span class="modifiedBy"><label>{ts}Modified By{/ts}</label></span>
-        <span class="hiddenElement addedBy"><label>{ts}Added By{/ts}</label></span>
-        <br/>
-        {$form.changed_by.html}
-      </td>
-      <td width="100%">
+      <td colspan="2">
         {$form.log_date.html}
-        <br/>
       </td>
     </tr>
     <tr>
+      <td width="30%">
+        <span class="modifiedBy"><label>{ts}Modified By{/ts}</label></span>
+        <span class="hiddenElement addedBy"><label>{ts}Added By{/ts}</label></span>
+      </td>
       <td>
         <span class="modifiedBy"><label>{ts}Modified Between{/ts}</label></span>
         <span class="hiddenElement addedBy"><label>{ts}Added Between{/ts}</label></span>
       </td>
     </tr>
     <tr>
+      <td>
+        {$form.changed_by.html}
+      </td>
       {include file="CRM/Core/DateRange.tpl" fieldName="log_date" from='_low' to='_high'}
     </tr>
   </table>