Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11111 -r11113
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11111)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11113)
@@ -63,7 +63,7 @@
 
 <div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="in-portal/catalog"/>
+<inp2:m_set t="catalog/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: branches/RC/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -N -r9524 -r11113
--- branches/RC/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 9524)
+++ branches/RC/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 11113)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="in-portal"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="in-portal/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="in-portal"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: branches/RC/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r11107 -r11113
--- branches/RC/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11107)
+++ branches/RC/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11113)
@@ -48,7 +48,7 @@
 					<inp2:m_if check="m_ParamEquals" name="Special" value="showall">
 				    	<span class="cats_stats">
 				    		<inp2:Field name="ParentId" result_to_var="item_category"/>
-				    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="in-portal/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:FieldCategoryPath field="ParentId" separator=" &gt; " render_as="category_caption" /></a>
+				    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:FieldCategoryPath field="ParentId" separator=" &gt; " render_as="category_caption" /></a>
 				    	</span>
 				    	<br />
 					</inp2:m_if>
Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11110)
+++ branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11113)
@@ -134,7 +134,7 @@
 																							'parent'		=>	'in-portal:site',
 																							'icon'			=>	'catalog',
 																							'label'			=>	'la_tab_Browse',
-																							'url'			=>	Array('t' => 'in-portal/catalog', 'pass' => 'm'),
+																							'url'			=>	Array('t' => 'catalog/catalog', 'pass' => 'm'),
 																							'late_load'		=>	Array('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 																							'onclick'		=>	'checkCatalog(0)',
 																							'permissions'	=>	Array('view'),
Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11110)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11113)
@@ -33,7 +33,7 @@
 				'parent'		=>	'in-portal:site',
 				'icon'			=>	'in-portal:catalog', // 'proj-cms:structure'
 				'label'			=>	'la_tab_Browse',
-				'url'			=>	Array ('t' => 'in-portal/catalog', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'catalog/catalog', 'pass' => 'm'),
 				'late_load'		=>	Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 				'onclick'		=>	'checkCatalog(0)',
 				'permissions'	=>	Array ('view'),
Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r11107 -r11113
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11107)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11113)
@@ -48,7 +48,7 @@
 					<inp2:m_if check="m_ParamEquals" name="Special" value="showall">
 				    	<span class="cats_stats">
 				    		<inp2:Field name="ParentId" result_to_var="item_category"/>
-				    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="in-portal/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:FieldCategoryPath field="ParentId" separator=" &gt; " render_as="category_caption" /></a>
+				    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:FieldCategoryPath field="ParentId" separator=" &gt; " render_as="category_caption" /></a>
 				    	</span>
 				    	<br />
 					</inp2:m_if>
Index: branches/RC/kernel/units/sections/sections_config.php
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11110)
+++ branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11113)
@@ -33,7 +33,7 @@
 				'parent'		=>	'in-portal:site',
 				'icon'			=>	'in-portal:catalog', // 'proj-cms:structure'
 				'label'			=>	'la_tab_Browse',
-				'url'			=>	Array ('t' => 'in-portal/catalog', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'catalog/catalog', 'pass' => 'm'),
 				'late_load'		=>	Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 				'onclick'		=>	'checkCatalog(0)',
 				'permissions'	=>	Array ('view'),
Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -N -r11107 -r11113
--- branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11107)
+++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11113)
@@ -47,7 +47,7 @@
 	<inp2:m_RemoveVar name="root_delete_error"/>
 </inp2:m_if>
 #separator#
-<inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
+<inp2:c_UpdateLastTemplate template="catalog/catalog"/>
 <inp2:m_include t="categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
Index: branches/RC/kernel/admin_templates/xml/cache_updater.tpl
===================================================================
diff -u -N -r8929 -r11113
--- branches/RC/kernel/admin_templates/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11113)
@@ -1 +1 @@
-<inp2:c_InitCacheUpdater destination_template="in-portal/catalog" progress="1"/>
\ No newline at end of file
+<inp2:c_InitCacheUpdater destination_template="catalog/catalog" progress="1"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11110)
+++ branches/RC/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11113)
@@ -7,7 +7,7 @@
 
 <inp2:m_RenderElement name="blue_bar" prefix="c" title_preset="categories_update" module="in-portal" icon="icon46_catalog"/>
 
-<inp2:m_if check="c_InitCacheUpdater" destination_template="in-portal/catalog">
+<inp2:m_if check="c_InitCacheUpdater" destination_template="catalog/catalog">
 	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
 	    <tr>
 			<td align="center" colspan="3" bgcolor="#FFFFFF">
@@ -36,7 +36,7 @@
 	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 	<script type="text/javascript">
 		function cancel_action() {
-			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
+			redirect('<inp2:m_t t="catalog/catalog" pass="m"/>');
 		}
 
 		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="categories/xml/cache_updater" continue="2" no_amp="1"/>');
Index: branches/RC/kernel/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11110)
+++ branches/RC/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11113)
@@ -7,7 +7,7 @@
 
 <inp2:m_RenderElement name="blue_bar" prefix="c" title_preset="categories_update" module="in-portal" icon="icon46_catalog"/>
 
-<inp2:m_if check="c_InitCacheUpdater" destination_template="in-portal/catalog">
+<inp2:m_if check="c_InitCacheUpdater" destination_template="catalog/catalog">
 	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
 	    <tr>
 			<td align="center" colspan="3" bgcolor="#FFFFFF">
@@ -36,7 +36,7 @@
 	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 	<script type="text/javascript">
 		function cancel_action() {
-			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
+			redirect('<inp2:m_t t="catalog/catalog" pass="m"/>');
 		}
 
 		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="categories/xml/cache_updater" continue="2" no_amp="1"/>');
Index: branches/RC/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11110)
+++ branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11113)
@@ -220,7 +220,7 @@
 
 <div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="in-portal/catalog"/>
+<inp2:m_set t="catalog/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: branches/RC/core/admin_templates/categories/xml/cache_updater.tpl
===================================================================
diff -u -N -r8929 -r11113
--- branches/RC/core/admin_templates/categories/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/categories/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11113)
@@ -1 +1 @@
-<inp2:c_InitCacheUpdater destination_template="in-portal/catalog" progress="1"/>
\ No newline at end of file
+<inp2:c_InitCacheUpdater destination_template="catalog/catalog" progress="1"/>
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11111 -r11113
--- branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11111)
+++ branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11113)
@@ -63,7 +63,7 @@
 
 <div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="in-portal/catalog"/>
+<inp2:m_set t="catalog/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r11110 -r11113
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11110)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11113)
@@ -220,7 +220,7 @@
 
 <div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="in-portal/catalog"/>
+<inp2:m_set t="catalog/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: branches/RC/kernel/admin_templates/xml/tree_categories.tpl
===================================================================
diff -u -N -r9524 -r11113
--- branches/RC/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 9524)
+++ branches/RC/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 11113)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="in-portal"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="in-portal/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath module="in-portal"/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>')" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: branches/RC/core/admin_templates/summary/root.tpl
===================================================================
diff -u -N -r11004 -r11113
--- branches/RC/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11004)
+++ branches/RC/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11113)
@@ -121,7 +121,7 @@
 				<table width="100%" cellspacing="0" cellpadding="4">
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
+							<a class="userslink" href="<inp2:m_t t="catalog/catalog" pass="m"/>">
 								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r10127 -r11113
--- branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 10127)
+++ branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11113)
@@ -19,7 +19,7 @@
 			<br />
 	    	<span class="cats_stats">
 	    		<inp2:Field name="CategoryId" result_to_var="item_category"/>
-	    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="in-portal/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName /></a><br />
+	    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName /></a><br />
 	    	</span>
 		</inp2:m_if>
 	</td>
Index: branches/RC/kernel/admin_templates/summary/root.tpl
===================================================================
diff -u -N -r11004 -r11113
--- branches/RC/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11004)
+++ branches/RC/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11113)
@@ -121,7 +121,7 @@
 				<table width="100%" cellspacing="0" cellpadding="4">
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
+							<a class="userslink" href="<inp2:m_t t="catalog/catalog" pass="m"/>">
 								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
Index: branches/RC/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -N -r11107 -r11113
--- branches/RC/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11107)
+++ branches/RC/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11113)
@@ -47,7 +47,7 @@
 	<inp2:m_RemoveVar name="root_delete_error"/>
 </inp2:m_if>
 #separator#
-<inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
+<inp2:c_UpdateLastTemplate template="catalog/catalog"/>
 <inp2:m_include t="categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
Index: branches/RC/kernel/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r10127 -r11113
--- branches/RC/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 10127)
+++ branches/RC/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11113)
@@ -19,7 +19,7 @@
 			<br />
 	    	<span class="cats_stats">
 	    		<inp2:Field name="CategoryId" result_to_var="item_category"/>
-	    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="in-portal/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName /></a><br />
+	    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName /></a><br />
 	    	</span>
 		</inp2:m_if>
 	</td>