Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r5002 -r5005
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5002)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5005)
@@ -252,7 +252,7 @@
 	</script>
 <inp2:m_blockend/>
 
-<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" row_block="_row" SourcePrefix="" value_field="Value"/>
+<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" row_block="_row" SourcePrefix="" value_field="Value" ajax="0"/>
 <!--
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
@@ -294,24 +294,31 @@
 		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" SourcePrefix="$SourcePrefix" value_field="$value_field"/>
 
 	</table>
+	
+	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
+		<inp2:m_if prefix="m" function="GetEquals" name="fw_menu_included" value=""/>
+			<script type="text/javascript" src="incs/fw_menu.js"></script>
+			<inp2:m_set fw_menu_included="1"/>
+		<inp2:m_endif/>
+	
+		<script type="text/javascript">
+			<inp2:m_RenderElement name="grid_js" selected_class="selected_div" tag_name="tr" pass_params="true"/>
+		</script>
+	</inp2:m_if>
+	
+	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1" name="<inp2:m_param name="PrefixSpecial"/>_Sort1" value="">
+	<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_if prefix="m" function="GetEquals" name="fw_menu_included" value=""/>
-		<script type="text/javascript" src="incs/fw_menu.js"></script>
-		<inp2:m_set fw_menu_included="1"/>
-	<inp2:m_endif/>
-
-	<script type="text/javascript">
+<inp2:m_DefineElement name="grid_js">
 		<inp2:m_if check="m_ParamEquals" name="no_init" value="no_init" inverse="inverse">
-			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('selected_div', ':original', edit, a_toolbar);
-			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('tr', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
+			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="selected_class"/>', ':original', edit, a_toolbar);
+			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
   		</inp2:m_if>
   		<inp2:m_ParseBlock name="viewmenu_declaration" PrefixSpecial="$PrefixSpecial" grid="$grid" has_filters="$has_filters"/>
   		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
-	</script>
-	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1" name="<inp2:m_param name="PrefixSpecial"/>_Sort1" value="">
-	<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_DefineElement>
 
 <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" ajax="0"/>
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
@@ -345,20 +352,10 @@
 		<inp2:m_endif/>
 	
 		<script type="text/javascript">
-			<inp2:m_RenderElement name="{$name}_js" pass_params="true"/>
+			<inp2:m_RenderElement name="grid_js" selected_class="table_white_selected" tag_name="td" pass_params="true"/>
 		</script>
 	</inp2:m_if>
 	
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1" name="<inp2:m_param name="PrefixSpecial"/>_Sort1" value="">
 	<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_DefineElement name="white_grid_js">
-	<inp2:m_if check="m_ParamEquals" name="no_init" value="no_init" inverse="inverse">
-		Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('table_white_selected', ':original', edit, a_toolbar);
-		Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('td', /^<inp2:m_param name="PrefixSpecial"/>_([0-9-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
-  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
-	</inp2:m_if>
-	<inp2:m_ParseBlock name="viewmenu_declaration" PrefixSpecial="$PrefixSpecial" grid="$grid" has_filters="$has_filters"/>
-	$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
-</inp2:m_DefineElement>
\ No newline at end of file
+<inp2:m_blockend />
\ No newline at end of file