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');
 						}
 				 	) );