From: Sudha Bisht Date: Fri, 24 Jul 2015 14:08:41 +0000 (+0530) Subject: Fix the HTML markup / layout X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4b9de8a136ba958268a8a72242a100bbec901145;p=civicrm-core.git Fix the HTML markup / layout --- diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php index 604db88699..593e98e785 100644 --- 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 41b2bd7f85..dd04d18609 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl @@ -24,31 +24,43 @@ +--------------------------------------------------------------------+ *}
- - - - {include file="CRM/Core/DateRange.tpl" fieldName="birth_date" from='_low' to='_high'} - - - - {include file="CRM/Core/AgeRange.tpl" fieldName="age" from='_low' to='_high' date='_asof_date'} - - - - - - - {include file="CRM/Core/DateRange.tpl" fieldName="deceased_date" from='_low' to='_high'} - - - - -
- {$form.is_deceased.label}
- {$form.is_deceased.html} -
- {$form.gender_id.label}
- {$form.gender_id.html} -
+ + + + + + {include file="CRM/Core/DateRange.tpl" fieldName="birth_date" from='_low' to='_high'} + + + + + + {include file="CRM/Core/AgeRange.tpl" fieldName="age" from='_low' to='_high' date='_asof_date'} + + + + + + + + + {include file="CRM/Core/DateRange.tpl" fieldName="deceased_date" from='_low' to='_high'} + + + + +
+ +
+ +
+ {$form.is_deceased.label}
+ {$form.is_deceased.html} +
+ +
+ {$form.gender_id.label}
+ {$form.gender_id.html} +