Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11538 -r11623
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11623)
@@ -1,121 +1,118 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" system_permission="1" title_preset="" tab_preset="" grid="Default" module="" icon="">
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
 	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
 		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	</inp2:m_if>
 	<inp2:m_if check="m_Param" name="permission_type">
-		<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="$system_permission"/>
+		<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" perm_event="$perm_event" perm_prefix="$perm_prefix" system="$system_permission"/>
 	<inp2:m_else/>
-		<inp2:m_RequireLogin permissions="{$perm_section}" system="$system_permission"/>
+		<inp2:m_RequireLogin permissions="{$perm_section}" perm_event="$perm_event" perm_prefix="$perm_prefix" system="$system_permission"/>
 	</inp2:m_if>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" info="module_path" module="$module"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>>
-				<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
-		    		<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" info="module_path" module="$module"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" info="label"/>">&nbsp;<inp2:adm_SectionInfo section="$section" info="label"/>
-		   		</td>
-			</tr>
-		</table>
+		<inp2:m_if check="m_GetConfig" name="UseSmallHeader">
+			<img src="img/spacer.gif" height="8" width="1" alt=""/>
+		<inp2:m_else/>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+				<!--## <tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<tr>
+					<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
+			    		<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" parent="1" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>" alt=""/>&nbsp;<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>
+			   		</td>
+			   		<inp2:m_if check="m_Param" name="additional_title_render_as">
+						<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
+					</inp2:m_if>
+				</tr>
+			</table>
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:m_if check="m_Param" name="additional_title_render_as">
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+				<!--## <tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<tr>
+					<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
+				</tr>
+			</table>
+		</inp2:m_if>
 	</inp2:m_if>
 
+	<inp2:$prefix_ModifyUnitConfig pass_params="1"/>
+
 	<inp2:m_if check="m_Param" name="tabs">
-		<inp2:m_include t="$tabs"/>
+		<inp2:m_include t="$tabs" pass_params="1"/>
 	</inp2:m_if>
 
 	<inp2:m_if check="m_Param" name="tab_preset">
 		<inp2:m_RenderElement name="edit_tabs" prefix="$prefix" preset_name="$tab_preset"/>
 	</inp2:m_if>
 
-	<table cellpadding="0" cellspacing="0" width="100%">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" style="height: 30px;">
 		<tr>
-			<td class="tablenav">
-				<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
-					<tr>
-						<td class="header_left_bg" nowrap valign="middle">
-							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
-							<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="$default_title" cut_first="100" {$prefix}[grid]="{$grid}" pass_params="true"/></span>
-						</td>
-						<td align="right" valign="middle">
-							<script type="text/javascript">
-								set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
-							</script>
-							<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-								<script>
-									var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-									$help_url = $help_url.replace(/#/g, '%23');
-								</script>
-								<a href="javascript: OpenHelp($help_url);">
-									<img src="img/blue_bar_help.gif" border="0">
-								</a>
-							</inp2:m_if>
-							<inp2:m_if check="m_Param" name="pagination">
-								<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
-							</inp2:m_if>
-						</td>
-					</tr>
-				</table>
+			<td class="header_left_bg" nowrap="nowrap" style="vertical-align: middle;">
+				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
+				<inp2:adm_SectionInfo section="$section" parent="1" info="label" result_to_var="group_title"/>
+				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/></span>
 			</td>
+			<td align="right" class="tablenav" style="vertical-align: middle;">
+				<inp2:m_if check="m_Param" name="additional_blue_bar_render_as">
+					<inp2:m_RenderElement name="$additional_blue_bar_render_as" />
+				<inp2:m_else/>
+					<inp2:m_if check="m_Param" name="pagination">
+						<inp2:$prefix_SelectParam possible_names="pagination_prefix,prefix" result_to_var="pagination_prefix"/>
+						<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$pagination_prefix" pass_params="1"/>
+					</inp2:m_if>
+				</inp2:m_if>
+			</td>
 		</tr>
 	</table>
 
+	<script type="text/javascript">
+		var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
+		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+		setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
+	</script>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="section_header">
-	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
-		<inp2:m_RenderElement name="section_header_new" pass_params="true"/>
-	<inp2:m_else />
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr class="section_header_bg">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
-		    		<img width="46" height="46" src="img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
-		   		</td>
-			</tr>
-		</table>
-	</inp2:m_if>
+	<strong>DEPRICATED. PLEASE USE "COMBINED_HEADER"</strong>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="section_header_new" module="#session#">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
-		    		<img width="46" height="46" src="<inp2:ModulePath module="$module"/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
-		   		</td>
+<inp2:m_DefineElement name="blue_bar" module="" icon="" pagination="0">
+	<!--## DEPRICATED, BUT USED IN "no_permission.tpl". ##-->
+		<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" style="height: 30px;">
+			<tr>
+				<td class="header_left_bg" nowrap="nowrap" valign="middle">
+					<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
+				</td>
+				<td align="right" class="tablenav" valign="middle">
+					<script type="text/javascript">
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+						setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
+					</script>
+					<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+						<script>
+							var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+							$help_url = $help_url.replace(/#/g, '%23');
+						</script>
+					</inp2:m_if>
+					<inp2:m_if check="m_Param" name="pagination">
+						<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
+					</inp2:m_if>
+				</td>
 			</tr>
 		</table>
-</inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="blue_bar" module="" icon="" pagination="0">
-	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
-		<tr>
-			<td class="header_left_bg" nowrap width="80%" valign="middle">
-				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
-			</td>
-			<td align="right" class="tablenav" width="20%" valign="middle">
-				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-					<script>
-						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-						$help_url = $help_url.replace(/#/g, '%23');
-						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
-					</script>
-					<a href="javascript: OpenHelp($help_url);">
-						<img src="img/blue_bar_help.gif" border="0">
-					</a>
-				</inp2:m_if>
-				<inp2:m_if check="m_Param" name="pagination">
-					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
-				</inp2:m_if>
-			</td>
-		</tr>
-	</table>
+		<script type="text/javascript">
+			var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
+		</script>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_original_label">
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="subsection" prefix="">
+<inp2:m_DefineElement name="subsection" prefix="" colspan="4">
 	<tr class="subsectiontitle">
-		<td colspan="3"><inp2:m_phrase label="$title"/></td>
+		<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>
@@ -126,26 +123,35 @@
 
 <inp2:m_DefineElement name="inp_edit_field_caption" title="" subfield="" NamePrefix="">
 	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="text" nowrap>
+	<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"/>')">
 		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:m_param name="NamePrefix"/><inp2:InputName field="$field" subfield="$subfield"/>">
-				<span class="<inp2:m_if check="HasError" field="$field" >error</inp2:m_if>">
-				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error">&nbsp;*</span></inp2:m_if>:
+			<label for="<inp2:m_param name="NamePrefix"/><inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>">
+				<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error-cell</inp2:m_if>" >
+				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:
 			</label>
 		<inp2:m_else/>
 			&nbsp;
 		</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>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" is_last="" as_label="" currency="" nl2br="0" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" 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 valign="top" class="text">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
+		<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>
 		</td>
-    	<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
@@ -160,41 +166,44 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_error">
-	<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+	<script type="text/javascript">
+		add_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>', '<inp2:{$prefix}_InputName field="$field"/>', '<inp2:{$prefix}_Error field="$field" js_escape="1"/>')
+	</script>
+	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
-			<input type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" 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"/>">
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_password" class="" size="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
-			<input 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"/>" />
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
+		<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 />
@@ -219,17 +228,37 @@
 			</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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
+<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_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" style="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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="uploader-text">
+		<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">
@@ -302,136 +331,180 @@
 						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder'
 					}
 				)
-				UploadsManager.formContainerId = 'scroll_container';
 			</script>
 
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_box_ml" class="" size="" onblur="" maxlength="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</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>
-			<input 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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
-		<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>
-
 <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="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
-			<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;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+	<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">
-				initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+				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>
-		<td class="error"><inp2:{$prefix}_Error field="{$field}_date"/>&nbsp;</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_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_time" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$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}_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>
-		<td class="error"><inp2:{$prefix}_Error field="{$field}_time"/>&nbsp;</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_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
+		<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">
-				initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+				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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_textarea" class="" allow_html="allow_html">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>
+<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">
-				<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:{$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>
-			<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>
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label">
-				<br /><span class="small"><inp2:m_phrase label="$hint_label"/></span>
-			</inp2:m_if>
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_textarea_ml" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>
+<inp2:m_DefineElement name="inp_edit_fck" subfield="" 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="4" 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>
+</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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
+		<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"/>');">
@@ -441,17 +514,17 @@
           		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
          	</a>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
 <inp2:m_DefineElement name="inp_edit_category" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
+		<td class="control-cell">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td id="<inp2:{$prefix}_InputName field="$field"/>_path">
@@ -462,7 +535,7 @@
 							<inp2:m_param name="cat_name"/>
 						</inp2:m_DefineElement>
 
-						<inp2:{$prefix}_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
+						<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">
@@ -484,7 +557,7 @@
 				</tr>
 			</table>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -496,10 +569,10 @@
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_options" is_last="" has_empty="0" empty_value="" onchange="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
+		<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"/>
@@ -508,17 +581,17 @@
 				</inp2:m_if>
 			</select>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
+		<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"/>
@@ -528,7 +601,7 @@
 			</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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
@@ -544,32 +617,32 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
 <inp2:m_DefineElement name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
@@ -585,40 +658,43 @@
 	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field="$field"/>');"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<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>
+		<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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
-<inp2:m_DefineElement name="inp_edit_checkbox_allow_html" field_class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td colspan="2">
-			<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
-			<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:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'))">
-			<br>
-			<span class="hint"><img src="img/smicon7.gif" width="14" height="14" align="absmiddle"><inp2:m_phrase label="la_Warning_Enable_HTML"/></span>
+<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"/>
+
+		<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>
-		<td>&nbsp;</td>
-	</tr>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+	</tr>##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_weight" subfield="" class="" is_last="" maxlength="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<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>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
@@ -632,20 +708,29 @@
 				<inp2:m_phrase label="la_oz" />
 			</inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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>
 
 <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>
+		<td class="control-mid-filler" ></td>
+		<td class="control-cell-filler">
+			<div id="form_filler" style="width: 100%; height: 5px; background-color: inherit"></div>
+			<script type="text/javascript">
+				Form.addControl('form_filler', <inp2:m_param name="control_options"/>);
+			</script>
+		</td>
+	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="ajax_progress_bar">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-		<tr class="table-color1">
+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td colspan="2">
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 				<!-- progress bar paddings: begin -->
@@ -683,19 +768,19 @@
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 			</td>
 		</tr>
-		<tr class="table-color2">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
 			<td id="progress_display[percents_completed]">0%</td>
 		</tr>
-		<tr class="table-color1">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
 			<td id="progress_display[elapsed_time]">00:00</td>
 		</tr>
-		<tr class="table-color2">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
 			<td id="progress_display[Estimated_time]">00:00</td>
 		</tr>
-		<tr class="table-color1">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="center" colspan="2">
 				<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
 			</td>
@@ -732,7 +817,7 @@
 				<div style="overflow: hidden; height: 23px;" class="tab-viewport">
 					<table class="tabs" cellpadding="0" cellspacing="0" height="23">
 						<tr>
-							<inp2:m_RenderElement name="$tabs_render_as" />
+							<inp2:m_RenderElement name="$tabs_render_as" pass_params="1"/>
 						</tr>
 					</table>
 				</div>
@@ -760,45 +845,89 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="ml_selector" prefix="">
-
+<inp2:m_DefineElement name="ml_selector" prefix="" field="Translated">
+	<inp2:m_if check="lang_IsMultiLanguage">
+		<td align="right" style="padding-right: 5px;">
+			<table width="100%" cellpadding="0" cellspacing="0">
+				<tr>
+					<td align="right">
+						<inp2:m_phrase name="la_fld_Language"/>:
+						<select name="language" onchange="submit_event('<inp2:m_param name="prefix"/>', 'OnPreSaveAndChangeLanguage');">
+							<inp2:m_DefineElement name="lang_elem">
+								<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
+							</inp2:m_DefineElement>
+							<inp2:lang_PrintList render_as="lang_elem"/>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td align="right">
+						<inp2:m_if check="lang_IsPrimaryLanguage">
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="1">
+							<input type="checkbox" disabled id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" checked="checked"/>
+						<inp2:m_else/>
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>">
+							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));" />
+						</inp2:m_if>
+						<label for="_cb_<inp2:{$prefix}_InputName field="$field"/>"><inp2:m_Phrase label="la_Translated"/></label>
+					</td>
+				</tr>
+				<tr>
+					<td align="right" style="vertical-align: bottom; padding: 2px 0px 5px 2px;">
+						<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
+					</td>
+				</tr>
+			</table>
+		</td>
+	<inp2:m_else/>
+		<td align="right" style="vertical-align: bottom; padding: 2px 5px 5px 2px;">
+			<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
+		</td>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_error_warning">
-
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
+  		<tr>
+    		<td valign="top" class="form-warning">
+    			<inp2:m_phrase name="la_Warning_NewFormError"/><br/>
+    			<span id="error_msg_<inp2:m_Param name="prefix"/>" style="font-weight: bold"><br/></span>
+    		</td>
+  		</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="table-color1" even="table-color2"/>">
+	<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>
+		<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"/>
+						<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 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 />
+							<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 />
+							<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 />
+							<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 />
+							<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>
@@ -828,14 +957,14 @@
 				</script>
 			</table>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</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="table-color1" even="table-color2"/>">
+	<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>
+		<td class="control-cell">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td><strong><inp2:m_Phrase label="la_SelectedItems" /></strong></td>
@@ -853,8 +982,8 @@
 						</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"/>
+						<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"/>">
@@ -864,15 +993,15 @@
 				</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="">
+			<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"/> = 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>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 	</tr>
 </inp2:m_DefineElement>