Index: core/admin_templates/js/forms.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/js/forms.js	(revision 15713)
+++ core/admin_templates/js/forms.js	(revision )
@@ -1,57 +1,106 @@
 var last_shown_error = false;
-var errors = new Object();
-var first_error = new Object();
-var fields = new Object();
-function show_form_error(prefix, field, sticky)
-{
+var errors = {};
+var first_error = {};
+var fields = {};
+
+function show_form_error(prefix, field, sticky) {
-	if (isset(errors[prefix]) && isset(errors[prefix][field])) {
+	if ( isset(errors[prefix]) && isset(errors[prefix][field]) ) {
-		span = document.getElementById('error_msg_'+prefix);
+		span = document.getElementById('error_msg_' + prefix);
 		span.innerHTML = fields[prefix][field] + ' - ' + errors[prefix][field];
-		if (sticky) last_shown_error = field;
+
+		if ( sticky ) {
+			last_shown_error = field;
-	}
-}
+		}
+	}
-function hide_form_error(prefix)
-{
+}
+
+function hide_form_error(prefix) {
-	span = document.getElementById('error_msg_'+prefix);
+	span = document.getElementById('error_msg_' + prefix);
-	if (!span) return;
+
+	if ( !span ) {
+		return;
+	}
+
 	span.innerHTML = '<br/>';
+
-	if (typeof(last_shown_error) != 'undefined' && last_shown_error) {
+	if ( typeof(last_shown_error) != 'undefined' && last_shown_error ) {
 		show_form_error(prefix, last_shown_error);
 	}
 }
-function add_form_error(prefix, field, element, error_msg) {
-	if (error_msg != '') {
+
+function add_form_error(prefix, field, element, error_msg, block_name) {
+	if ( error_msg == '' ) {
+		// no error message - do nothing
+		return;
+	}
+
-		if (typeof(errors[prefix]) == 'undefined') {
+	if ( typeof(errors[prefix]) == 'undefined' ) {
-			errors[prefix] = new Object();
+		errors[prefix] = {};
-		}
+	}
+
-		errors[prefix][field] = error_msg;
+	errors[prefix][field] = error_msg;
 
-		if (document.getElementById(element)) {
+	var $input_fields = $('#' + jq(element));
+
+	switch (block_name) {
+		case 'inp_edit_timezone':
+			$input_fields = $input_fields.add('#timezone_group');
+			break;
+
+		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')));
+			break;
+
+		case 'inp_edit_combo_target':
+			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + 'Type')));
+			break;
+
+		case 'inp_edit_multioptions':
+			$input_fields = $('#' + jq(element) + '_select');
+			break;
+
+		case 'inp_edit_checkbox':
+			$input_fields = $('#_cb_' + jq(element));
+			break;
+
+		case 'inp_edit_radio':
+		case 'inp_edit_checkboxes':
+			$input_fields = $("input[id^='" + jq(element) + "_']");
+			break;
+
+		case 'inp_edit_weight':
+			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_a')));
+			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_b')));
+			break;
+
+		case 'inp_edit_picker':
+			$input_fields = $('#' + jq(element) + '_selected');
+			break;
+
+		case 'inp_edit_cron_box':
+			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + 'Hints')));
+			break;
+	}
+
+	if ( $input_fields.length > 0 ) {
-			// some controls don't have element to focus on (e.g. swf uploader)
+		// some controls don't have element to focus on (e.g. swf uploader)
-			addEvent(
-				document.getElementById(element),
-				'focus',
-				function() {
-					show_form_error(prefix, field, true)
+		$input_fields.focus(function ($e) {
+			show_form_error(prefix, field, true);
+		});
+
+		$input_fields.blur(function ($e) {
+			last_shown_error = false;
+		});
-				}
+	}
-			);
-			addEvent(
-				document.getElementById(element),
-				'blur',
-				function() {
-					last_shown_error = false
-				}
-			);
-		}
-		/*else {
-			console.log('error: focusing failed for [', prefix, '.', field, '] = ', element);
-		}*/
+	/*else {
+		console.log('error: focusing failed for [', prefix, '.', field, '] = ', element);
+	}*/
 
-		if (typeof(first_error[prefix]) == 'undefined' || first_error[prefix] == false) {
+	if ( typeof(first_error[prefix]) == 'undefined' || first_error[prefix] == false ) {
-			first_error[prefix] = [field, element];
-		}
-	}
+		first_error[prefix] = [field, element];
+	}
+}
-}
 
 function FCKeditor_OnComplete( editor )
 {
@@ -152,7 +201,7 @@
 
 	Application.processHooks('m:OnAfterFormInit');
 	InitEditors();
-}
+};
 
 Form.displayFirstError = function () {
 	if (isset(first_error)) {
@@ -167,7 +216,7 @@
 			}
 		}
 	}
-}
+};
 
 Form.InitOnChange = function()
 {
@@ -184,12 +233,12 @@
 			addEvent(elem, elem.type=='button' ? 'click' : 'change', function() {Form.Changed()});
 		}
 	}
-}
+};
 
 Form.Changed = function()
 {
 	this.HasChanged = true;
-}
+};
 
 Form.addControl = function(id, options) {
 	this.Controls.push(id);
@@ -204,7 +253,7 @@
 	options['real_height'] = 0;
 	this.Options[id] = options; // for future use
 //	print_pre(this.Options[id]);
-}
+};
 
 Form._parseSize = function ($size) {
 	if ($size.toString().match(/^([\d]+)px$/)) {
@@ -212,7 +261,7 @@
 	}
 
 	return parseInt($size);
-}
+};
 
 Form.Resize = function($init_done) {
 	if (!this.Div) {
@@ -305,7 +354,7 @@
 
 //	alert('h is: '+h+' min height is '+this.MinHeight+' MinControlsHeight is '+this.MinControlsHeight+' -> '+split+' to split between '+count);
 //	print_pre(this.Controls)
-}
+};
 
 Form.ResetHeights = function()
 {
@@ -315,9 +364,8 @@
 		options.fixed = false;
 	}
 	this.FlexibleCount = this.Controls.length;
-}
+};
 
-
 // Enlarge heights when possible
 // Return any not split pixels number
 Form.SplitExtra = function(split) {
@@ -359,7 +407,7 @@
 		added -= extra;
 	}
 	return split - added;
-}
+};
 
 Form.SetMinHeights = function()
 {
@@ -372,4 +420,4 @@
 		}
 	}
 	return used;
-}
\ No newline at end of file
+};
\ No newline at end of file
Index: core/admin_templates/incs/form_blocks.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 15713)
+++ core/admin_templates/incs/form_blocks.tpl	(revision )
@@ -138,7 +138,7 @@
 </inp2:m_DefineElement>
 
 <!--## design default parameters only avaible in design block ##-->
-<inp2:m_DefineElement name="form_row" error_field_suffix="" title="la_fld_{$field}" has_caption="1" caption_render_as="default_field_caption_element" style="" hint_label="" is_last="">
+<inp2:m_DefineElement name="form_row" error_field_suffix="" block_name="" title="la_fld_{$field}" has_caption="1" caption_render_as="default_field_caption_element" style="" hint_label="" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row"<inp2:m_if check="m_Param" name="row_style"> style="<inp2:m_Param name='row_style'/>"</inp2:m_if>>
 			<inp2:m_if check="m_Param" name="has_caption">
@@ -147,7 +147,7 @@
 
 			<inp2:m_Param name="content" pass_params="1"/>
 
-			<inp2:m_RenderElement name="inp_edit_error" prefix="$prefix" field="{$field}{$error_field_suffix}"/>
+			<inp2:m_RenderElement name="inp_edit_error" prefix="$prefix" field="{$field}{$error_field_suffix}" block_name="$block_name"/>
 
 			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
@@ -157,7 +157,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_label" style="" format="" db="" as_label="" currency="" no_special="" nl2br="0" with_hidden="0" after_text="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_label" pass_params="1">
 		<td class="control-cell" valign="top">
 			<span style="<inp2:m_Param name='style'/>" id="<inp2:$prefix_InputName field='$field'/>">
 				<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br" no_special="$no_special"/><inp2:m_Param name="after_text"/>
@@ -178,13 +178,13 @@
 
 <inp2:m_DefineElement name="inp_edit_error">
 	<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"/>')
+		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>
 	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_box" class="" format="" maxlength="" onblur="" onchange="" size="" onkeyup="" allow_html="" edit_template="popups/editor" style="width: 100%" after_text="" autocomplete="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_box" pass_params="1">
 		<td class="control-cell">
 			<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>" autocomplete="<inp2:m_Param name='autocomplete'/>"><inp2:m_Param name="after_text"/>
 		</td>
@@ -192,7 +192,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_timezone" onchange="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_timezone" pass_params="1">
 		<td class="control-cell">
 
 			<script type="text/javascript">
@@ -276,7 +276,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_password" class="" size="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_password" pass_params="1">
 		<td class="control-cell">
 			<input style="<inp2:m_Param name='style'/>" autocomplete="off" type="password" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field name='{$field}_plain'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" />
 
@@ -294,7 +294,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_upload" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="m_Param" name="thumbnail">
 				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
@@ -327,7 +327,7 @@
 	<inp2:m_RenderElement name="inp_edit_box" format="no_default" pass_params="true"/>
 
 	<!--##
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_box_ml" pass_params="1">
 		<td class="label-cell" valign="top">
 			<span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>" >
 			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:</span><br>
@@ -341,7 +341,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_swf_upload" class="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_swf_upload" pass_params="1">
 		<td class="control-cell">
 			<div style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
 				&nbsp;
@@ -391,7 +391,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date" class="" error_field_suffix="_date">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_date" pass_params="1">
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_input_'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_date' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
 			<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field='{$field}'/>"
@@ -420,7 +420,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_time" class="" error_field_suffix="_time">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_time" pass_params="1">
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time'/>" value="<inp2:{$prefix}_Field field='{$field}_time' format='_input_'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_time' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>">&nbsp;
 			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
@@ -431,7 +431,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date_time" class="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_date_time" pass_params="1">
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_input_'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_date' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
 			<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$field}"/>"
@@ -462,7 +462,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date_time_combined" class="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_date_time_combined" pass_params="1">
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='$field' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif"/>
 
@@ -503,7 +503,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_textarea" pass_params="1">
 		<td class="control-cell">
 			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="fck_ready;{$format}"/></textarea>
 			<script type="text/javascript">
@@ -514,7 +514,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_fck" class="" title="la_fld_{$field}" maxlength="" bgcolor="" body_class="" body_id="" onblur="" format="" size="" onkeyup="" style="" has_caption="0" control_options="false">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_fck" pass_params="1">
 		<td class="control-cell" style="padding: 0px;" colspan="3" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
 			<inp2:FCKEditor field="$field" width="100%" height="200" bgcolor="$bgcolor" body_class="$body_class" body_id="$body_id" format="$format" late_load="1"/>
 			<script type="text/javascript">
@@ -530,7 +530,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_codepress" style="width: 100%;" language="html" has_caption="0" control_options="false">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_codepress" pass_params="1">
 		<td class="control-cell" colspan="3" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
 			<inp2:m_ifnot check="m_Get" name="codepress_included">
 				<script type="text/javascript" src="<inp2:m_TemplatesBase/>/themes/codepress/codepress.js"></script>
@@ -577,7 +577,7 @@
 
 <inp2:m_DefineElement name="inp_edit_textarea_ml">
 	<inp2:m_RenderElement name="inp_edit_textarea" format="no_default" pass_params="true"/>
-	<!--##<inp2:m_RenderElement design="form_row" pass_params="1">
+	<!--##<inp2:m_RenderElement design="form_row" block_name="inp_edit_textarea_ml" pass_params="1">
 		<td class="control-cell">
 			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" cols="<inp2:m_param name='cols'/>" rows="<inp2:m_param name='rows'/>" class="<inp2:m_param name='class'/>"><inp2:{$prefix}_Field field="$field" format="fck_ready,{$format}"/></textarea>
 			<script type="text/javascript">
@@ -588,7 +588,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_user" class="" size="" old_style="0" onkeyup="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_user" pass_params="1">
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" onkeyup="<inp2:m_Param name='onkeyup'/>">
 			<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
@@ -612,7 +612,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_category" class="" size="" old_style="0" onkeyup="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_category" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
 
@@ -679,7 +679,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_combo_target" title="la_fld_{$field}" caption_render_as="default_field_caption_element" read_only="0" has_empty="" hint_label="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_combo_target" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="m_Param" name="read_only">
 				<inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>"
@@ -799,7 +799,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_options" onchange="" has_empty="0" empty_value="" empty_label="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_options" pass_params="1">
 		<td class="control-cell">
 			<select tabindex="<inp2:m_Get name='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="<inp2:m_Param name='style'/>">
 				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
@@ -817,7 +817,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_multioptions" has_empty="0" empty_value="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_multioptions" pass_params="1">
 		<td class="control-cell">
 			<select multiple tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>_select" onchange="update_multiple_options('<inp2:{$prefix}_InputName field='$field'/>');">
 				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
@@ -840,7 +840,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_radio" onclick="" onchange="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_radio" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
@@ -868,10 +868,10 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkbox" field_class="" onchange="" onclick="" NamePrefix="_cb_">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_checkbox" pass_params="1">
 		<td class="control-cell">
-			<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>">
-			<input tabindex="<inp2:m_Get name='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>">
+			<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>"/>
+			<input tabindex="<inp2:m_Get name='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>">
 		</td>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
@@ -885,7 +885,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" has_br="0">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_checkboxes" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" block="inp_checkbox_phrase" selected="checked" has_br="$has_br"/>
@@ -918,7 +918,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_weight" class="" size="" maxlength="" onblur="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_weight" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
 				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>">
@@ -935,7 +935,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_minput" style="" format="" allow_add="1" allow_edit="1" allow_delete="1" allow_move="1" title="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_minput" pass_params="1">
 		<td class="control-cell">
 			<table>
 				<tr>
@@ -997,7 +997,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_picker" has_empty="0" empty_value="" style="width: 225px;" size="15">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_picker" pass_params="1">
 		<td class="control-cell">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
@@ -1040,7 +1040,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_cron_box">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+	<inp2:m_RenderElement design="form_row" block_name="inp_edit_cron_box" pass_params="1">
 		<td class="control-cell">
 			<input style="width: 150px;" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_Get name='tab_index'/>"/>