Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r4201 -r4287
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 4201)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 4287)
@@ -23,7 +23,7 @@
 <inp2:m_blockend/>
 
 
-<inp2:m_block name="grid_pagination"/>
+<inp2:m_block name="grid_pagination" SearchPrefixSpecial=""/>
 <table cellspacing="0" cellpadding="2" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>tableborder_full_kernel<inp2:m_else/>pagination_bar<inp2:m_endif/>">
 	<tbody>
 		<tr id="MY_ID">
@@ -32,7 +32,20 @@
 		  		<b class=text><inp2:m_phrase name="la_Page"/></b>
 		      <inp2:$PrefixSpecial_PrintPages active_block="current_page" split="10" inactive_block="page" prev_page_block="prev_page" next_page_block="next_page" prev_page_split_block="prev_page_split" next_page_split_block="next_page_split" main_special="$main_special"/>
 			</td>
-			<inp2:m_if prefix="m" function="ParamEquals" param="search" value="on"/>
+			<inp2:m_if check="m_ParamEquals" param="search" value="on">
+				<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
+					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$PrefixSpecial"/>
+				<inp2:m_else />
+					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$SearchPrefixSpecial"/>
+				</inp2:m_if>
+			</inp2:m_if>
+			<td>
+		</tr>
+	</tbody>
+</table>
+<inp2:m_blockend/>
+
+<inp2:m_DefineElement name="grid_search">
 				<td align="right" style="padding-right: 0px;">
 					<table width="100%" cellspacing="0" cellpadding="0" border="0">
 						<tr>
@@ -57,12 +70,7 @@
 						</tr>
 					</table>
 				</td>
-			<inp2:m_endif/>
-			<td>
-		</tr>
-	</tbody>
-</table>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 <inp2:m_block name="grid_column_title"/>
 	<td nowrap="nowrap">
@@ -216,13 +224,17 @@
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Unselect"/>','Grids["<inp2:m_param name="PrefixSpecial"/>"].ClearSelection();');
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Invert"/>','Grids["<inp2:m_param name="PrefixSpecial"/>"].InvertSelection();');
 
+		processHooks('ViewMenu', hBEFORE, '<inp2:m_param name="PrefixSpecial"/>');
+		
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = new Menu('<inp2:$PrefixSpecial_GetItemName/>');
 		<inp2:m_if prefix="m" function="ParamEquals" name="has_filters" value="has_filters"/>
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'] );
 		<inp2:m_endif/>
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'] );
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] );
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'] );
+		
+		processHooks('ViewMenu', hAFTER, '<inp2:m_param name="PrefixSpecial"/>');
 	}
 <inp2:m_blockend/>
 
@@ -235,7 +247,7 @@
   		</tr>
 	</table>
 	<script type="text/javascript">
-		$edit_mode = <inp2:m_if check="PropertyEquals" name="mode" value="t">true<inp2:m_else />false</inp2:m_if>;
+		$edit_mode = <inp2:m_if check="m_ParamEquals" name="edit_mode" value="1">true<inp2:m_else />false</inp2:m_if>;
 //		window.parent.document.title += ' - MODE: ' + ($edit_mode ? 'EDIT' : 'LIVE');
 	</script>
 <inp2:m_blockend/>
@@ -301,7 +313,7 @@
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" name="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" value="asc">
 <inp2:m_blockend />
 
-<inp2:m_block name="white_grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" search="" render_as="" columns="2" direction="V"/>
+<inp2:m_block name="white_grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" search="" render_as="" columns="2" direction="V" empty_cell_render_as="wg_empty_cell"/>
 	<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/>">
@@ -316,9 +328,14 @@
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" search="$search" no_toolbar="$no_toolbar"/>
 	</inp2>
 	<br />
+	
+	<inp2:m_DefineElement name="wg_empty_cell">
+		<td width="<inp2:m_param name="column_width"/>%">&nbsp;</td>
+	</inp2:m_DefineElement>
+	
 	<table width="100%" border="0" cellspacing="0" cellpadding="4">
 		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
-		<inp2:$PrefixSpecial_PrintList2 block="$render_as" direction="$direction" columns="$columns" per_page="$per_page" main_special="$main_special"/>
+		<inp2:$PrefixSpecial_PrintList2 block="$render_as" empty_cell_render_as="$empty_cell_render_as" direction="$direction" columns="$columns" per_page="$per_page" main_special="$main_special"/>
 	</table>
 
 	<inp2:m_if prefix="m" function="GetEquals" name="fw_menu_included" value=""/>