Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r3559 -r3597
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 3559)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 3597)
@@ -157,6 +157,18 @@
 	</td>
 <inp2:m_blockend />
 
+<inp2:m_DefineElement name="grid_column_filter">
+	<td>&nbsp;</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_options_filter">
+	<td>
+		<select name="<inp2:SearchInputName field="$field"/>">
+			<inp2:PredefinedSearchOptions field="$field" block="inp_option_item" selected="selected" has_empty="1" empty_value=""/>
+		</select>
+	</td>
+</inp2:m_DefineElement>
+
 <inp2:m_block name="viewmenu_sort_block"/>
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="$title"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:$PrefixSpecial_OrderInfo type="direction" pos="1"/>");','<inp2:m_if prefix="$PrefixSpecial" function="IsOrder" field="$sort_field" pos="1"/>2<inp2:m_endif/>');
 <inp2:m_blockend/>
@@ -224,7 +236,11 @@
 	</table>
 <inp2:m_blockend/>
 
-<inp2:m_block name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" search=""/>
+<inp2:m_block name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td"/>
+<!-- 
+	grid_filters - show individual filters for each column
+	has_filters - draw filter section in "View" menu in toolbar
+-->
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if prefix="m" function="RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse"/>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>nobottom<inp2:m_else/>notop<inp2:m_endif/>">
@@ -235,10 +251,17 @@
   		</tr>
 	</table>
 	<inp2:m_endif/>
+	
 	<inp2:m_ParamEquals name="NoPagination" value="">
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar"/>
 	</inp2>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		
+		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
+			<tr class="pagination_bar">
+				<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="filter" block="$filter_block"/>
+			</tr>
+		</inp2:m_if>
 
 		<tr class="subsectiontitle">
 			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="$header_block"/>