CRM-17116 fix advanced search to support custom dates

[civicrm-core.git] / templates / CRM / Custom / Form / Search.tpl

diff --git a/templates/CRM/Custom/Form/Search.tpl b/templates/CRM/Custom/Form/Search.tpl
index c29818f434abbdf5ea16fab792b6ad9c847f65ce..bda7ef3bbce74d0e52cea61cd51ed8c144b38210 100644 (file)
--- a/templates/CRM/Custom/Form/Search.tpl
+++ b/templates/CRM/Custom/Form/Search.tpl
@@ -45,10 +45,8 @@
                     {$form.$element_name_from.html|crmAddClass:six}
                       {$form.$element_name_to.label}  {$form.$element_name_to.html|crmAddClass:six}
                 {elseif $element.skip_calendar NEQ true }
-                    <td class="label">{$form.$element_name_from.label}</td><td>
-                    {include file="CRM/common/jcalendar.tpl" elementName=$element_name_from}
-                    &nbsp;&nbsp;{$form.$element_name_to.label}&nbsp;&nbsp;
-                    {include file="CRM/common/jcalendar.tpl" elementName=$element_name_to}
+                    <td class="label"><label for='{$element_name}'>{$element.label}</label>
+                    {include file="CRM/Core/DateRange.tpl" fieldName=$element_name from='_from' to='_to'}</td><td>
                 {/if}
             {else}
                 <td class="label">{$form.$element_name.label}</td><td>