Index: trunk/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r8397 -r8863
--- trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8397)
+++ trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8863)
@@ -1,39 +1,39 @@
-<inp2:m_block name="current_page"/>
+<inp2:m_DefineElement name="current_page">
  <span class="current_page"><inp2:m_param name="page"/></span>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="page"/>
+<inp2:m_DefineElement name="page">
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url"><inp2:m_param name="page"/></a>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="next_page"/>
+<inp2:m_DefineElement name="next_page">
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url">&gt;</a>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="prev_page"/>
+<inp2:m_DefineElement name="prev_page">
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url">&lt;</a>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="next_page_split"/>
+<inp2:m_DefineElement name="next_page_split">
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url">&gt;&gt;</a>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="prev_page_split"/>
+<inp2:m_DefineElement name="prev_page_split">
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url">&lt;&lt;</a>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 
 <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"/>bordered<inp2:m_else/>pagination_bar<inp2:m_endif/>">
+<inp2:m_DefineElement name="grid_pagination" SearchPrefixSpecial="" ajax="0">
+<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >bordered<inp2:m_else/>pagination_bar</inp2:m_if>">
 	<tbody>
 		<tr id="MY_ID">
 	  	<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"/>
+	      <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,7 +46,7 @@
 		</tr>
 	</tbody>
 </table>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_pagination_elem" ajax="0">
 
@@ -93,100 +93,100 @@
 		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" ajax="0"/>
+<inp2:m_DefineElement name="grid_column_title" use_phrases="1" ajax="0">
 	<td nowrap="nowrap">
-		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
+		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"><IMG alt="" src="img/list_arrow_<inp2:{$PrefixSpecial}_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
 	</td>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="grid_column_title_no_sorting" use_phrases="1"/>
+<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
 	<td nowrap="nowrap">
 		<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
 	</td>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="grid_checkbox_td" format="" module="" />
+<inp2:m_DefineElement 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 module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<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 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_DefineElement>
 
-<inp2:m_block name="grid_checkbox_td_no_icon" format="" />
+<inp2:m_DefineElement name="grid_checkbox_td_no_icon" format="" >
 	<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><inp2:$PrefixSpecial_field field="$field" no_special="no_special" format="$format"/></td>
+				<td><input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>"></td>
+				<td><inp2:{$PrefixSpecial}_field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
-<inp2:m_blockend />
+</inp2:m_DefineElement>
 
-<inp2:m_block name="label_grid_checkbox_td" format="" module="" />
+<inp2:m_DefineElement 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 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>
+				<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 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_DefineElement>
 
-<inp2:m_block name="grid_icon_td" format="" module="" />
+<inp2:m_DefineElement 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 module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
-				<td><inp2:$PrefixSpecial_field field="$field" no_special="no_special" format="$format"/></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_DefineElement>
 
-<inp2:m_block name="grid_radio_td" format="" module=""/>
+<inp2:m_DefineElement 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 module="$module"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>"></td>
+				<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 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_DefineElement>
 
-<inp2:m_block name="grid_data_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency=""/>
-	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>"><inp2:$PrefixSpecial_field field="$field" first_chars="$first_chars" currency="$currency" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/></td>
-<inp2:m_blockend />
+<inp2:m_DefineElement name="grid_data_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>"><inp2:{$PrefixSpecial}_field field="$field" first_chars="$first_chars" currency="$currency" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/></td>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="grid_edit_td" format="" />
-	<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_blockend />
+<inp2:m_DefineElement name="grid_edit_td" format="" >
+	<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_block name="grid_data_label_td" />
-	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/></td>
-<inp2:m_blockend />
+<inp2:m_DefineElement name="grid_data_label_td" >
+	<td valign="top" class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/></td>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="grid_data_label_ml_td" format="" />
+<inp2:m_DefineElement name="grid_data_label_ml_td" format="" >
 	<td valign="top" class="text">
 		<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error</inp2:m_if>">
-			<inp2:$PrefixSpecial_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
-		</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"/><span class="error"> *</span></inp2:m_if>:<br />
+			<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
+		</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="error"> *</span></inp2:m_if>:<br />
 		<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
 			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
 		<inp2:m_else/>
 			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
 		</inp2:m_if>
 	</td>
-<inp2:m_blockend />
+</inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_column_filter">
 	<td>&nbsp;</td>
@@ -195,11 +195,11 @@
 <inp2:m_DefineElement name="grid_options_filter" use_phrases="0">
 	<td>
 		<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: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="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/>
+			</inp2:m_if>
 		</select>
 	</td>
 </inp2:m_DefineElement>
@@ -239,19 +239,19 @@
 	</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/>
+<inp2:m_DefineElement 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 check="{$PrefixSpecial}_IsOrder" field="$sort_field" pos="1" >2</inp2:m_if>');
+</inp2:m_DefineElement>
 
-<inp2:m_block name="viewmenu_filter_block"/>
+<inp2:m_DefineElement name="viewmenu_filter_block">
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('<inp2:m_param name="label" js_escape="1"/>','<inp2:m_param name="filter_action"/>','<inp2:m_param name="filter_status"/>');
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="viewmenu_filter_separator"/>
+<inp2:m_DefineElement name="viewmenu_filter_separator">
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuSeparator();
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="viewmenu_declaration" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0"/>
+<inp2:m_DefineElement name="viewmenu_declaration" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0">
 	// define ViewMenu
 	$fw_menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = function()
 	{
@@ -261,27 +261,27 @@
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('All','filters_remove_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('None','filters_apply_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuSeparator();
-			<inp2:$PrefixSpecial_DrawFilterMenu old_style="1" item_block="viewmenu_filter_block" spearator_block="viewmenu_filter_separator" ajax="$ajax"/>
+			<inp2:{$PrefixSpecial}_DrawFilterMenu old_style="1" item_block="viewmenu_filter_block" spearator_block="viewmenu_filter_separator" ajax="$ajax"/>
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">
 			// sorting menu
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'] = new Menu('<inp2:m_phrase name="la_Text_Sort" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_ascending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:$PrefixSpecial_OrderInfo type="field" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="IsOrder" direction="asc" pos="1"/>2<inp2:m_endif/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_descending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:$PrefixSpecial_OrderInfo type="field" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="IsOrder" direction="desc" pos="1"/>2<inp2:m_endif/>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_ascending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="asc" pos="1" >2</inp2:m_if>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_descending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="desc" pos="1" >2</inp2:m_if>');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuSeparator();
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Default" escape="1"/>','reset_sorting("<inp2:m_param name="PrefixSpecial"/>");');
-			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="viewmenu_sort_block" ajax="$ajax"/>
+			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" block="viewmenu_sort_block" ajax="$ajax"/>
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
 			// per page menu
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] = new Menu('<inp2:m_phrase name="la_prompt_PerPage" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('10','set_per_page("<inp2:m_param name="PrefixSpecial"/>",10,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="PerPageEquals" value="10"/>2<inp2:m_endif/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('20','set_per_page("<inp2:m_param name="PrefixSpecial"/>",20,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="PerPageEquals" value="20"/>2<inp2:m_endif/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('50','set_per_page("<inp2:m_param name="PrefixSpecial"/>",50,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="PerPageEquals" value="50"/>2<inp2:m_endif/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('100','set_per_page("<inp2:m_param name="PrefixSpecial"/>",100,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="PerPageEquals" value="100"/>2<inp2:m_endif/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('500','set_per_page("<inp2:m_param name="PrefixSpecial"/>",500,<inp2:m_param name="ajax"/>);','<inp2:m_if prefix="$PrefixSpecial" function="PerPageEquals" value="500"/>2<inp2:m_endif/>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('10','set_per_page("<inp2:m_param name="PrefixSpecial"/>",10,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="10" >2</inp2:m_if>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('20','set_per_page("<inp2:m_param name="PrefixSpecial"/>",20,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="20" >2</inp2:m_if>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('50','set_per_page("<inp2:m_param name="PrefixSpecial"/>",50,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="50" >2</inp2:m_if>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('100','set_per_page("<inp2:m_param name="PrefixSpecial"/>",100,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="100" >2</inp2:m_if>');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('500','set_per_page("<inp2:m_param name="PrefixSpecial"/>",500,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="500" >2</inp2:m_if>');
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_select" value="yes">
@@ -294,7 +294,7 @@
 
 		processHooks('ViewMenu', hBEFORE, '<inp2:m_param name="PrefixSpecial"/>');
 
-		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = new Menu('<inp2:$PrefixSpecial_GetItemName/>');
+		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = new Menu('<inp2:{$PrefixSpecial}_GetItemName/>');
 		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'] );
 		</inp2:m_if>
@@ -310,12 +310,12 @@
 
 		processHooks('ViewMenu', hAFTER, '<inp2:m_param name="PrefixSpecial"/>');
 	}
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 <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/>">
+<inp2:m_DefineElement name="grid_save_warning" >
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Save_Item"/>
@@ -326,7 +326,7 @@
 		$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/>
+</inp2:m_DefineElement>
 
 
 
@@ -338,9 +338,9 @@
 
 	<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:{$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/>">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Filter"/>
@@ -350,18 +350,18 @@
 	</inp2:m_if>
 
 	<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_RenderElement 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%" cellspacing="0" cellpadding="4" class="bordered">
 
 		<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" ajax="$ajax"/>
+				<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="filter" block="$filter_block" ajax="$ajax"/>
 			</tr>
 		</inp2:m_if>
 
 		<tr class="subsectiontitle">
-			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
+			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
 		</tr>
 
 		<inp2:m_DefineElement name="_row" td_style="">
@@ -370,7 +370,7 @@
 			</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:{$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">
@@ -432,9 +432,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="white_grid" main_prefix="" per_page="" main_special="" no_toolbar="" search="on" 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"/>
+	<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/>">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Filter"/>
@@ -443,7 +443,7 @@
 	</table>
 	</inp2:m_if>
 	<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_RenderElement name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
 	</inp2:m_if>
 	<br />
 
@@ -453,7 +453,7 @@
 
 	<table width="100%" border="0" cellspacing="2" cellpadding="4">
 		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
-		<inp2:$PrefixSpecial_PrintList2 pass_params="true"/>
+		<inp2:{$PrefixSpecial}_PrintList2 pass_params="true"/>
 	</table>
 
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">