Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r5081 -r5272
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5081)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5272)
@@ -109,7 +109,7 @@
 			<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><inp2:$PrefixSpecial_field field="$field" no_special="no_special" format="$format"/></td>
+				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
@@ -155,7 +155,7 @@
 			<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><inp2:$PrefixSpecial_field field="$field" no_special="no_special" format="$format"/></td>
+				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
 			</tr>
 		</table>
 	</td>
@@ -283,27 +283,27 @@
 	</script>
 <inp2:m_blockend/>
 
-<inp2:m_block 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" SourcePrefix="" value_field="Value" 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" 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
 	SourcePrefix - used with custom fields
 	value_field  - used with custom fields
 -->
 	<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"/>
+	<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/>">
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Filter"/>
     		</td>
   		</tr>
 	</table>
-	<inp2:m_endif/>
+	</inp2:m_if>
 
-	<inp2:m_ParamEquals name="NoPagination" value="">
+	<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>
+	</inp2:m_if>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 
 		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
@@ -316,21 +316,21 @@
 			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
 		</tr>
 
-		<inp2:m_block name="_row" />
+		<inp2:m_DefineElement name="_row">
 			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:$PrefixSpecial_field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
 				<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="data" block="$data_block"/>
 			</tr>
-		<inp2:m_blockend />
+		</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" 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=""/>
+		<inp2:m_if check="m_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/>
+		</inp2:m_if>
 
 		<script type="text/javascript">
 			<inp2:m_RenderElement name="grid_js" selected_class="selected_div" tag_name="tr" pass_params="true"/>
@@ -339,7 +339,7 @@
 
 	<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_DefineElement name="grid_js" ajax="1">
 		<inp2:m_if check="m_ParamEquals" name="no_init" value="no_init" inverse="inverse">
@@ -351,20 +351,20 @@
   		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
 
-<inp2:m_block 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: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:m_if prefix="m" function="RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse"/>
+	<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/>">
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Filter"/>
     		</td>
   		</tr>
 	</table>
-	<inp2:m_endif/>
-	<inp2:m_ParamEquals name="NoPagination" value="">
+	</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" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
-	</inp2>
+	</inp2:m_if>
 	<br />
 
 	<inp2:m_DefineElement name="wg_empty_cell">
@@ -377,10 +377,10 @@
 	</table>
 
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
-		<inp2:m_if prefix="m" function="GetEquals" name="fw_menu_included" value=""/>
+		<inp2:m_if check="m_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/>
+		</inp2:m_if>
 
 		<script type="text/javascript">
 			<inp2:m_RenderElement name="grid_js" selected_class="table_white_selected" tag_name="td" pass_params="true"/>
@@ -389,4 +389,4 @@
 
 	<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 />
\ No newline at end of file
+</inp2:m_DefineElement>
\ No newline at end of file