Index: branches/RC/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r11411 -r11538
--- branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11411)
+++ branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11538)
@@ -1,12 +1,8 @@
 <inp2:adm_SetPopupSize width="850" height="600"/>
-<inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_LanguagePacks!"/>
+<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="languages_edit_general" tab_preset="Default"/>
 
-<inp2:m_include t="regional/languages_edit_tabs"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="lang" title_preset="languages_edit_general" module="in-portal" icon="icon46_conf_regional"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -57,50 +53,53 @@
 </table>
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
+<inp2:lang_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="!la_fld_LocalName!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="!la_fld_Charset!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/>
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="!la_fld_LocalName!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="!la_fld_Charset!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/>
 
-		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="AdminInterfaceLang" title="la_fld_AdminInterfaceLang"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="!la_fld_Locale!"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" control_options="{min_height: 200}" cols="50" rows="10"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="AdminInterfaceLang" title="la_fld_AdminInterfaceLang"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="!la_fld_Locale!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" control_options="{min_height: 200}" cols="50" rows="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
 
-	<inp2:m_if check="lang_IsNewMode">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<td class="text">
-			<inp2:m_phrase name="la_fld_CopyLabels"/>:
-		</td>
-		<td>
-			<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
+			<inp2:m_if check="lang_IsNewMode">
+				<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+					<inp2:m_inc param="tab_index" by="1"/>
+					<td class="label-cell">
+						<inp2:m_phrase name="la_fld_CopyLabels"/>:
+					</td>
+					<td class="control-mid">&nbsp;</td>
+					<td class="control-cell">
+						<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
+						<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
 
-			<inp2:m_inc param="tab_index" by="1"/>
-			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
-				<option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
-				<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
-			</select>
-		</td>
-		<td class="error">&nbsp;</td>
-	</tr>
-	</inp2:m_if>
-</table>
+						<inp2:m_inc param="tab_index" by="1"/>
+						<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
+							<option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
+							<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
+						</select>
+					</td>
+				</tr>
+			</inp2:m_if>
+	</table>
 </div>
-<inp2:m_include t="incs/footer"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file