Index: branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl
===================================================================
diff -u -N -r11539 -r11540
--- branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 11539)
+++ branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 11540)
@@ -1,19 +1,32 @@
+<inp2:m_XMLTemplate cache="600"/>
+<inp2:m_Get var="page_id" result_to_var="page_id"/>
+<inp2:m_Inc param="level" by="1"/>
+<inp2:m_Get var="level" result_to_var="level"/>
+<inp2:m_Get var="max_level" result_to_var="max_level"/>
 <inp2:m_Random result_to_var="rand"/>
-<inp2:m_DefineElement name="top_menu_item">
-	<item id="menu<inp2:m_Param name="page_id"/>"
-		url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1"/></inp2:m_if>"
-		<inp2:m_if check="m_Param" name="menu_icon">
-			ico="['<inp2:m_TemplatesBase/><inp2:m_Param name="menu_icon"/>']"
-		<inp2:m_else/>
-			ico="['<inp2:m_TemplatesBase module="In-Portal"/>img/menu_inedit.gif']"
-		</inp2:m_if>
-		enb="true" title=""
-		subid="subpages<inp2:m_Param name="page_id"/>"
-		suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
-		 m_cat_id="$cat_id"
-		 m_cat_page="1"
-		 page_id="$page_id"
-		 level="0" max_level="4"
-		/>" ><![CDATA[<inp2:m_Param name="title"/>]]></item>
-</inp2:m_DefineElement>
-<inp2:st_CachedMenu level="0" category_id="0" render_as="top_menu_item" no_editing="1"/>
\ No newline at end of file
+<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
+<menus>
+  <menu id="subpages<inp2:m_Param name="page_id"/>"
+  		orient="V" showicon="true" showsubicon="true" stlprf=""
+  		submenuic="['<inp2:m_TemplatesBase module="In-portal"/>img/arrow_white.gif']">
+    <items>
+    	<inp2:m_DefineElement name="top_sub_menu_elem">
+				<item id="menu<inp2:m_Param name="page_id"/>" url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" enb="true"
+					<inp2:m_if inverse="1" check="m_ParamEquals" name="level" value="$max_level">
+						<inp2:m_if check="m_Param" name="has_sub_menu">
+							subid="subpages<inp2:m_Param name="page_id"/>"
+							suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
+								m_cat_id="$cat_id"
+								m_cat_page="1"
+								page_id="$page_id"
+								level="$level" max_level="4"
+								rand="$rand" serial="$serial"/>"
+						</inp2:m_if>
+					</inp2:m_if>
+				><![CDATA[<inp2:m_Param name="title"/>]]></item>
+			</inp2:m_DefineElement>
+
+			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem" no_editing="1"/>
+    </items>
+  </menu>
+</menus>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/subcats.xml.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/subcats.xml.tpl	(revision 11495)
+++ branches/RC/themes/default2009/platform/elements/subcats.xml.tpl	(revision 0)
@@ -1,34 +0,0 @@
-<inp2:m_XMLTemplate cache="600"/>
-<inp2:m_Inc param="level" by="1"/>
-<inp2:m_Get var="level" result_to_var="level"/>
-<inp2:m_Get var="max_level" result_to_var="max_level"/>
-<inp2:m_Set c_Page="1"/>
-<inp2:m_Random result_to_var="rand"/>
-<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
-<menus>
-  <menu id="sub<inp2:m_Get var="m_cat_id"/>"
-  		orient="V" showicon="true" showsubicon="true" stlprf=""
-  		submenuic="['<inp2:m_TemplatesBase module="In-portal"/>img/arrow_white.gif']">
-    <items>
-    	<inp2:m_DefineElement name="cat_menu_elem">
-				<item id="sub-elem<inp2:Field name="CategoryId"/>" url="<inp2:CategoryLink template="__default__"/>" enb="true"
-					<inp2:m_if inverse="1" check="m_ParamEquals" name="level" value="$max_level">
-						<inp2:m_if check="Field" name="CachedDescendantCatsQty">
-							subid="sub<inp2:Field name="CategoryId"/>"
-							suburl="<inp2:CategoryLink template="platform/elements/subcats.xml"
-								level="$level"
-								max_level="$max_level"
-								rand="$rand" serial="$serial"/>"
-						</inp2:m_if>
-					</inp2:m_if>
-				><![CDATA[<inp2:Field name="Name"/>]]></item>
-			</inp2:m_DefineElement>
-
-			<inp2:m_DefineElement name="more_menu_elem">
-				<inp2:m_Get var="m_cat_id" result_to_var="cat_id"/>
-				<item id="sub-more<inp2:m_Get var="m_cat_id"/>" url="<inp2:c_CategoryLink cat_id="$cat_id" template="__default__"/>" enb="true"><![CDATA[More...]]></item>
-			</inp2:m_DefineElement>
-			<inp2:c.menu_ListCategories types="menu" no_special="1" render_as="cat_menu_elem" no_table="1" more_link_render_as="more_menu_elem" no_editing="1"/>
-    </items>
-  </menu>
-</menus>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl
===================================================================
diff -u -N -r11539 -r11540
--- branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl	(.../menu_sections.xml.tpl)	(revision 11539)
+++ branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl	(.../menu_sections.xml.tpl)	(revision 11540)
@@ -1,32 +1,19 @@
-<inp2:m_XMLTemplate cache="600"/>
-<inp2:m_Get var="page_id" result_to_var="page_id"/>
-<inp2:m_Inc param="level" by="1"/>
-<inp2:m_Get var="level" result_to_var="level"/>
-<inp2:m_Get var="max_level" result_to_var="max_level"/>
 <inp2:m_Random result_to_var="rand"/>
-<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
-<menus>
-  <menu id="subpages<inp2:m_Param name="page_id"/>"
-  		orient="V" showicon="true" showsubicon="true" stlprf=""
-  		submenuic="['<inp2:m_TemplatesBase module="In-portal"/>img/arrow_white.gif']">
-    <items>
-    	<inp2:m_DefineElement name="top_sub_menu_elem">
-				<item id="menu<inp2:m_Param name="page_id"/>" url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" enb="true"
-					<inp2:m_if inverse="1" check="m_ParamEquals" name="level" value="$max_level">
-						<inp2:m_if check="m_Param" name="has_sub_menu">
-							subid="subpages<inp2:m_Param name="page_id"/>"
-							suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
-								m_cat_id="$cat_id"
-								m_cat_page="1"
-								page_id="$page_id"
-								level="$level" max_level="4"
-								rand="$rand" serial="$serial"/>"
-						</inp2:m_if>
-					</inp2:m_if>
-				><![CDATA[<inp2:m_Param name="title"/>]]></item>
-			</inp2:m_DefineElement>
-
-			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem" no_editing="1"/>
-    </items>
-  </menu>
-</menus>
\ No newline at end of file
+<inp2:m_DefineElement name="top_menu_item">
+	<item id="menu<inp2:m_Param name="page_id"/>"
+		url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1"/></inp2:m_if>"
+		<inp2:m_if check="m_Param" name="menu_icon">
+			ico="['<inp2:m_TemplatesBase/><inp2:m_Param name="menu_icon"/>']"
+		<inp2:m_else/>
+			ico="['<inp2:m_TemplatesBase module="In-Portal"/>img/menu_inedit.gif']"
+		</inp2:m_if>
+		enb="true" title=""
+		subid="subpages<inp2:m_Param name="page_id"/>"
+		suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
+		 m_cat_id="$cat_id"
+		 m_cat_page="1"
+		 page_id="$page_id"
+		 level="0" max_level="4"
+		/>" ><![CDATA[<inp2:m_Param name="title"/>]]></item>
+</inp2:m_DefineElement>
+<inp2:st_CachedMenu level="0" category_id="0" render_as="top_menu_item" no_editing="1"/>
\ No newline at end of file