Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r6848 -r6857
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6848)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6857)
@@ -214,6 +214,26 @@
 		<input type="text" <inp2:m_if check="SearchField" field="$filter_field" filter_type="range" type="to" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="range" type="to" grid="$grid"/>" size="5" /><br />
 	</td>
 </inp2:m_DefineElement>
+<inp2:m_DefineElement name="grid_float_range_filter">
+	<td>
+		<input type="text" <inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="from" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>" size="5" /><br />
+		<input type="text" <inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="to" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>" size="5" /><br />
+	</td>
+</inp2:m_DefineElement>
+<inp2:m_DefineElement name="grid_date_range_filter">
+	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
+		<script type="text/javascript" src="js/calendar.js"></script>
+		<inp2:m_set calendar_included="1"/>
+	</inp2:m_if>
+	<td>
+		<input type="text" <inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="from" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif"/><br />
+		<input type="text" <inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="to" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif"/><br />
+	</td>
+	<script type="text/javascript">
+		initCalendar("<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>", "<inp2:Format field="{$sort_field}_date" input_format="1"/>");
+		initCalendar("<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>", "<inp2:Format field="{$sort_field}_date" input_format="1"/>");
+	</script>
+</inp2:m_DefineElement>
 <inp2:m_block name="viewmenu_sort_block"/>
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="$title" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:$PrefixSpecial_OrderInfo type="direction" pos="1"/>", null, <inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="IsOrder" field="$sort_field" pos="1"/>2<inp2:m_endif/>');
 <inp2:m_blockend/>