Index: trunk/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r6656 -r7391
--- trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6656)
+++ trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7391)
@@ -23,14 +23,17 @@
 <inp2:m_blockend/>
 
 
-<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/>">
+<inp2:m_DefineElement name="search_main_toolbar">
+</inp2:m_DefineElement>
+
+<inp2:m_block name="grid_pagination" SearchPrefixSpecial="" ajax="0"/>
+<table cellspacing="0" cellpadding="0" 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">
-		  	<td width="100%">
-		  		<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
-		  		<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" ajax="$ajax"/>
+	  	<td>
+	  		<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
+	  		<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" ajax="$ajax" grid="$grid"/>
 			</td>
 			<inp2:m_if check="m_ParamEquals" param="search" value="on">
 				<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
@@ -46,49 +49,44 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
-				<td align="right" style="padding-right: 0px;">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td align="right" class="search-cell">
+					<table cellspacing="0" cellpadding="0">
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
 							<td>
-								<input 	type="text"
-										id="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-										name="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-										value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>"
-										PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
-										Grid="<inp2:m_param name="grid"/>"
-										ajax="<inp2:m_param name="ajax"/>"
-										style="border: 1px solid grey;">
+								<input type="text" id="<inp2:m_param name="PrefixSpecial"/>_search_keyword" name="<inp2:m_param name="PrefixSpecial"/>_search_keyword" value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);" style="border: 1px solid grey;" />
 								<input type="text" style="display: none"; />
 							</td>
-							<td id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
-								<script type="text/javascript">
-									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
-								</script>
+							<td style="white-space: nowrap" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
+								<div style="white-space: nowrap;"></div>
+									<script type="text/javascript">
+										<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
+									</script>
+
 							</td>
 						</tr>
 					</table>
 				</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search_buttons" PrefixSpecial="" grid="" ajax="1">
-	document.getElementById('<inp2:m_param name="PrefixSpecial"/>_search_keyword').onkeydown = search_keydown;
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
-		new ToolBarButton(
-					 'search',
-					 '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
-					 function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-					 null,
-					 '<inp2:m_param name="PrefixSpecial"/>') );
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
-		new ToolBarButton(
-					 'search_reset',
-					 '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
-					 function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-					 null,
-					 '<inp2:m_param name="PrefixSpecial"/>') );
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].UseLabels = false;
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
+			new ToolBarButton(
+						 'search',
+						 '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
+						 function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
+						 null,
+						 '<inp2:m_param name="PrefixSpecial"/>') );
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
+			new ToolBarButton(
+						 'search_reset',
+						 '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
+						 function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
+						 null,
+						 '<inp2:m_param name="PrefixSpecial"/>') );
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
 </inp2:m_DefineElement>
 
 <inp2:m_block name="grid_column_title" use_phrases="1"/>
@@ -103,12 +101,12 @@
 	</td>
 <inp2:m_blockend/>
 
-<inp2:m_block name="grid_checkbox_td" format="" />
+<inp2:m_block name="grid_checkbox_td" format="" module="" />
 	<td valign="top" class="text">
 		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
 			<tr>
 				<td><input type="checkbox" name="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath />img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
 				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
@@ -126,43 +124,43 @@
 	</td>
 <inp2:m_blockend />
 
-<inp2:m_block name="label_grid_checkbox_td" format="" />
+<inp2:m_block name="label_grid_checkbox_td" format="" module="" />
 	<td valign="top" class="text">
 		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
 			<tr>
 				<td><input type="checkbox" name="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath />img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
 				<td><inp2:$PrefixSpecial_field field="$field" no_special="no_special" as_label="as_label" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
 <inp2:m_blockend />
 
-<inp2:m_block name="grid_icon_td" format="" />
+<inp2:m_block name="grid_icon_td" format="" module="" />
 	<td valign="top" class="text">
 		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
 			<tr>
-				<td><img src="<inp2:ModulePath />img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
 				<td><inp2:$PrefixSpecial_field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
 <inp2:m_blockend />
 
-<inp2:m_block name="grid_radio_td" format="" />
+<inp2:m_block name="grid_radio_td" format="" module=""/>
 	<td valign="top" class="text">
 		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
 			<tr>
 				<td><input type="radio" name="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath />img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
 				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
 <inp2:m_blockend />
 
-<inp2:m_block name="grid_data_td" format="" no_special="" nl2br="" first_chars=""/>
-	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/></td>
+<inp2:m_block name="grid_data_td" format="" no_special="" nl2br="" first_chars="" td_style=""/>
+	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>"><inp2:$PrefixSpecial_field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/></td>
 <inp2:m_blockend />
 
 <inp2:m_block name="grid_edit_td" format="" />
@@ -190,14 +188,53 @@
 	<td>&nbsp;</td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_options_filter">
+<inp2:m_DefineElement name="grid_options_filter" use_phrases="0">
 	<td>
-		<select name="<inp2:SearchInputName field="$field"/>">
-			<inp2:PredefinedSearchOptions field="$field" block="inp_option_item" selected="selected" has_empty="1" empty_value=""/>
+		<select <inp2:m_if check="SearchField" field="$filter_field" filter_type="options" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="options" grid="$grid"/>">
+			<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
+				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_phrase" selected="selected" has_empty="1" empty_value="" filter_type="options" grid="$grid"/>
+			<inp2:m_else/>
+				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_item" selected="selected" has_empty="1" empty_value="" filter_type="options" grid="$grid"/>
+			<inp2:m_endif/>
 		</select>
 	</td>
 </inp2:m_DefineElement>
 
+<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_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"/>);"/>
+	</td>
+</inp2:m_DefineElement>
+<inp2:m_DefineElement name="grid_range_filter">
+	<td>
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="range" type="from" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="range" type="from" grid="$grid"/>" size="5" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="range" type="to" grid="$grid"> 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" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
+	</td>
+</inp2:m_DefineElement>
+<inp2:m_DefineElement name="grid_float_range_filter">
+	<td>
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="from" grid="$grid"> 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" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="to" grid="$grid"> 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" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_date_range_filter">
+	<td>
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="from" grid="$grid"> 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" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
+		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="to" grid="$grid"> 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" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><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/>
@@ -271,6 +308,8 @@
 	}
 <inp2:m_blockend/>
 
+<inp2:m_include template="incs/menu_blocks"/>
+
 <inp2:m_block name="grid_save_warning" />
 	<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/>">
   		<tr>
@@ -285,11 +324,16 @@
 	</script>
 <inp2:m_blockend/>
 
-<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" row_block="_row" ajax="0">
+
+
+<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" totals_block="grid_total_td" row_block="_row" ajax="0" totals="0">
 <!--
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
 -->
+
+	<inp2:InitList pass_params="1"/> <!-- this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance -->
+
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if check="m_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/>">
@@ -304,7 +348,7 @@
 	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
 	</inp2:m_if>
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<table width="100%" cellspacing="0" cellpadding="4" class="tableborder">
 
 		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
 			<tr class="pagination_bar">
@@ -316,19 +360,45 @@
 			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
 		</tr>
 
-		<inp2:m_DefineElement name="_row">
+		<inp2:m_DefineElement name="_row" td_style="">
 			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
 				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
 			</tr>
 		</inp2:m_DefineElement>
 		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
 		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
 
+		<inp2:m_DefineElement name="grid_total_td">
+			<inp2:m_if check="m_Param" name="total">
+				<td style="<inp2:m_param name="td_style"/>">
+					<inp2:FieldTotal name="$field" function="$total"/>
+				</td>
+			<inp2:m_else/>
+				<td style="<inp2:m_param name="td_style"/>">&nbsp;</td>
+			</inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_if check="m_ParamEquals" name="totals" value="1">
+			<tr class="totals-row"/>
+				<inp2:IterateGridFields grid="$grid" mode="data" block="$totals_block"/>
+			</tr>
+		</inp2:m_if>
 	</table>
 
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
 		<inp2:m_if check="m_GetEquals" name="fw_menu_included" value="">
 			<script type="text/javascript" src="incs/fw_menu.js"></script>
+
+			<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+			<script type="text/javascript" src="js/nlsmenu.js"></script>
+			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
+			<script type="text/javascript">
+				var menuMgr = new NlsMenuManager("mgr");
+				menuMgr.timeout = 500;
+				menuMgr.flowOverFormElement = true;
+			</script>
+
 			<inp2:m_set fw_menu_included="1"/>
 		</inp2:m_if>
 
@@ -341,13 +411,18 @@
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" name="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" value="asc">
 </inp2:m_DefineElement>
 
+
+
+
 <inp2:m_DefineElement name="grid_js" ajax="1">
 		<inp2:m_if check="m_ParamEquals" name="no_init" value="no_init" inverse="inverse">
 			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="PrefixSpecial"/>', '<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" pass_params="true"/>
+
+  		<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
+
   		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
 
@@ -379,6 +454,17 @@
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
 		<inp2:m_if check="m_GetEquals" name="fw_menu_included" value="">
 			<script type="text/javascript" src="incs/fw_menu.js"></script>
+
+			<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+			<script type="text/javascript" src="js/nlsmenu.js"></script>
+			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
+			<script type="text/javascript">
+				var menuMgr = new NlsMenuManager("mgr");
+				menuMgr.timeout = 500;
+				menuMgr.flowOverFormElement = true;
+			</script>
+
 			<inp2:m_set fw_menu_included="1"/>
 		</inp2:m_if>