Index: trunk/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r2716 -r4029
--- trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 2716)
+++ trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 4029)
@@ -1,46 +1,44 @@
-<inp2:m_block name="config_edit_text" />
-	<input type="text" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" />" />
-<inp2:m_blockend />
+<inp2:m_DefineElement name="config_edit_text">
+	<input type="text" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>" />
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_password" />
-	<input type="password" primarytype="password" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="" />
-	<input type="password" name="verify_<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="verify_<inp2:$PrefixSpecial_InputName field="$field" IdField=="$IdField"/>" value="" />
-	&nbsp;<span class="error" id="error_<inp2:$PrefixSpecial_InputName field="$field"/>"></span>
-<inp2:m_blockend />
+<inp2:m_DefineElement name="config_edit_password">
+	<input type="password" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="" />
+	<input type="password" name="verify_<inp2:CustomInputName/>" id="verify_<inp2:CustomInputName/>" value="" />
+	&nbsp;<span class="error" id="error_<inp2:CustomInputName/>"></span>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_option" />
+<inp2:m_DefineElement name="config_edit_option">
 		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
-<inp2:m_blockend />
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_select" />
-	<select name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>">
-		<inp2:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+<inp2:m_DefineElement name="config_edit_select">
+	<select name="<inp2:CustomInputName/>">
+		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
 	</select>
-<inp2:m_blockend />
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_checkbox"/>
-	<input type="hidden" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" db="db"/>">
-	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:$PrefixSpecial_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>'))">
-<inp2:m_blockend/>
+<inp2:m_DefineElement name="config_edit_checkbox">
+	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_textarea" />
-	<textarea name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" <inp2:m_param name="field_params" />><inp2:$PrefixSpecial_Field field="$field" /></textarea>
-<inp2:m_blockend />
+<inp2:m_DefineElement name="config_edit_textarea">
+	<textarea name="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_radio_item"/>
-	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
-<inp2:m_blockend/>
+<inp2:m_DefineElement name="config_radio_item">
+	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:CustomInputName/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+</inp2:m_DefineElement>
 
-<inp2:m_block name="config_edit_radio"/>
-			<inp2:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
-<inp2:m_blockend/>
+<inp2:m_DefineElement name="config_edit_radio">
+			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="edit_custom_td" />
+<!--<inp2:m_DefineElement name="edit_custom_td">
 	<td valign="top" class="text">
-		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="ResourceId" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="ResourceId" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="ResourceId" grid="$grid"/>">
-		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="CustomDataId" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="CustomDataId" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="CustomDataId" grid="$grid"/>">
-		<!-- <input size="40" type="text" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>"> -->
-		
-		<inp2:$PrefixSpecial_ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
+		<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">
+		<input type="hidden" name="<inp2:InputName field="CustomDataId"/>" id="<inp2:InputName field="CustomDataId"/>" value="<inp2:Field field="CustomDataId" grid="$grid"/>">
+		<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 	</td>
-<inp2:m_blockend />
\ No newline at end of file
+</inp2:m_DefineElement>-->
\ No newline at end of file