Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r5060 -r5061
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5060)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5061)
@@ -53,8 +53,8 @@
 					
 					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
-							$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'tab_id') + '_form';
-							std_delete_items($Catalog.getCurrentPrefix());
+							var $module_path = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'module_path');
+							std_delete_items($Catalog.getCurrentPrefix(), $module_path + '/catalog_tab', 1);
 						} ) );	
 					 	
 					 	
@@ -137,7 +137,7 @@
 <inp2:m_RenderElement name="kernel_form_end"/>
 <!-- main kernel_form: end -->
 
-<!-- category path + search box: begin -->
+<!-- category list: begin -->
 <table id="c_search_warning" width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_notop" style="display: none">
 		<tr>
 		<td valign="top" class="hint_red">
@@ -146,6 +146,8 @@
 		</tr>
 </table>
 
+<inp2:m_set t="xml/categories_list"/>
+<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
 		<td width="100%" valign="middle">
@@ -156,8 +158,7 @@
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
-						<input type="text" id="c_search_keyword" name="c_search_keyword" value="<inp2:c_SearchKeyword no_special="1"/>" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
-						<inp2:m_recall var="c_search_keyword" no_null="no_null" special="1"/>
+						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
 					</td>
 					<td id="search_buttons[c]">
 						<script type="text/javascript">
@@ -169,10 +170,10 @@
 		</td>
 	</tr>
 </table>
-<!-- category path + search box: end -->
 
-<!-- categories list: begin -->
 <div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons=""></div>
+<inp2:m_RenderElement name="kernel_form_end"/>
+<inp2:m_set t="catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->