Index: trunk/core/admin_templates/incs/blocks.tpl
===================================================================
diff -u -N -r8097 -r8863
--- trunk/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 8097)
+++ trunk/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 8863)
@@ -9,28 +9,28 @@
 		<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="<inp2:m_getconst name="MAX_UPLOAD_SIZE"/>" />
 </inp2:m_DefineElement>
 
-<inp2:m_block name="kernel_form_end"/>
+<inp2:m_DefineElement name="kernel_form_end">
 		<inp2:m_DumpSystemInfo/>
 	</form>
 		<inp2:m_if check="m_IsDebugMode">
 	<script type="text/javascript">
 			addEvent(window, 'resize', OnResizePopup);
 	</script>
 		</inp2:m_if>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 
-<inp2:m_block name="field_caption"/>
-	<td><inp2:m_param name="title"/><inp2:m_if prefix="$prefix" function="IsRequired"/>*<inp2:m_endif/>:</td>
-<inp2:m_blockend/>
+<inp2:m_DefineElement name="field_caption">
+	<td><inp2:m_param name="title"/><inp2:m_if check="{$prefix}_IsRequired" >*</inp2:m_if>:</td>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="edit_box"/>
+<inp2:m_DefineElement name="edit_box">
 	<tr>
-		<inp2:m_ParseBlock name="field_caption" prefix="$prefix" title="$title" field="$field" />
-		<td><input type="text" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>"></td>
+		<inp2:m_RenderElement name="field_caption" prefix="$prefix" title="$title" field="$field" />
+		<td><input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>"></td>
 	</tr>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="column_header"/>
+<inp2:m_DefineElement name="column_header">
 	<td><a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="field"/>')"><inp2:m_param name="title"/></a></td>
-<inp2:m_blockend/>
\ No newline at end of file
+</inp2:m_DefineElement>
\ No newline at end of file