Index: branches/RC/core/admin_templates/js/catalog.js
===================================================================
diff -u -r10116 -r11163
--- branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 10116)
+++ branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11163)
@@ -155,7 +155,7 @@
 	this.resetTabs(false);
 
 	// query sub categories of $cat_id
-	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'in-portal/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
+	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'categories/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
 
 	var $prefix = this.TabRegistry[0]['prefix'];
 	var $tab_id = this.TabRegistry[0]['tab_id'];
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r11113 -r11163
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11113)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11163)
@@ -33,25 +33,25 @@
 
 					var a_toolbar = new ToolBar();
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_GoUp" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_GoUp" escape="1"/>', function() {
 								$Catalog.go_to_cat($Catalog.ParentCategoryID);
 							}
 					 	) );
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
 								$Catalog.go_to_cat(0);
 							}
 					 	) );
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
 								std_precreate_item('c', 'categories/categories_edit');
 							}
 					 	) );
 
 
-				a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
@@ -99,7 +99,7 @@
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
 							var $export_prefixes = new Array('l', 'p', 'n');
 							if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
 								$Catalog.storeIDs('export_categories');
@@ -111,26 +111,26 @@
 						}
 				 	) );
 
-				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
+				 	a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
 				 			redirect('<inp2:m_t t="categories/cache_updater" pass="m"/>');
 						}
 				 	) );
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
 							$Catalog.submit_event(null, 'OnCut');
 						}
 				 	) );
 
-				 	a_toolbar.AddButton( new ToolBarButton('in-portal:copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
+				 	a_toolbar.AddButton( new ToolBarButton('copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
 							$Catalog.submit_event(null, 'OnCopy');
 						}
 				 	) );
 
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
 							$Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
 								$object.resetTabs(true);
 								$object.switchTab();