Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r11102 -r11495
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11102)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11495)
@@ -51,32 +51,93 @@
 				</inp2:m_if>
 			</script>
 		</td>
+
+		<inp2:m_RenderElement name="ml_selector" prefix="c"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
 <inp2:c_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_DefineElement name="filename_edit">
+	<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_CategoryFilename" size="70" />
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="la_fld_CategoryAutomaticFilename" onclick="reflect_filename()"/>
+	<script type="text/javascript">
+		function reflect_filename() {
+	    	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
+	    	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
+	    }
+
+	    Application.setHook('m:OnAfterWindowLoad', reflect_filename);
+	</script>
+</inp2:m_DefineElement>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_Name!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" rows="7" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_PageTitle!" size="70"/> <!-- la_fld_Name -->
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" control_options="{min_height: 130}" rows="7" cols="70"/>
+
+			<inp2:m_if check="m_IsDebugMode">
+				<inp2:m_if check="c_Field" name="IsSystem" equals_to="1" db="db">
+					<inp2:m_RenderElement name="inp_label" prefix="c" field="Filename" title="la_fld_CategoryFilename" />
+				<inp2:m_else/>
+					<inp2:m_RenderElement name="filename_edit"/>
+				</inp2:m_if>
+			<inp2:m_else/>
+				<inp2:m_if check="c_AllowManualFilenames">
+					<inp2:m_RenderElement name="filename_edit"/>
+				</inp2:m_if>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
+		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c" field="OldPriority"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Title" title="!la_fld_PageContentTitle!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="MenuTitle" title="!la_fld_PageMentTitle!" size="40"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="FriendlyURL" title="la_fld_FriendlyURL" size="63"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="ParentId" title="la_fld_ParentSection"/>
+
+<!--			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="IsSystem" title="!la_fld_IsSystemTemplate!" onchange="OnSystemClick()"/>-->
+
+			<inp2:m_if check="c_Field" name="IsSystem" equals_to="1" db="db">
+				<inp2:m_if check="m_IsDebugMode">
+					<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Template" title="la_fld_TemplateFile" size="40"/>
+				</inp2:m_if>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="Template" title="la_fld_TemplateType" has_empty="1" size="40"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="FormId" title="!la_fld_Form!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="FormSubmittedTemplate" title="la_fld_FormSubmittedTemplate" size="60"/>
+
+			<inp2:m_if check="m_IsDebugMode">
+				<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="IsIndex" title="la_fld_IsIndex"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="IsMenu" title="la_fld_MenuStatus"/>
+
 		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" rows="3" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="4" cols="70"/>
 
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="Priority" title="la_fld_Priority"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="UseMenuIconUrl" title="!la_fld_UseMenuIcon!" onclick="reflectMenuIcon();"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="MenuIconUrl" title="!la_fld_MenuIcon!" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="UseExternalUrl" title="la_fld_UseExternalUrl" onclick="reflectExternalUrl();"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="ExternalUrl" title="la_fld_ExternalUrl" size="60"/>
+
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" allow_html="0" control_options="{min_height: 90}" rows="3" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" allow_html="0" control_options="{min_height: 90}" rows="4" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="!la_fld_TrackingCode!" control_options="{min_height: 90}" allow_html="0"/>
 		<!-- custom fields: begin -->
 		<inp2:m_include t="incs/custom_blocks"/>
 		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
@@ -85,14 +146,54 @@
 		<inp2:m_RenderElement name="inp_edit_filler" />
 	</table>
 </div>
+
 <script type="text/javascript">
-	function reflect_filename()
-    {
-    	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
-    	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
-    }
+	function getControl ($field, $appendix, $prepend) {
+		var $field_mask = '<inp2:c_InputName field="#FIELD_NAME#"/>';
 
-    Application.setHook('m:OnAfterWindowLoad', reflect_filename);
+		$appendix = isset($appendix) ? '_' + $appendix : '';
+		$prepend = isset($prepend) ? $prepend + '_' : '';
+
+		return document.getElementById( $prepend + $field_mask.replace('#FIELD_NAME#', $field) + $appendix );
+	}
+
+	function reflectMenuIcon() {
+		getControl('MenuIconUrl').parentNode.parentNode.style.display = getControl('UseMenuIconUrl', null, '_cb').checked ? '' : 'none';
+	}
+
+	function reflectExternalUrl() {
+		getControl('ExternalUrl').parentNode.parentNode.style.display = getControl('UseExternalUrl', null, '_cb').checked ? '' : 'none';
+	}
+
+	function OnSystemClick() {
+		var cel = getControl('IsSystem', null, '_cb');
+		var tel = getControl('Template');
+
+		if (cel) {
+			if (cel.checked) {
+				cel.setAttribute('old_template', tel.value);
+				tel.value='';
+				tel.disabled = true;
+				tel.readonly = true;
+			}
+			else {
+				var old_template = cel.getAttribute('old_template');
+				tel.disabled = false;
+				tel.readonly = false;
+				if (old_template) {
+					tel.value = old_template;
+				}
+				cel.setAttribute('old_template', '');
+			}
+		}
+	}
+	$(document).ready(
+		function() {
+			reflectMenuIcon();
+			reflectExternalUrl();
+//			OnSystemClick();
+		}
+	);
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file