Index: branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r14585 -r15804
--- branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 14585)
+++ branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 15804)
@@ -1,58 +1,58 @@
 <inp2:m_DefineElement name="config_edit_text">
-	<input type="text" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>"<inp2:m_if check="m_Param" name="field_params"> <inp2:m_Param name="field_params"/><inp2:m_else/> style="width:100%"</inp2:m_if>/>
+	<input type="text" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" tabindex="<inp2:m_get param='tab_index'/>" value="<inp2:Field field='$field'/>"<inp2:m_if check="m_Param" name="field_params"> <inp2:m_Param name="field_params"/><inp2:m_else/> style="width:100%"</inp2:m_if>/>
 </inp2:m_DefineElement>
 
 <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="" />
+	<input type="password" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" tabindex="<inp2:m_get param='tab_index'/>" value="" />
+	<input type="password" name="verify_<inp2:CustomInputName/>" id="verify_<inp2:CustomInputName/>" tabindex="<inp2:m_get param='tab_index'/>" value="" />
 	&nbsp;<span class="error" id="error_<inp2:CustomInputName/>"></span>
 </inp2:m_DefineElement>
 
 <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>
+		<option value="<inp2:m_param name='key'/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
-	<select name="<inp2:CustomInputName/>">
+	<select name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" tabindex="<inp2:m_get param='tab_index'/>">
 		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_multiselect">
-	<select id="<inp2:CustomInputName/>_select" onchange="update_multiple_options('<inp2:CustomInputName/>');" multiple>
+	<select id="<inp2:CustomInputName/>_select" onchange="update_multiple_options('<inp2:CustomInputName/>');" tabindex="<inp2:m_get param='tab_index'/>" multiple>
 		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
-	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>"/>
+	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field='$field' db='db'/>"/>
 </inp2:m_DefineElement>
 
 <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"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+	<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:CustomInputName/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
-	<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+	<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" tabindex="<inp2:m_get param='tab_index'/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
 </inp2:m_DefineElement>
 
 <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;
+	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>_<inp2:m_param name='key'/>" tabindex="<inp2:m_get param='tab_index'/>" 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_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
+	<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_date">
-	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;
+	<input type="text" name="<inp2:CustomInputName append='_date'/>" id="<inp2:CustomInputName append='_date'/>" tabindex="<inp2:m_get param='tab_index'/>" value="<inp2:CustomField append='_date' format='_regional_InputDateFormat'/>" size="<inp2:CustomFormat append='_date' input_format='1' edit_size='edit_size'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
 	<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
 					     style="cursor: pointer; margin-right: 5px"
 					     title="Date selector"
 					/>
 	<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
 	<script type="text/javascript">
 		Calendar.setup({
-	        inputField		:	"<inp2:CustomInputName append="_date"/>",
-	        ifFormat		:	Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>"),
+	        inputField		:	"<inp2:CustomInputName append='_date'/>",
+	        ifFormat		:	Calendar.phpDateFormat("<inp2:CustomFormat append='_date' input_format='1'/>"),
 	        button			:	"cal_img_<inp2:CustomInputName/>",
 	        align			:	"br",
 	        singleClick		:	true,
@@ -65,34 +65,34 @@
 		});
 	</script>
 
-	<input type="hidden" name="<inp2:CustomInputName append="_time"/>" value="">
+	<input type="hidden" name="<inp2:CustomInputName append='_time'/>" value="">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_datetime">
-	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;
+	<input type="text" name="<inp2:CustomInputName append='_date'/>" id="<inp2:CustomInputName append='_date'/>" value="<inp2:CustomField append='_date' format='_regional_InputDateFormat'/>" size="<inp2:CustomFormat append='_date' input_format='1' edit_size='edit_size'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
 	<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
 					     style="cursor: pointer; margin-right: 5px"
 					     title="Date selector"
 					/>
 	<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
-	<input type="hidden" id="full_date_<inp2:CustomInputName/>" value="<inp2:CustomField format=""/>" />
+	<input type="hidden" id="full_date_<inp2:CustomInputName/>" value="<inp2:CustomField/>" />
 	<script type="text/javascript">
 		Calendar.setup({
 	        inputField	:	"full_date_<inp2:CustomInputName/>",
-	        ifFormat	:	Calendar.phpDateFormat("<inp2:CustomFormat input_format="1"/>"),
+	        ifFormat	:	Calendar.phpDateFormat("<inp2:CustomFormat input_format='1'/>"),
 	        button		:	"cal_img_<inp2:CustomInputName/>",
 	        align		:	"br",
 	        singleClick	:	true,
 	        showsTime	:	true,
 	        weekNumbers	:	false,
 	        firstDay	:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
 	        onUpdate	:	function(cal) {
-	        	document.getElementById('<inp2:CustomInputName append="_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>") );
-	        	document.getElementById('<inp2:CustomInputName append="_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_time" input_format="1"/>") );
+	        	document.getElementById('<inp2:CustomInputName append="_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append='_date' input_format='1'/>") );
+	        	document.getElementById('<inp2:CustomInputName append="_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append='_time' input_format='1'/>") );
 	       	}
 		});
 	</script>
-	&nbsp;<input type="text" name="<inp2:CustomInputName append="_time"/>" id="<inp2:CustomInputName append="_time"/>" value="<inp2:CustomField append="_time" format="_regional_InputTimeFormat"/>" size="<inp2:CustomFormat append="_time" input_format="1" edit_size="edit_size"/>"><span class="small"> (<inp2:CustomFormat append="_time" input_format="1" human="true"/>)</span>
+	&nbsp;<input type="text" name="<inp2:CustomInputName append='_time'/>" id="<inp2:CustomInputName append='_time'/>" value="<inp2:CustomField append='_time' format='_regional_InputTimeFormat'/>" size="<inp2:CustomFormat append='_time' input_format='1' edit_size='edit_size'/>"><span class="small"> (<inp2:CustomFormat append="_time" input_format="1" human="true"/>)</span>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="cv_row_block">
@@ -127,21 +127,33 @@
 				fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>'] = new Object();
 			}
 
-			fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']['<inp2:m_Param name="virtual_field" js_escape="1"/>'] = '<inp2:{$PrefixSpecial}_Field field="Prompt" grid="$grid" as_label="1" no_special="no_special" js_escape="1"/>'
+			<inp2:m_if check="Field" name="ElementType" equals_to="date" db="db">
+				fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']['<inp2:m_Param name="virtual_field" js_escape="1"/>_date'] = '<inp2:{$PrefixSpecial}_Field field="Prompt" grid="$grid" as_label="1" no_special="no_special" js_escape="1"/>'
+			<inp2:m_else/>
+				fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']['<inp2:m_Param name="virtual_field" js_escape="1"/>'] = '<inp2:{$PrefixSpecial}_Field field="Prompt" grid="$grid" as_label="1" no_special="no_special" js_escape="1"/>'
+			</inp2:m_if>
 		</script>
 
 		<td class="control-cell" valign="top">
-			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
+			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList"/>
 		</td>
-		<inp2:m_RenderElement name="inp_edit_error" prefix="$SourcePrefix" field="$virtual_field"/>
+
+		<inp2:Field name="ElementType" db="db" result_to_var="element_type"/>
+
+		<inp2:m_if check="Field" name="ElementType" equals_to="date" db="db">
+			<inp2:m_RenderElement name="inp_edit_error" prefix="$SourcePrefix" field="{$virtual_field}_date" block_name="cf:$element_type"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_error" prefix="$SourcePrefix" field="$virtual_field" block_name="cf:$element_type"/>
+		</inp2:m_if>
+
 		<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="edit_custom_td">
-	<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
+	<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="custom_error_td">
@@ -151,11 +163,3 @@
 <inp2:m_DefineElement name="grid_original_td" >
 	<inp2:Field field="$field" grid="$grid"/>
 </inp2:m_DefineElement>
-
-<!--<inp2:m_DefineElement name="edit_custom_td">
-	<td valign="top" class="text">
-		<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_DefineElement>-->
\ No newline at end of file
Index: branches/5.2.x/core/admin_templates/js/forms.js
===================================================================
diff -u -r15723 -r15804
--- branches/5.2.x/core/admin_templates/js/forms.js	(.../forms.js)	(revision 15723)
+++ branches/5.2.x/core/admin_templates/js/forms.js	(.../forms.js)	(revision 15804)
@@ -47,6 +47,7 @@
 			$input_fields = $input_fields.add('#timezone_group');
 			break;
 
+		case 'cf:datetime':
 		case 'inp_edit_date_time':
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_date')));
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_time')));
@@ -56,14 +57,17 @@
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + 'Type')));
 			break;
 
+		case 'cf:multiselect':
 		case 'inp_edit_multioptions':
 			$input_fields = $('#' + jq(element) + '_select');
 			break;
 
+		case 'cf:checkbox':
 		case 'inp_edit_checkbox':
 			$input_fields = $('#_cb_' + jq(element));
 			break;
 
+		case 'cf:radio':
 		case 'inp_edit_radio':
 		case 'inp_edit_checkboxes':
 			$input_fields = $("input[id^='" + jq(element) + "_']");
Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r15784 -r15804
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15784)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15804)
@@ -176,7 +176,7 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_error">
+<inp2:m_DefineElement name="inp_edit_error" block_name="">
 	<script type="text/javascript">
 		add_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>', '<inp2:{$prefix}_InputName field="$field"/>', '<inp2:{$prefix}_Error field="$field" js_escape="1"/>', '<inp2:m_Param name="block_name" js_escape="1"/>');
 	</script>