Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r1308 -r1323
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 1308)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 1323)
@@ -1,10 +1,10 @@
 <inp2:m_block name="config_edit_text" />
-	<input type="text" name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" />" />
+	<input type="text" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" />" />
 <inp2:m_blockend />
 
 <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="" />
+	<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 />
 
@@ -13,22 +13,22 @@
 <inp2:m_blockend />
 
 <inp2:m_block name="config_edit_select" />
-	<select name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>">
+	<select name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>">
 		<inp2:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
 	</select>
 <inp2:m_blockend />
 
 <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"/>'))">
+	<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_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>
+	<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_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;
+	<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_block name="config_edit_radio"/>
@@ -37,9 +37,9 @@
 
 <inp2:m_block 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"/>">-->
+		<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" />
 	</td>
 <inp2:m_blockend />
\ No newline at end of file