Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r11495 -r11504
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11495)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11504)
@@ -61,16 +61,8 @@
 <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">
@@ -79,20 +71,8 @@
 			<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_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_checkbox" prefix="c" field="AutomaticFilename" title=" la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_Filename" size="70" /> <!-- la_fld_CategoryFilename -->
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
@@ -187,10 +167,17 @@
 			}
 		}
 	}
+
+	function reflectFilename() {
+    	var $checked = getControl('AutomaticFilename', null, '_cb').checked;
+    	getControl('Filename').readOnly = $checked;
+    }
+
 	$(document).ready(
 		function() {
 			reflectMenuIcon();
 			reflectExternalUrl();
+			reflectFilename();
 //			OnSystemClick();
 		}
 	);