Index: trunk/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -N -r7697 -r8895
--- trunk/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7697)
+++ trunk/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 8895)
@@ -45,7 +45,7 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
Index: trunk/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -N -r8397 -r8895
--- trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 8397)
+++ trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 8895)
@@ -27,13 +27,13 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_label" prefix="u" field="Email" title="la_fld_Email"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u" field="LastName" title="la_fld_LastName"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u" field="Email" title="la_fld_Email"/>
 </table>
 
 <inp2:m_include t="incs/footer"/>
Index: trunk/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r7855 -r8895
--- trunk/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7855)
+++ trunk/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 8895)
@@ -37,18 +37,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="u" function="IsSingle"/>
+				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="u" function="IsLast"/>
+					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="u" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -60,14 +60,14 @@
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
 <table class="edit-form">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>
Index: trunk/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -N -r8397 -r8895
--- trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 8397)
+++ trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 8895)
@@ -28,8 +28,8 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
 </table>
 
 <inp2:m_include t="incs/footer"/>
Index: trunk/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r7697 -r8895
--- trunk/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 7697)
+++ trunk/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 8895)
@@ -45,7 +45,7 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['u.regular'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
Index: trunk/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r7855 -r8895
--- trunk/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7855)
+++ trunk/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 8895)
@@ -38,18 +38,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="u" function="IsSingle"/>
+				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="u" function="IsLast"/>
+					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="u" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -62,13 +62,13 @@
 <input type="hidden" name="user_group" value="11"/>
 <div id="scroll_container">
 <table class="edit-form">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>