Index: trunk/kernel/admin_templates/incs/ajax.js
===================================================================
diff -u -N -r5002 -r5030
--- trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5002)
+++ trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5030)
@@ -27,7 +27,9 @@
 				}
 			}
 		}
-		req.open(Request.method, p_url, true);
+		
+		var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes';
+		req.open(Request.method, p_url + $ajax_mark, true);
 		if (Request.method == 'POST') {
 			req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 			req.setRequestHeader("referer", p_url);
Index: trunk/kernel/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r5013 -r5030
--- trunk/kernel/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5013)
+++ trunk/kernel/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5030)
@@ -210,7 +210,7 @@
 		
 		function showDebug($text, $params)
 		{
-			$is_ajax = isset($params['ajax']) || isset($params['tab_init']);
+			$is_ajax = $this->Application->GetVar('ajax') == 'yes' || isset($params['ajax']) || isset($params['tab_init']);
 			if (!$this->Application->isDebugMode() || $is_ajax) return true;
 			echo $text.'<br />';
 		}
Index: trunk/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r5027 -r5030
--- trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 5027)
+++ trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 5030)
@@ -21,7 +21,6 @@
 
 Catalog.prototype.submit_kernel_form = function($form_name, $result_div) {
 	var $kf = document.getElementById($form_name);
-	set_hidden_field('ajax', 'yes');
 	
 	Request.params = Request.serializeForm($kf);
 	Request.method = $kf.method.toUpperCase();
@@ -31,6 +30,12 @@
 
 Catalog.prototype.successCallback = function($request, $params) {
 	var $text = $request.responseText;
+	if ($text.match(/^#redirect#(.*)/)) {
+		// redirect to external template requested
+		window.location.href = RegExp.$1;
+		return false;
+	}
+	
 	$params = $params.split(',');
 	var $js_end = $text.indexOf($Catalog.Separator);
 	if ($js_end != -1) {
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r5027 -r5030
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5027)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5030)
@@ -18,7 +18,7 @@
 	  		<script type="text/javascript" src="incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			_progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
-				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" ajax="yes" no_amp="1"/>', 'catalog_');	
+				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#"/>', 'catalog_');	
 				var a_toolbar = new ToolBar();
 					 	
 					a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
@@ -39,9 +39,13 @@
 					 	) ); 
 					
 					 	
-					a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', edit) );
+					a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', function() {
+							$edit_url = '<inp2:m_t t="categories/categories_edit" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c"/>';
+							window.location.href = $edit_url.replace('#CATEGORY_ID#', get_hidden_field('m_cat_id'));
+								
+							}
+						) );
 					
-					
 					<inp2:m_ModuleInclude template="catalog_tab" tab_init="1"/>
 					
 					
@@ -68,7 +72,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 					
 					a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
-							$Catalog.submit_event(this.ActivePrefix, 'OnExport');
+							$Catalog.submit_event($Catalog.ActivePrefix, 'OnExport');
 						}
 				 	) );
 					
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -N -r5027 -r5030
--- trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 5027)
+++ trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 5030)
@@ -21,7 +21,6 @@
 
 Catalog.prototype.submit_kernel_form = function($form_name, $result_div) {
 	var $kf = document.getElementById($form_name);
-	set_hidden_field('ajax', 'yes');
 	
 	Request.params = Request.serializeForm($kf);
 	Request.method = $kf.method.toUpperCase();
@@ -31,6 +30,12 @@
 
 Catalog.prototype.successCallback = function($request, $params) {
 	var $text = $request.responseText;
+	if ($text.match(/^#redirect#(.*)/)) {
+		// redirect to external template requested
+		window.location.href = RegExp.$1;
+		return false;
+	}
+	
 	$params = $params.split(',');
 	var $js_end = $text.indexOf($Catalog.Separator);
 	if ($js_end != -1) {
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r5022 -r5030
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5022)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5030)
@@ -55,7 +55,7 @@
 													'tree_site'		=>	Array('format' => '!la_selecting_categories!'),
 											),
 					
-					'PermSection'		=>	Array('main' => 'in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
+					'PermSection'		=>	Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
 					
 					'Sections'			=>	Array(
 													// "Structure & Data" section
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r5027 -r5030
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5027)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5030)
@@ -18,7 +18,7 @@
 	  		<script type="text/javascript" src="incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			_progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
-				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" ajax="yes" no_amp="1"/>', 'catalog_');	
+				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#"/>', 'catalog_');	
 				var a_toolbar = new ToolBar();
 					 	
 					a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
@@ -39,9 +39,13 @@
 					 	) ); 
 					
 					 	
-					a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', edit) );
+					a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', function() {
+							$edit_url = '<inp2:m_t t="categories/categories_edit" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c"/>';
+							window.location.href = $edit_url.replace('#CATEGORY_ID#', get_hidden_field('m_cat_id'));
+								
+							}
+						) );
 					
-					
 					<inp2:m_ModuleInclude template="catalog_tab" tab_init="1"/>
 					
 					
@@ -68,7 +72,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 					
 					a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
-							$Catalog.submit_event(this.ActivePrefix, 'OnExport');
+							$Catalog.submit_event($Catalog.ActivePrefix, 'OnExport');
 						}
 				 	) );
 					
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r5022 -r5030
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5022)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5030)
@@ -55,7 +55,7 @@
 													'tree_site'		=>	Array('format' => '!la_selecting_categories!'),
 											),
 					
-					'PermSection'		=>	Array('main' => 'in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
+					'PermSection'		=>	Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
 					
 					'Sections'			=>	Array(
 													// "Structure & Data" section
Index: trunk/kernel/units/general/cat_tag_processor.php
===================================================================
diff -u -N -r5002 -r5030
--- trunk/kernel/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 5002)
+++ trunk/kernel/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 5030)
@@ -107,8 +107,6 @@
 		
 		function ExportStatus($params)
 		{
-			define('DBG_SKIP_REPORTING', 1);
-			
 			$export_object =& $this->Application->recallObject('CatItemExportHelper');
 
 			$event = new kEvent($this->getPrefixSpecial().':OnDummy');
Index: trunk/core/units/general/cat_tag_processor.php
===================================================================
diff -u -N -r5002 -r5030
--- trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 5002)
+++ trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 5030)
@@ -107,8 +107,6 @@
 		
 		function ExportStatus($params)
 		{
-			define('DBG_SKIP_REPORTING', 1);
-			
 			$export_object =& $this->Application->recallObject('CatItemExportHelper');
 
 			$event = new kEvent($this->getPrefixSpecial().':OnDummy');
Index: trunk/kernel/admin_templates/incs/export.js
===================================================================
diff -u -N -r4358 -r5030
--- trunk/kernel/admin_templates/incs/export.js	(.../export.js)	(revision 4358)
+++ trunk/kernel/admin_templates/incs/export.js	(.../export.js)	(revision 5030)
@@ -54,6 +54,7 @@
 		if ($http_request.status == 200) {
 //			alert('readyState: '+$http_request.readyState+' status: '+$http_request.status);
 			var $progress = parseFloat($http_request.responseText);
+//			alert('progress from xml: '+$http_request.responseText+'; type: '+typeof($http_request.responseText));
 			if ($progress) {
 				setProgress($progress);
 				if ($progress < 100) {
Index: trunk/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r5013 -r5030
--- trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5013)
+++ trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5030)
@@ -210,7 +210,7 @@
 		
 		function showDebug($text, $params)
 		{
-			$is_ajax = isset($params['ajax']) || isset($params['tab_init']);
+			$is_ajax = $this->Application->GetVar('ajax') == 'yes' || isset($params['ajax']) || isset($params['tab_init']);
 			if (!$this->Application->isDebugMode() || $is_ajax) return true;
 			echo $text.'<br />';
 		}