Index: branches/5.0.x/themes/advanced/platform/sitemap.tpl
===================================================================
diff -u -r12407 -r12884
--- branches/5.0.x/themes/advanced/platform/sitemap.tpl	(.../sitemap.tpl)	(revision 12407)
+++ branches/5.0.x/themes/advanced/platform/sitemap.tpl	(.../sitemap.tpl)	(revision 12884)
@@ -43,11 +43,10 @@
 				<inp2:m_include template="platform/elements/categories.elm"/>
 
 				<div id="sitemap">
-
-				<ul>
-					<inp2:c_ListCategories types="menu" render_as="sitemap_category_element" per_page="100" columns="1" direction="H" parent_cat_id="0" no_table="1"/>
-				</ul>
-
+					<ul>
+						<inp2:m_Set sitemap_level="0"/>
+						<inp2:c_PrintList types="menu" render_as="sitemap_category_element" max_levels="3" per_page="100" parent_cat_id="0"/>
+					</ul>
 				</div>
 			</inp2:m_RenderElement>
 		</div>
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12877 -r12884
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12877)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12884)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12877 2009-11-03 20:10:32Z alex $
+* @version	$Id: categories_tag_processor.php 12884 2009-11-10 08:48:08Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -362,7 +362,10 @@
 
 	function BuildListSpecial($params)
 	{
-		if ($this->Special != '') {
+		if (($this->Special != '') && !is_numeric($this->Special)) {
+			// When recursive category list is printed (like in sitemap), then special
+			// should be generated even if it's already present. Without it list on this
+			// level will erase list on previous level, because it will be stored in same object.
 			return $this->Special;
 		}
 
Index: branches/5.0.x/themes/simple/sitemap.tpl
===================================================================
diff -u -r12877 -r12884
--- branches/5.0.x/themes/simple/sitemap.tpl	(.../sitemap.tpl)	(revision 12877)
+++ branches/5.0.x/themes/simple/sitemap.tpl	(.../sitemap.tpl)	(revision 12884)
@@ -13,16 +13,34 @@
 			<div class="content">
 				<h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
 				<inp2:st_ContentBlock num="1"/>
-
-				<inp2:m_DefineElement name="sitemap_element">
-	 				<li>
-	 					<a href="<inp2:m_Link template='$template' m_cat_id='$cat_id' use_section='$use_section' m_cat_page='1'/>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
-	   				</li>
- 				</inp2:m_DefineElement>
-
- 				<ul>
-					<inp2:st_CachedMenu render_as="sitemap_element" category_id="1" per_page="-1"/>
-				</ul>
+				                
+                <inp2:m_DefineElement name="more_link_elem">
+                	<li>
+                		<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:m_Phrase label="lu_more"/>...</a>
+                	</li>
+                </inp2:m_DefineElement>
+                
+                <inp2:m_DefineElement name="sitemap_category_element" level_var="sitemap_level" max_levels="0">
+                	<li>
+                		<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
+                
+                		<inp2:m_ifnot check="m_Get" name="$level_var" equals_to="$max_levels">
+                			<inp2:InitList requery="1" per_page="50"/>
+                
+                			<inp2:m_if check="TotalRecords">
+                				<ul>
+                					<inp2:m_Inc param="$level_var" by="1"/>
+                					<inp2:PrintList render_as="sitemap_category_element" max_levels="$max_levels" more_link_render_as="more_link_elem"/>
+                				</ul>
+                			</inp2:m_if>
+                		</inp2:m_ifnot>
+                	</li>
+                </inp2:m_DefineElement>
+              
+				<ul>
+					<inp2:m_Set sitemap_level="0"/>
+					<inp2:c_PrintList types="menu" render_as="sitemap_category_element" max_levels="3" per_page="100" parent_cat_id="0"/>
+				</ul>				
 			</div>
 			<div class="round-bottom"></div>
 		</div>
Index: branches/5.0.x/themes/advanced/platform/elements/categories.elm.tpl
===================================================================
diff -u -r12666 -r12884
--- branches/5.0.x/themes/advanced/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 12666)
+++ branches/5.0.x/themes/advanced/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 12884)
@@ -82,52 +82,25 @@
 
 <!--## SITEMAP ELEMENTS ##-->
 <inp2:m_DefineElement name="more_link_elem">
-<li>
-	<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:m_Phrase label="lu_more"/>...</a>
-</li>
+	<li>
+		<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:m_Phrase label="lu_more"/>...</a>
+	</li>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="sitemap_category_element3">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>1
-</li>
-</inp2:m_DefineElement>
+<inp2:m_DefineElement name="sitemap_category_element" level_var="sitemap_level" max_levels="0">
+	<li>
+		<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
 
-<inp2:m_DefineElement name="sitemap_category_element2">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
-	<inp2:InitList requery="1"/>
-	<inp2:m_if check="TotalRecords">
-	<ul>
-		<inp2:ListCategories render_as="sitemap_category_element2" more_link_render_as="more_link_elem" max_items="50" no_table="1"/>
-	</ul>
-	</inp2:m_if>
-</li>
-</inp2:m_DefineElement>
+		<inp2:m_ifnot check="m_Get" name="$level_var" equals_to="$max_levels">
+			<inp2:InitList requery="1" per_page="50"/>
 
-<inp2:m_DefineElement name="sitemap_category_element1">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
-	<inp2:InitList requery="1"/>
-	<inp2:m_if check="TotalRecords">
-	<ul>
-		<inp2:ListCategories render_as="sitemap_category_element2" max_items="50" more_link_render_as="more_link_elem" no_table="1"/>
-	</ul>
-	</inp2:m_if>
-</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_category_element">
-	<li>
-		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/> (level 2)</a>
-		<inp2:InitList requery="1" max_items="50" />
-		<inp2:m_if check="TotalRecords">
-		<ul>
-			<inp2:ListCategories render_as="sitemap_category_element1" max_items="100" more_link_render_as="more_link_elem" no_table="1"/>
-		</ul>
-		</inp2:m_if>
+			<inp2:m_if check="TotalRecords">
+				<ul>
+					<inp2:m_Inc param="$level_var" by="1"/>
+					<inp2:PrintList render_as="sitemap_category_element" max_levels="$max_levels" more_link_render_as="more_link_elem"/>
+				</ul>
+			</inp2:m_if>
+		</inp2:m_ifnot>
 	</li>
 </inp2:m_DefineElement>
-
-
 <!--## //SITEMAP ELEMENTS ##-->