Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11684 -r11685
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11684)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11685)
@@ -112,15 +112,21 @@
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="subsection" prefix="" colspan="3">
-	<tr class="subsectiontitle">
-		<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
-		<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
-			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-				<td><inp2:m_phrase name="$original_title"/></td>
-			</inp2:m_if>
+<inp2:m_DefineElement name="subsection" prefix="" fields="" colspan="3">
+	<inp2:m_if check="m_Param" name="prefix" equals_to="">
+		<tr class="subsectiontitle">
+			<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
+		</tr>
+	<inp2:m_else/>
+		<inp2:m_if check="{$prefix}_FieldsVisible" fields="$fields">
+			<tr class="subsectiontitle">
+				<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
+				<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+					<td><inp2:m_phrase name="$original_title"/></td>
+				</inp2:m_if>
+			</tr>
 		</inp2:m_if>
-	</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_field_caption" title="" subfield="" NamePrefix="">
@@ -144,25 +150,27 @@
 	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" db="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell" valign="top">
-			<span style="<inp2:m_Param name='style'/>" id="<inp2:$prefix_InputName field='$field' subfield='$subfield'/>">
-				<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
-			</span>
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>">
-		</td>
-    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-    	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" db="" hint_label="" as_label="" currency="" no_special="" nl2br="0" is_last="">
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell" valign="top">
+				<span style="<inp2:m_Param name='style'/>" id="<inp2:$prefix_InputName field='$field' subfield='$subfield'/>">
+					<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br" no_special="$no_special"/>
+				</span>
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>">
+			</td>
+	    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+	    	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_id_label">
-	<inp2:m_ifnot check="Field" field="$field" equals_to="">
+	<inp2:m_ifnot check="Field" field="$field" equals_to="|0">
 		<inp2:m_RenderElement name="inp_label" pass_params="true"/>
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
@@ -175,425 +183,455 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_box" subfield="" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>" value="<inp2:{$prefix}_Field field='$field' format='$format' subfield='$subfield'/>" tabindex="<inp2:m_get param='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'/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>" value="<inp2:{$prefix}_Field field='$field' format='$format' subfield='$subfield'/>" tabindex="<inp2:m_get param='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'/>">
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_password" class="" size="" style="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="control-cell">
-			<input style="<inp2:m_Param name='style'/>" type="password" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" />
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+			<td class="control-cell">
+				<input style="<inp2:m_Param name='style'/>" type="password" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" />
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="" style="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:m_if check="m_Param" name="thumbnail">
-				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-					<img src="<inp2:{$prefix}_Field field='$field' format='resize:{$thumbnail}'/>" alt=""/><br />
-					<table cellpadding="0" cellspacing="0">
-						<tr>
-							<td>
-								<input type="hidden" id="<inp2:{$prefix}_InputName field='Delete{$field}'/>" name="<inp2:{$prefix}_InputName field='Delete{$field}'/>" value="0" />
-								<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Delete{$field}'/>'));">
-							</td>
-							<td>
-								<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="la_btn_DeleteImage"/></label>
-							</td>
-						</tr>
-					</table>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<inp2:m_if check="m_Param" name="thumbnail">
+					<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+						<img src="<inp2:{$prefix}_Field field='$field' format='resize:{$thumbnail}'/>" alt=""/><br />
+						<table cellpadding="0" cellspacing="0">
+							<tr>
+								<td>
+									<input type="hidden" id="<inp2:{$prefix}_InputName field='Delete{$field}'/>" name="<inp2:{$prefix}_InputName field='Delete{$field}'/>" value="0" />
+									<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Delete{$field}'/>'));">
+								</td>
+								<td>
+									<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="la_btn_DeleteImage"/></label>
+								</td>
+							</tr>
+						</table>
+					</inp2:m_if>
+					<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>">
+				<inp2:m_else/>
+					<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>">
+					<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+						(<inp2:{$prefix}_Field field="$field"/>)
+					</inp2:m_if>
 				</inp2:m_if>
-				<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>">
-			<inp2:m_else/>
-				<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>">
-				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-					(<inp2:{$prefix}_Field field="$field"/>)
-				</inp2:m_if>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>">
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>">
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_box_ml">
 	<inp2:m_RenderElement name="inp_edit_box" format="no_default" pass_params="true"/>
 
 	<!--##
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<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>
-			<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name='prefix'/>', '<inp2:m_param name='field'/>', 'popups/translator');" title="<inp2:m_Phrase label='la_Translate'/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
-		</td>
-		<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='no_default'/>" tabindex="<inp2:m_get param='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'/>">
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<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>
+				<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name='prefix'/>', '<inp2:m_param name='field'/>', 'popups/translator');" title="<inp2:m_Phrase label='la_Translate'/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
+			</td>
+			<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='no_default'/>" tabindex="<inp2:m_get param='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'/>">
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 	##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" style="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<div class="uploader-main" id="<inp2:{$prefix}_InputName field='$field'/>_progress">
-				<div class="uploader-percent" id="<inp2:{$prefix}_InputName field='$field'/>_percent">0%</div>
-				<div class="uploader-left">
-					<div class="uploader-done" id="<inp2:{$prefix}_InputName field='$field'/>_done"></div>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<div class="uploader-main" id="<inp2:{$prefix}_InputName field='$field'/>_progress">
+					<div class="uploader-percent" id="<inp2:{$prefix}_InputName field='$field'/>_percent">0%</div>
+					<div class="uploader-left">
+						<div class="uploader-done" id="<inp2:{$prefix}_InputName field='$field'/>_done"></div>
+					</div>
+					<table style="border-collapse: collapse; width: 100%;">
+						<tr>
+							<td style="width: 120px">Uploading:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_filename"></td>
+						</tr>
+						<tr>
+							<td>Progress:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_progress"></td>
+						</tr>
+						<tr>
+							<td>Time elapsed:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_elapsed"></td>
+						</tr>
+						<tr>
+							<td>Time remaining:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_remaining"></td>
+						</tr>
+						<tr>
+							<td colspan="2" style="text-align: center"><a href="javascript:UploadsManager.CancelUpload('<inp2:{$prefix}_InputName field='$field'/>')">Cancel</a></td>
+						</tr>
+					</table>
 				</div>
-				<table style="border-collapse: collapse; width: 100%;">
+
+				<table cellpadding="0" cellspacing="3">
 					<tr>
-						<td style="width: 120px">Uploading:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_filename"></td>
+						<td style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
+							&nbsp;
+						</td>
+						<td>
+							<input class="button" type="button" onclick="UploadsManager.StartUpload('<inp2:{$prefix}_InputName field='$field'/>')" value="Upload"/>
+						</td>
 					</tr>
-					<tr>
-						<td>Progress:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_progress"></td>
-					</tr>
-					<tr>
-						<td>Time elapsed:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_elapsed"></td>
-					</tr>
-					<tr>
-						<td>Time remaining:</td><td id="<inp2:{$prefix}_InputName field='$field'/>_progress_remaining"></td>
-					</tr>
-					<tr>
-						<td colspan="2" style="text-align: center"><a href="javascript:UploadsManager.CancelUpload('<inp2:{$prefix}_InputName field='$field'/>')">Cancel</a></td>
-					</tr>
 				</table>
-			</div>
 
-			<table cellpadding="0" cellspacing="3">
-				<tr>
-					<td style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
-						&nbsp;
-					</td>
-					<td>
-						<input class="button" type="button" onclick="UploadsManager.StartUpload('<inp2:{$prefix}_InputName field='$field'/>')" value="Upload"/>
-					</td>
-				</tr>
-			</table>
+				<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo"></div>
+				<div id="<inp2:{$prefix}_InputName field='$field'/>_holder"></div>
 
-			<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo"></div>
-			<div id="<inp2:{$prefix}_InputName field='$field'/>_holder"></div>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>"><br/>
+				<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="">
 
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>"><br/>
-			<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"/>',
+						{
+							baseUrl: '<inp2:m_TemplatesBase />',
+							allowedFiletypesDescription : '<inp2:{$prefix}_FieldOption field="$field" option="files_description" js_escape="1"/>',
+							allowedFiletypes : '<inp2:{$prefix}_FieldOption field="$field" option="file_types"/>',
+							allowedFilesize : '<inp2:{$prefix}_FieldOption field="$field" option="max_size"/>',
+							multiple : '<inp2:{$prefix}_FieldOption field="$field" option="multiple"/>',
+							prefix : '<inp2:m_Param name="prefix"/>',
+							field : '<inp2:m_Param name="field"/>',
+							urls : '<inp2:{$prefix}_Field field="$field" format="file_urls" js_escape="1"/>',
+							names : '<inp2:{$prefix}_Field field="$field" format="file_names" js_escape="1"/>',
+							sizes : '<inp2:{$prefix}_Field field="$field" format="file_sizes" js_escape="1"/>',
+							flashsid : '<inp2:m_SID/>',
+							uploadURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnUploadFile" js_escape="1" no_amp="1" />',
+							deleteURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnDeleteFile" field="#FIELD#" file="#FILE#" js_escape="1" no_amp="1"/>',
+							tmp_url : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnViewFile" tmp="1" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
 
-			<script type="text/javascript">
-				UploadsManager.AddUploader('<inp2:{$prefix}_InputName field="$field"/>',
-					{
-						baseUrl: '<inp2:m_TemplatesBase />',
-						allowedFiletypesDescription : '<inp2:{$prefix}_FieldOption field="$field" option="files_description" js_escape="1"/>',
-						allowedFiletypes : '<inp2:{$prefix}_FieldOption field="$field" option="file_types"/>',
-						allowedFilesize : '<inp2:{$prefix}_FieldOption field="$field" option="max_size"/>',
-						multiple : '<inp2:{$prefix}_FieldOption field="$field" option="multiple"/>',
-						prefix : '<inp2:m_Param name="prefix"/>',
-						field : '<inp2:m_Param name="field"/>',
-						urls : '<inp2:{$prefix}_Field field="$field" format="file_urls" js_escape="1"/>',
-						names : '<inp2:{$prefix}_Field field="$field" format="file_names" js_escape="1"/>',
-						sizes : '<inp2:{$prefix}_Field field="$field" format="file_sizes" js_escape="1"/>',
-						flashsid : '<inp2:m_SID/>',
-						uploadURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnUploadFile" js_escape="1" no_amp="1" />',
-						deleteURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnDeleteFile" field="#FIELD#" file="#FILE#" js_escape="1" no_amp="1"/>',
-						tmp_url : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnViewFile" tmp="1" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
+							// Button settings
+							buttonImageURL: 'img/upload.png',	// Relative to the Flash file
+							buttonWidth: 63,
+							buttonHeight: 21,
+							buttonText: '<span class="theFont">Browse</span>',
+							buttonTextStyle: ".theFont { font-size: 12; font-family: arial, sans}",
+							buttonTextTopPadding: 2,
+							buttonTextLeftPadding: 9,
+							buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder'
+						}
+					)
+				</script>
 
-						// Button settings
-						buttonImageURL: 'img/upload.png',	// Relative to the Flash file
-						buttonWidth: 63,
-						buttonHeight: 21,
-						buttonText: '<span class="theFont">Browse</span>',
-						buttonTextStyle: ".theFont { font-size: 12; font-family: arial, sans}",
-						buttonTextTopPadding: 2,
-						buttonTextLeftPadding: 9,
-						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder'
-					}
-				)
-			</script>
-
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_hidden" db="">
 	<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_date" title="$title" is_last="$is_last"/>
-		<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='_regional_InputDateFormat'/>" tabindex="<inp2:m_get param='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}'/>"
-					     style="cursor: pointer; margin-right: 5px"
-					     title="Date selector"
-					/>
-			<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-				Calendar.setup({
-			        inputField		:	"<inp2:{$prefix}_InputName field='{$field}_date'/>",
-			        ifFormat		:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field='{$field}_date' input_format='1'/>"),
-			        button			:	"cal_img_<inp2:{$prefix}_InputName field='{$field}'/>",
-			        align			:	"br",
-			        singleClick		:	true,
-			        showsTime		:	true,
-			        weekNumbers		:	false,
-			        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
-			        onUpdate	:	function(cal) {
-			        	runOnChange('<inp2:$prefix_InputName field='{$field}_date'/>');
-			       	}
-				});
-			</script>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time' input_format='1'/>" value="">
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" field="{$field}_date" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_date" title="$title" is_last="$is_last"/>
+			<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='_regional_InputDateFormat'/>" tabindex="<inp2:m_get param='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}'/>"
+						     style="cursor: pointer; margin-right: 5px"
+						     title="Date selector"
+						/>
+				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+				<script type="text/javascript">
+					Calendar.setup({
+				        inputField		:	"<inp2:{$prefix}_InputName field='{$field}_date'/>",
+				        ifFormat		:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field='{$field}_date' input_format='1'/>"),
+				        button			:	"cal_img_<inp2:{$prefix}_InputName field='{$field}'/>",
+				        align			:	"br",
+				        singleClick		:	true,
+				        showsTime		:	true,
+				        weekNumbers		:	false,
+				        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+				        onUpdate	:	function(cal) {
+				        	runOnChange('<inp2:$prefix_InputName field='{$field}_date'/>');
+				       	}
+					});
+				</script>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time' input_format='1'/>" value="">
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" field="{$field}_date" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_time" class="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_time" title="$title" is_last="$is_last"/>
-		<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='_regional_InputTimeFormat'/>" tabindex="<inp2:m_get param='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>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_time" title="$title" is_last="$is_last"/>
+			<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='_regional_InputTimeFormat'/>" tabindex="<inp2:m_get param='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>
 
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date' input_format='1'/>" value="">
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" field="{$field}_time" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date' input_format='1'/>" value="">
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" field="{$field}_time" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<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 type="text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_regional_InputDateFormat'/>" tabindex="<inp2:m_get param='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}"/>"
-					     style="cursor: pointer; margin-right: 5px"
-					     title="Date selector"
-					/>
-				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<input type="hidden" id="full_date_<inp2:{$prefix}_InputName field='{$field}'/>" value="<inp2:{$prefix}_Field field='{$field}' format=''/>" />
-			<script type="text/javascript">
-				Calendar.setup({
-			        inputField	:	"full_date_<inp2:{$prefix}_InputName field='{$field}'/>",
-			        ifFormat	:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field='{$field}' input_format='1'/>"),
-			        button		:	"cal_img_<inp2:{$prefix}_InputName field='{$field}'/>",
-			        align		:	"br",
-			        singleClick	:	true,
-			        showsTime	:	true,
-			        weekNumbers	:	false,
-			        firstDay	:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
-			        onUpdate	:	function(cal) {
-			        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>") );
-			        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_time" input_format="1"/>") );
-			       	}
-				});
-			</script>
-			&nbsp;<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='_regional_InputTimeFormat'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_time' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<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 type="text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_regional_InputDateFormat'/>" tabindex="<inp2:m_get param='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}"/>"
+						     style="cursor: pointer; margin-right: 5px"
+						     title="Date selector"
+						/>
+					<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+				<input type="hidden" id="full_date_<inp2:{$prefix}_InputName field='{$field}'/>" value="<inp2:{$prefix}_Field field='{$field}' format=''/>" />
+				<script type="text/javascript">
+					Calendar.setup({
+				        inputField	:	"full_date_<inp2:{$prefix}_InputName field='{$field}'/>",
+				        ifFormat	:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field='{$field}' input_format='1'/>"),
+				        button		:	"cal_img_<inp2:{$prefix}_InputName field='{$field}'/>",
+				        align		:	"br",
+				        singleClick	:	true,
+				        showsTime	:	true,
+				        weekNumbers	:	false,
+				        firstDay	:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+				        onUpdate	:	function(cal) {
+				        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>") );
+				        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_time" input_format="1"/>") );
+				       	}
+					});
+				</script>
+				&nbsp;<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='_regional_InputTimeFormat'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_time' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_textarea" class="" format="" edit_template="popups/editor" allow_html="allow_html" style="text-align: left; width: 100%; height: 100px;" control_options="false">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" style="height: auto">
-		<td class="label-cell" 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'/>')" 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>
-			<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
-				<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
-				<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openwin(this.href, 'html_edit', 800, 575); return false;">
-					<img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0">
-				</a>
-				<!--## <a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a> ##-->
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" style="height: auto">
+			<td class="label-cell" 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'/>')" 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>
+				<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
+					<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
+					<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openwin(this.href, 'html_edit', 800, 575); return false;">
+						<img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0">
+					</a>
+					<!--## <a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a> ##-->
+				</inp2:m_if>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+				<script type="text/javascript">
+					if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+						fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+					}
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+				</script>
+			<td class="control-cell">
+				<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
+				<script type="text/javascript">
+					Form.addControl('<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
+				</script>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-		</td>
-		<td class="control-mid">&nbsp;</td>
-			<script type="text/javascript">
-				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
-					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
-				}
-				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
-			</script>
-		<td class="control-cell">
-			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
-			<script type="text/javascript">
-				Form.addControl('<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
-			</script>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_fck" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
-	<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
-		<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:FCKEditor field="$field" width="100%" bgcolor="$bgcolor" height="200" late_load="1"/>
-			<script type="text/javascript">
-				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
-					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
-				}
-				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
+			<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:FCKEditor field="$field" width="100%" bgcolor="$bgcolor" height="200" late_load="1"/>
+				<script type="text/javascript">
+					if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+						fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+					}
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
 
-				Form.addControl('<inp2:$prefix_InputName field="$field"/>___Frame', <inp2:m_param name="control_options"/>);
-			</script>
-		</td>
-	</tr>
+					Form.addControl('<inp2:$prefix_InputName field="$field"/>___Frame', <inp2:m_param name="control_options"/>);
+				</script>
+			</td>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_codepress" is_last="" style="width: 100%;" language="html" control_options="false">
-	<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
-		<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>
-				<script type="text/javascript">
-					CodePress.path = '<inp2:m_TemplatesBase/>/themes/codepress/'; // set path here, because script tags are not found in table cells
-				</script>
-				<inp2:m_Set codepress_included="1"/>
-			</inp2:m_ifnot>
-			<textarea id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" class="codepress <inp2:m_Param name='language'/>" style="<inp2:m_Param name='style'/>"><inp2:$prefix_Field field="$field"/></textarea>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
+			<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>
+					<script type="text/javascript">
+						CodePress.path = '<inp2:m_TemplatesBase/>/themes/codepress/'; // set path here, because script tags are not found in table cells
+					</script>
+					<inp2:m_Set codepress_included="1"/>
+				</inp2:m_ifnot>
+				<textarea id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" class="codepress <inp2:m_Param name='language'/>" style="<inp2:m_Param name='style'/>"><inp2:$prefix_Field field="$field"/></textarea>
 
-			<script type="text/javascript">
-				Application.setHook(
-					new Array ('<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGoToTab', '<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGo', '<inp2:m_Param name="prefix" js_escape="1"/>:OnSave', '<inp2:m_Param name="prefix" js_escape="1"/>:OnCreate', '<inp2:m_Param name="prefix" js_escape="1"/>:OnUpdate'),
-					function($event) {
-						<inp2:m_Param name="field"/>.toggleEditor(); // enable textarea back to save data
-						$event.status = true;
+				<script type="text/javascript">
+					Application.setHook(
+						new Array ('<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGoToTab', '<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGo', '<inp2:m_Param name="prefix" js_escape="1"/>:OnSave', '<inp2:m_Param name="prefix" js_escape="1"/>:OnCreate', '<inp2:m_Param name="prefix" js_escape="1"/>:OnUpdate'),
+						function($event) {
+							<inp2:m_Param name="field"/>.toggleEditor(); // enable textarea back to save data
+							$event.status = true;
+						}
+					);
+					if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+						fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
 					}
-				);
-				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
-					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
-				}
-				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
 
-				Form.addControl('<inp2:$prefix_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
-			</script>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+					Form.addControl('<inp2:$prefix_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
+				</script>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_textarea_ml">
 	<inp2:m_RenderElement name="inp_edit_textarea" format="no_default" pass_params="true"/>
-	<!--##<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<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>
-			<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
-			<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator', 1);" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
-		</td>
-		<td class="control-mid">&nbsp;</td>
-		<td>
-			<textarea tabindex="<inp2:m_get param='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"/></textarea>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>##-->
+	<!--##
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<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>
+				<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
+				<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator', 1);" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td>
+				<textarea tabindex="<inp2:m_get param='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"/></textarea>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
+	##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<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 param='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">
-				<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');">
-			<inp2:m_else/>
-				<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:m_t t='user_selector' pass='all,$prefix' escape='1'/>', '<inp2:m_param name='field'/>');">
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<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 param='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">
+					<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');">
+				<inp2:m_else/>
+					<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:m_t t='user_selector' pass='all,$prefix' escape='1'/>', '<inp2:m_param name='field'/>');">
+				</inp2:m_if>
+	          		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
+	         	</a>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-          		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
-         	</a>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_category" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<table cellpadding="0" cellspacing="0">
-				<tr>
-					<td id="<inp2:{$prefix}_InputName field='$field'/>_path">
-						<inp2:m_DefineElement name="category_caption">
-							<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
-								<inp2:m_param name="separator"/>
-							</inp2:m_ifnot>
-							<inp2:m_param name="cat_name"/>
-						</inp2:m_DefineElement>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<table cellpadding="0" cellspacing="0">
+					<tr>
+						<td id="<inp2:{$prefix}_InputName field='$field'/>_path">
+							<inp2:m_DefineElement name="category_caption">
+								<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
+									<inp2:m_param name="separator"/>
+								</inp2:m_ifnot>
+								<inp2:m_param name="cat_name"/>
+							</inp2:m_DefineElement>
 
-						<inp2:$prefix_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
-						<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
-					</td>
-					<td valign="middle">
-						<img src="img/spacer.gif" width="3" height="1" alt=""/>
-						<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:adm_SelectorLink prefix='$prefix' selection_mode='single' tab_prefixes='none'/>', '<inp2:m_param name='field'/>');">
-			          		 <img src="img/icons/icon24_cat.gif" border="0"/>
-			         	</a>
+							<inp2:$prefix_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
+							<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
+						</td>
+						<td valign="middle">
+							<img src="img/spacer.gif" width="3" height="1" alt=""/>
+							<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:adm_SelectorLink prefix='$prefix' selection_mode='single' tab_prefixes='none'/>', '<inp2:m_param name='field'/>');">
+				          		 <img src="img/icons/icon24_cat.gif" border="0"/>
+				         	</a>
 
-			         	<a href="#" onclick="disable_category('<inp2:m_Param name='field'/>'); return false;"><inp2:m_Phrase name="la_Text_Disable"/></a>
+				         	<a href="#" onclick="disable_category('<inp2:m_Param name='field'/>'); return false;"><inp2:m_Phrase name="la_Text_Disable"/></a>
 
-			         	<script type="text/javascript">
-				         	function disable_category($field) {
-				         		var $field = '<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field);
-						    	set_hidden_field($field, '');
-						    	document.getElementById($field + '_path').style.display = 'none';
-						    }
-					    </script>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+				         	<script type="text/javascript">
+					         	function disable_category($field) {
+					         		var $field = '<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field);
+							    	set_hidden_field($field, '');
+							    	document.getElementById($field + '_path').style.display = 'none';
+							    }
+						    </script>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_option_item">
@@ -605,42 +643,46 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_options" is_last="" onchange="" has_empty="0" empty_value="" style="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>">
-				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>">
+					<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
+						<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					<inp2:m_else/>
+						<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					</inp2:m_if>
+				</select>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="" style="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<select multiple tabindex="<inp2:m_get param='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">
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-			<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>"/>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<select multiple tabindex="<inp2:m_get param='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">
+						<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					<inp2:m_else/>
+						<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					</inp2:m_if>
+				</select>
+				<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>"/>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_radio_item" onclick="" onchange="">
@@ -652,36 +694,40 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
-				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
-			<inp2:m_else />
-				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
+					<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
+				<inp2:m_else />
+					<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
+				</inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
-		<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 param='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'/>" onclick="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));" onchange="<inp2:m_param name='onchange'/>">-->
-			<input tabindex="<inp2:m_get param='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'/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
+			<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 param='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'/>" onclick="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));" onchange="<inp2:m_param name='onchange'/>">-->
+				<input tabindex="<inp2:m_get param='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'/>">
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+			</inp2:m_if>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_checkbox_item">
@@ -693,62 +739,183 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" pass_tabindex="" is_last="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
-				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_phrase" selected="checked"/>
-			<inp2:m_else/>
-				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_item" selected="checked"/>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
+					<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_phrase" selected="checked"/>
+				<inp2:m_else/>
+					<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_item" selected="checked"/>
+				</inp2:m_if>
+				<inp2:m_RenderElement prefix="$prefix" name="inp_edit_hidden" field="$field" db="db"/>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-			<inp2:m_RenderElement prefix="$prefix" name="inp_edit_hidden" field="$field" db="db"/>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkbox_allow_html" is_last="" field_class="" onchange="" onclick="" title="la_enable_html" hint_label="la_Warning_Enable_HTML">
 	<inp2:m_RenderElement name="inp_edit_checkbox" pass_params="1"/>
 
-	<!--##<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+	<!--##
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 
-		<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 param='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'/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label">
-				<span class="hint"><inp2:m_phrase label="$hint_label"/></span>
-			</inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>##-->
+			<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 param='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'/>">
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label">
+					<span class="hint"><inp2:m_phrase label="$hint_label"/></span>
+				</inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
+	##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" maxlength="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<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 param='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'/>">
-				<inp2:m_phrase label="la_kg" />
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<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 param='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'/>">
+					<inp2:m_phrase label="la_kg" />
+				</inp2:m_if>
+				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
+					<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_a'/>" id="<inp2:{$prefix}_InputName field='{$field}_a'/>" value="<inp2:{$prefix}_Field field='{$field}_a'/>" tabindex="<inp2:m_get param='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'/>">
+					<inp2:m_phrase label="la_lbs" />
+					<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_b'/>" id="<inp2:{$prefix}_InputName field='{$field}_b'/>" value="<inp2:{$prefix}_Field field='{$field}_b'/>" tabindex="<inp2:m_get param='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'/>">
+					<inp2:m_phrase label="la_oz" />
+				</inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 			</inp2:m_if>
-			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
-				<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_a'/>" id="<inp2:{$prefix}_InputName field='{$field}_a'/>" value="<inp2:{$prefix}_Field field='{$field}_a'/>" tabindex="<inp2:m_get param='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'/>">
-				<inp2:m_phrase label="la_lbs" />
-				<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_b'/>" id="<inp2:{$prefix}_InputName field='{$field}_b'/>" value="<inp2:{$prefix}_Field field='{$field}_b'/>" tabindex="<inp2:m_get param='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'/>">
-				<inp2:m_phrase label="la_oz" />
-			</inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
+		</tr>
+	</inp2:m_if>
 </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_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+			<td class="control-cell">
+				<table>
+					<tr>
+						<td colspan="2">
+							<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name='la_btn_Add'/>" id="<inp2:$prefix_InputName field='$field'/>_add_button"/>
+							<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name='la_btn_Cancel'/>" id="<inp2:$prefix_InputName field='$field'/>_cancel_button"/>
+						</td>
+					</tr>
+					<tr>
+						<td valign="top">
+							<select multiple tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:$prefix_InputName field='$field'/>_minput" style="<inp2:m_Param name='style'/>">
+							</select>
+						</td>
+						<td valign="top">
+							<inp2:m_if check="m_Param" name="allow_edit">
+								<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_Edit'/>" id="<inp2:$prefix_InputName field='$field'/>_edit_button"/><br />
+								<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
+							</inp2:m_if>
+
+							<inp2:m_if check="m_Param" name="allow_delete">
+								<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_Delete'/>" id="<inp2:$prefix_InputName field='$field'/>_delete_button"/><br />
+							</inp2:m_if>
+
+							<inp2:m_if check="m_Param" name="allow_move">
+								<br /><br />
+								<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_MoveUp'/>" id="<inp2:$prefix_InputName field='$field'/>_moveup_button"/><br />
+							<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
+								<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_MoveDown'/>" id="<inp2:$prefix_InputName field='$field'/>_movedown_button"/><br />
+							</inp2:m_if>
+						</td>
+					</tr>
+					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field" db="db"/>
+					<script type="text/javascript">
+						var <inp2:m_Param name="field"/> = new MultiInputControl('<inp2:m_Param name="field"/>', '<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>', fields['<inp2:m_Param name="prefix"/>'], '<inp2:m_Param name="format"/>');
+						<inp2:m_Param name="field"/>.ValidateURL = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnValidateMInputFields" js_escape="1"/>';
+						<inp2:m_if check="m_Param" name="allow_add">
+							<inp2:m_Param name="field"/>.SetPermission('add', true);
+						</inp2:m_if>
+						<inp2:m_if check="m_Param" name="allow_edit">
+							<inp2:m_Param name="field"/>.SetPermission('edit', true);
+						</inp2:m_if>
+						<inp2:m_if check="m_Param" name="allow_delete">
+							<inp2:m_Param name="field"/>.SetPermission('delete', true);
+						</inp2:m_if>
+						<inp2:m_if check="m_Param" name="allow_move">
+							<inp2:m_Param name="field"/>.SetPermission('move', true);
+						</inp2:m_if>
+						<inp2:m_Param name="field"/>.InitEvents();
+
+						<inp2:m_Param name="field"/>.SetMessage('required_error', '<inp2:m_Phrase name="la_error_required" escape="1"/>');
+						<inp2:m_Param name="field"/>.SetMessage('unique_error', '<inp2:m_Phrase name="la_error_unique" escape="1"/>');
+						<inp2:m_Param name="field"/>.SetMessage('delete_confirm', '<inp2:m_Phrase label="la_Delete_Confirm" escape="1"/>');
+						<inp2:m_Param name="field"/>.SetMessage('add_button', '<inp2:m_Phrase name="la_btn_Add" escape="1"/>');
+						<inp2:m_Param name="field"/>.SetMessage('save_button', '<inp2:m_Phrase name="la_btn_Save" escape="1"/>');
+					</script>
+				</table>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" size="15">
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<table cellpadding="0" cellspacing="0">
+					<tr>
+						<td><strong><inp2:m_Phrase label="la_SelectedItems" /></strong></td>
+						<td>&nbsp;</td>
+						<td><strong><inp2:m_Phrase label="la_AvailableItems" /></strong></td>
+					</tr>
+					<tr>
+						<td>
+							<inp2:m_DefineElement name="picker_option_block">
+								<option value="<inp2:Field name='$key_field' />"><inp2:Field name="$value_field" /></option>
+							</inp2:m_DefineElement>
+
+							<select multiple id="<inp2:$prefix_InputName name='$field' />_selected" style="<inp2:m_param name='style'/>" size="<inp2:m_param name='size'/>">
+								<inp2:$optprefix.selected_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" requery="1" link_to_prefix="$prefix" link_to_field="$field"/>
+							</select>
+						</td>
+						<td align="center">
+							<img src="img/icons/icon_left.gif" id="<inp2:$prefix_InputName name="$field" />_move_left_button"/><br />
+							<img src="img/icons/icon_right.gif" id="<inp2:$prefix_InputName name="$field" />_move_right_button"/>
+						</td>
+						<td>
+							<select multiple id="<inp2:$prefix_InputName name='$field' />_available" style="<inp2:m_param name='style'/>" size="<inp2:m_param name='size'/>">
+								<inp2:$optprefix.available_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" requery="1" per_page="-1" link_to_prefix="$prefix" link_to_field="$field"/>
+							</select>
+						</td>
+					</tr>
+				</table>
+
+				<input type="hidden" name="<inp2:$prefix_InputName name='$field' />" id="<inp2:$prefix_InputName name='$field' />" value="<inp2:$prefix_Field field='$field' db='db'/>">
+				<input type="hidden" name="unselected_<inp2:$prefix_InputName name='$field' />" id="<inp2:$prefix_InputName name='$field' />_available_field" value="">
+
+				<script type="text/javascript">
+					<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
+					<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
+				</script>
+
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_filler" control_options="false">
 	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" style="height: auto">
 		<td class="label-cell-filler" ></td>
@@ -930,112 +1097,3 @@
   		</tr>
 	</table>
 </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="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="control-cell">
-			<table>
-				<tr>
-					<td colspan="2">
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name='la_btn_Add'/>" id="<inp2:$prefix_InputName field='$field'/>_add_button"/>
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name='la_btn_Cancel'/>" id="<inp2:$prefix_InputName field='$field'/>_cancel_button"/>
-					</td>
-				</tr>
-				<tr>
-					<td valign="top">
-						<select multiple tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:$prefix_InputName field='$field'/>_minput" style="<inp2:m_Param name='style'/>">
-						</select>
-					</td>
-					<td valign="top">
-						<inp2:m_if check="m_Param" name="allow_edit">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_Edit'/>" id="<inp2:$prefix_InputName field='$field'/>_edit_button"/><br />
-							<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
-						</inp2:m_if>
-
-						<inp2:m_if check="m_Param" name="allow_delete">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_Delete'/>" id="<inp2:$prefix_InputName field='$field'/>_delete_button"/><br />
-						</inp2:m_if>
-
-						<inp2:m_if check="m_Param" name="allow_move">
-							<br /><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_MoveUp'/>" id="<inp2:$prefix_InputName field='$field'/>_moveup_button"/><br />
-						<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name='la_btn_MoveDown'/>" id="<inp2:$prefix_InputName field='$field'/>_movedown_button"/><br />
-						</inp2:m_if>
-					</td>
-				</tr>
-				<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field" db="db"/>
-				<script type="text/javascript">
-					var <inp2:m_Param name="field"/> = new MultiInputControl('<inp2:m_Param name="field"/>', '<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>', fields['<inp2:m_Param name="prefix"/>'], '<inp2:m_Param name="format"/>');
-					<inp2:m_Param name="field"/>.ValidateURL = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnValidateMInputFields" js_escape="1"/>';
-					<inp2:m_if check="m_Param" name="allow_add">
-						<inp2:m_Param name="field"/>.SetPermission('add', true);
-					</inp2:m_if>
-					<inp2:m_if check="m_Param" name="allow_edit">
-						<inp2:m_Param name="field"/>.SetPermission('edit', true);
-					</inp2:m_if>
-					<inp2:m_if check="m_Param" name="allow_delete">
-						<inp2:m_Param name="field"/>.SetPermission('delete', true);
-					</inp2:m_if>
-					<inp2:m_if check="m_Param" name="allow_move">
-						<inp2:m_Param name="field"/>.SetPermission('move', true);
-					</inp2:m_if>
-					<inp2:m_Param name="field"/>.InitEvents();
-
-					<inp2:m_Param name="field"/>.SetMessage('required_error', '<inp2:m_Phrase name="la_error_required" escape="1"/>');
-					<inp2:m_Param name="field"/>.SetMessage('unique_error', '<inp2:m_Phrase name="la_error_unique" escape="1"/>');
-					<inp2:m_Param name="field"/>.SetMessage('delete_confirm', '<inp2:m_Phrase label="la_Delete_Confirm" escape="1"/>');
-					<inp2:m_Param name="field"/>.SetMessage('add_button', '<inp2:m_Phrase name="la_btn_Add" escape="1"/>');
-					<inp2:m_Param name="field"/>.SetMessage('save_button', '<inp2:m_Phrase name="la_btn_Save" escape="1"/>');
-				</script>
-			</table>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" size="15">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<table cellpadding="0" cellspacing="0">
-				<tr>
-					<td><strong><inp2:m_Phrase label="la_SelectedItems" /></strong></td>
-					<td>&nbsp;</td>
-					<td><strong><inp2:m_Phrase label="la_AvailableItems" /></strong></td>
-				</tr>
-				<tr>
-					<td>
-						<inp2:m_DefineElement name="picker_option_block">
-							<option value="<inp2:Field name='$key_field' />"><inp2:Field name="$value_field" /></option>
-						</inp2:m_DefineElement>
-
-						<select multiple id="<inp2:$prefix_InputName name='$field' />_selected" style="<inp2:m_param name='style'/>" size="<inp2:m_param name='size'/>">
-							<inp2:$optprefix.selected_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" requery="1" link_to_prefix="$prefix" link_to_field="$field"/>
-						</select>
-					</td>
-					<td align="center">
-						<img src="img/icons/icon_left.gif" id="<inp2:$prefix_InputName name="$field" />_move_left_button"/><br />
-						<img src="img/icons/icon_right.gif" id="<inp2:$prefix_InputName name="$field" />_move_right_button"/>
-					</td>
-					<td>
-						<select multiple id="<inp2:$prefix_InputName name='$field' />_available" style="<inp2:m_param name='style'/>" size="<inp2:m_param name='size'/>">
-							<inp2:$optprefix.available_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" requery="1" per_page="-1" link_to_prefix="$prefix" link_to_field="$field"/>
-						</select>
-					</td>
-				</tr>
-			</table>
-
-			<input type="hidden" name="<inp2:$prefix_InputName name='$field' />" id="<inp2:$prefix_InputName name='$field' />" value="<inp2:$prefix_Field field='$field' db='db'/>">
-			<input type="hidden" name="unselected_<inp2:$prefix_InputName name='$field' />" id="<inp2:$prefix_InputName name='$field' />_available_field" value="">
-
-			<script type="text/javascript">
-				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
-				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
-			</script>
-
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>