Index: trunk/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -r7855 -r8565
--- trunk/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 7855)
+++ trunk/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 8565)
@@ -15,13 +15,13 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				std_edit_item('cf', 'in-portal/custom_fields/custom_fields_edit');
+  				std_edit_item('cf', 'custom_fields/custom_fields_edit');
   			}
 
   			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_CustomField" escape="1"/>',
 						function() {
-							std_precreate_item('cf', 'in-portal/custom_fields/custom_fields_edit')
+							std_precreate_item('cf', 'custom_fields/custom_fields_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
Index: trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r8397 -r8565
--- trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8397)
+++ trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8565)
@@ -58,33 +58,22 @@
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
-
-
 		<inp2:m_ParseBlock name="inp_id_label" prefix="cf" field="CustomFieldId" title="!la_prompt_FieldId!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="MultiLingual" title="!la_fld_MultiLingual!"/>
 
-
-	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
-
-	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
-
 	<inp2:m_ParseBlock name="subsection" title="!la_tab_AdminUI!"/>
-
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
-
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
-
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" use_phrases="1"/>
-
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
-
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
 
 		<inp2:m_if check="m_IsDebugMode">
 			<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="!la_fld_IsSystem!"/>
 		</inp2:m_if>
-
 </table>
 
 <inp2:m_include t="incs/footer"/>