Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r10537 -r10635
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10537)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10635)
@@ -171,6 +171,18 @@
 	<td valign="top" class="text"><input type="text" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid" format="$format"/>"></td>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_picker_option" separator="&nbsp;">
+	<inp2:m_if check="m_Param" name="selected">
+		<inp2:m_param name="option"/><inp2:m_Param name="separator"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_picker_td" nl2br="0" no_special="1" separator="&nbsp;">
+	<td valign="top" class="text">
+		<inp2:Field name="$field" format="$separator" nl2br="$nl2br" no_special="$no_special"/>
+	</td>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_options_td" format="">
 	<td valign="top" class="text">
 		<select name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>">
@@ -237,9 +249,25 @@
 <inp2:m_DefineElement name="grid_like_filter">
 	<td>
 		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="like" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="like" grid="$grid"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/>
+	</td>
+</inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_picker_filter" use_phrases="0" filter_width="90%">
+	<td>
+		<select
+			class="filter <inp2:m_if check="SearchField" field="$filter_field" filter_type="options" grid="$grid">filter-active</inp2:m_if>"
+			name="<inp2:SearchInputName field="$filter_field" filter_type="picker" grid="$grid"/>"
+			style="width: <inp2:m_Param name="filter_width"/>">
+
+			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
+				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_phrase" selected="selected" has_empty="1" empty_value="" filter_type="picker" grid="$grid"/>
+			<inp2:m_else/>
+				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_item" selected="selected" has_empty="1" empty_value="" filter_type="picker" grid="$grid"/>
+			</inp2:m_if>
+		</select>
 	</td>
 </inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_equals_filter">
 	<td>
 		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="equals" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="equals" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="equals" grid="$grid"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/>