Index: trunk/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r8397 -r8863
--- trunk/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 8397)
+++ trunk/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 8863)
@@ -37,18 +37,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="skin" function="IsSingle"/>
+				<inp2:m_if check="skin_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="skin" function="IsLast"/>
+					<inp2:m_if check="skin_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="skin" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="skin_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 
 
@@ -61,19 +61,19 @@
 </tbody>
 </table>
 
-<inp2:m_block name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%"/>
+<inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
 	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
 		<td class="control-cell">
 			<input style="<inp2:m_Param name="style"/>" type="text"
-				name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>][Value]" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>]" value="<inp2:m_Param name="Value"/>">
+				name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>][Value]" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>]" value="<inp2:m_Param name="Value"/>">
 		</td>
 	</tr>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%"/>
+<inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
 	<inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 
 
@@ -82,18 +82,18 @@
 <div id="scroll_container">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-collapse: separate;">
 
-		<inp2:m_ParseBlock name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
 
-		<inp2:m_ParseBlock name="inp_edit_box_ml" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
 
-		<inp2:m_ParseBlock name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
+		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
 
 		<style type="text/css">
 			.skin-table td {width: 90px};
 		</style>
 
 			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
 				<td class="control-cell">
 					<table class="skin-table">
 						<tr>
@@ -129,7 +129,7 @@
 			</tr>
 		</tr>
 			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
 				<td class="control-cell">
 					<table class="skin-table">
 						<tr>
@@ -165,7 +165,7 @@
 			</tr>
 		</tr>
 			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
 				<td class="control-cell">
 					<table class="skin-table">
 						<tr>
@@ -201,7 +201,7 @@
 			</tr>
 		</tr>
 		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
 				<td class="control-cell">
 					<table class="skin-table">
 						<tr>
@@ -238,7 +238,7 @@
 		</tr>
 
 		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
 				<td class="control-cell">
 					<table class="skin-table">
 						<tr>
@@ -274,8 +274,8 @@
 			</tr>
 		</tr>
 
-	<!--	<inp2:m_ParseBlock name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
-		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!"/>
+	<!--	<inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!"/>
 
 </table>
 </div>