Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r5006 -r5009
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5006)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5009)
@@ -13,13 +13,13 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
+	  		<script type="text/javascript" src="incs/fw_menu.js"></script>
 	  		<script type="text/javascript" src="incs/ajax.js"></script>
 	  		<script type="text/javascript" src="incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			_progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
-				$Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" ajax="yes" no_amp="1"/>');	
-	  		
-					a_toolbar = new ToolBar();
+				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" ajax="yes" no_amp="1"/>');	
+				var a_toolbar = new ToolBar();
 					 	
 					a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
 								Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
@@ -120,7 +120,8 @@
 						
 					function edit()
 					{
-						std_edit_item('c', 'categories/categories_edit');
+						$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
+						std_edit_item($Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'));
 					}
 			</script>
 		</td>
@@ -162,7 +163,7 @@
 <!-- category path + search box: end -->
 
 <!-- categories list: begin -->
-<div id="categories_div" prefix="c" edit_template="categories/categories_edit"></div>
+<div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons=""></div>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
@@ -197,9 +198,6 @@
 
 <inp2:m_ModuleInclude template="catalog_tab" tab_init="2"/>
 
-
-<script type="text/javascript" src="incs/fw_menu.js"></script>
-
 <!-- Products -->
 <!--<inp2:m_block name="product_caption_td" />
 	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid"/>
@@ -212,6 +210,5 @@
 <inp2:m_include t="incs/footer" noform="yes"/>
 
 <script type="text/javascript">
-	$ViewMenus = new Array('<inp2:c_ListMarker list_name="cats"/>');
 	$Catalog.Init();
 </script>
\ No newline at end of file