Fix the HTML markup / layout

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 604db8869922ce16c72a765c64d775d59b487669..593e98e785ae59f8befaf5373450835094a67efd 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -489,9 +489,9 @@ class CRM_Contact_Form_Search_Criteria {
     }
     $form->addGroup($genderOptions, 'gender_id', ts('Gender'))->setAttribute('allowClear', TRUE);
 
-    $form->add('text', 'age_low', ts('Min Age'));
+    $form->add('text', 'age_low', ts('Min Age'), array('size' => 6));
     $form->addRule('age_low', ts('Please enter a positive integer'), 'positiveInteger');
-    $form->add('text', 'age_high', ts('Max Age'));
+    $form->add('text', 'age_high', ts('Max Age'), array('size' => 6));
     $form->addRule('age_high', ts('Please enter a positive integer'), 'positiveInteger');
     $form->addDate('age_asof_date', ts('Age as of Date'), FALSE, array('formatType' => 'searchDate'));
 

diff --git a/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl b/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
index 41b2bd7f85d4774bd1de88bb7e6c787dd62c4615..dd04d1860966d178fc2e7002a179f8b675642b4d 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
@@ -24,31 +24,43 @@
  +--------------------------------------------------------------------+
 *}
 <div id="demographics" class="form-item">
-    <table class="form-layout">
-       <tr>
-           <tr><td><label>{ts}Birth Dates{/ts}</label></td></tr>
-    {include file="CRM/Core/DateRange.tpl" fieldName="birth_date" from='_low' to='_high'}
-       </tr>
-       <tr>
-           <tr><td><label>{ts}Age{/ts}</label></td></tr>
-    {include file="CRM/Core/AgeRange.tpl" fieldName="age" from='_low' to='_high' date='_asof_date'}
-       </tr>
-       <tr>
-         <td>
-           {$form.is_deceased.label}<br />
-           {$form.is_deceased.html}
-         </td>
-      </tr>
-      <tr>
-          <tr><td><label>{ts}Deceased Dates{/ts}</label></td></tr>
-    {include file="CRM/Core/DateRange.tpl" fieldName="deceased_date" from='_low' to='_high'}
-      </tr>
-      <tr>
-         <td>
-            {$form.gender_id.label}<br />
-            {$form.gender_id.html}
-         </td>
-      </tr>
-    </table>
+  <table class="form-layout">
+    <tr>
+      <td>
+        <label>{ts}Birth Dates{/ts}</label>
+      </td>
+    </tr>
+    <tr>
+      {include file="CRM/Core/DateRange.tpl" fieldName="birth_date" from='_low' to='_high'}
+    </tr>
+    <tr>
+      <td>
+        <label>{ts}Age{/ts}</label>
+      </td>
+    </tr>
+    <tr>
+      {include file="CRM/Core/AgeRange.tpl" fieldName="age" from='_low' to='_high' date='_asof_date'}
+    </tr>
+    <tr>
+      <td>
+        {$form.is_deceased.label}<br />
+        {$form.is_deceased.html}
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <label>{ts}Deceased Dates{/ts}</label>
+      </td>
+    </tr>
+    <tr>
+      {include file="CRM/Core/DateRange.tpl" fieldName="deceased_date" from='_low' to='_high'}
+    </tr>
+    <tr>
+      <td>
+        {$form.gender_id.label}<br />
+        {$form.gender_id.html}
+      </td>
+    </tr>
+  </table>
 </div>