Index: branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r15690 -r15902
--- branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15690)
+++ branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15902)
@@ -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"/>
@@ -176,23 +176,23 @@
 	</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"/>')
+		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>
 	</inp2:m_RenderElement>
 </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>
@@ -340,8 +340,8 @@
 	##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_swf_upload" class="" style="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
+<inp2:m_DefineElement name="inp_edit_swf_upload" LinkPrefix="m" LinkTag="t" class="" style="">
+	<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;
@@ -350,7 +350,10 @@
 			<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo" class="uploader-queue"></div>
 
 			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field' format='file_names'/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[json]" id="<inp2:{$prefix}_InputName field='$field'/>[json]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[order]" id="<inp2:{$prefix}_InputName field='$field'/>[order]" value="<inp2:{$prefix}_Field field='$field' format='file_names'/>">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_ids]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_ids]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_names]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_names]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_deleted]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_deleted]" value="">
 
 			<script type="text/javascript">
 				UploadsManager.AddUploader('<inp2:{$prefix}_InputName field="$field"/>',
@@ -363,11 +366,13 @@
 						prefix : '<inp2:m_Param name="prefix"/>',
 						field : '<inp2:m_Param name="field"/>',
 						thumb_format: '<inp2:{$prefix}_FieldOption field="$field" option="thumb_format"/>',
-						json : '<inp2:{$prefix}_Field field="$field" format="files_json" no_special="1" js_escape="1"/>',
+						urls : '<inp2:{$prefix}_Field field="$field" format="file_urls" no_special="1" js_escape="1"/>',
+						names : '<inp2:{$prefix}_Field field="$field" format="file_names" no_special="1" js_escape="1"/>',
+						sizes : '<inp2:{$prefix}_Field field="$field" format="file_sizes" no_special="1" js_escape="1"/>',
 						flashsid : '<inp2:m_SID/>',
-						uploadURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnUploadFile" js_escape="1" no_amp="1" />',
-						deleteURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnDeleteFile" tmp="#TMP#" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1"/>',
-						previewURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnViewFile" tmp="#TMP#" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
+						uploadURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnUploadFile" js_escape="1" no_amp="1" />',
+						deleteURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnDeleteFile" field_id="#FIELD_ID#" file="#FILE#" js_escape="1" no_amp="1"/>',
+						previewURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnViewFile" field="#FIELD#" file="#FILE#" js_escape="1" no_amp="1" />',
 
 						// Button settings
 						buttonImageURL: 'img/upload.png',	// Relative to the Flash file
@@ -377,7 +382,8 @@
 						buttonTextStyle: ".theFont { font-size: 12; font-family: arial, sans}",
 						buttonTextTopPadding: 2,
 						buttonTextLeftPadding: 9,
-						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder'
+						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder',
+						ajax: <inp2:m_if check="m_Get" name="ajax" equals_to="yes">true<inp2:m_else/>false</inp2:m_if>
 					}
 				)
 			</script>
@@ -391,7 +397,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 +426,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 +437,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 +468,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 +509,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 +520,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 +536,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>
@@ -611,7 +617,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">
@@ -622,7 +628,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">
@@ -638,15 +644,15 @@
 	         		var $field_mask = '<inp2:$prefix_InputName name="#FIELD_NAME#"/>';
 					var $user_id = parseInt( $selector.Grids['u'].GetSelected() );
 
-					$( jq('#' + $field_mask.replace('#FIELD_NAME#', '<inp2:m_Param name="field"/>')) ).val( $selector.$user_logins[$user_id] );
+					$( jq('#' + $field_mask.replace('#FIELD_NAME#', $field)) ).val( $selector.$user_logins[$user_id] );
 				}
          	</script>
 		</td>
 	</inp2:m_RenderElement>
 </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"/>
 
@@ -713,7 +719,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"/>"
@@ -749,12 +755,12 @@
 							function ($e) {
 								var $me = $(this);
 
-								if ($me.attr('disabled')) {
+								if ($me.prop('disabled')) {
 									return ;
 								}
 
 								var $type_selected = !isNaN( parseInt( $me.val() ) );
-								$( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');
+								$( jq('#<inp2:$prefix_InputName name="$field"/>') ).prop('disabled', !$type_selected);
 							}
 						)
 						.change();
@@ -833,7 +839,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">
@@ -851,7 +857,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">
@@ -874,7 +880,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" />
@@ -902,10 +908,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>
@@ -919,7 +925,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"/>
@@ -952,7 +958,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'/>">
@@ -969,7 +975,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>
@@ -1031,7 +1037,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>
@@ -1074,7 +1080,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'/>"/>