Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r5060 -r5061
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5060)
+++ trunk/core/admin_templates/catalog/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 -->
 
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -N -r5057 -r5061
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5057)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5061)
@@ -431,10 +431,11 @@
 	submit_event(prefix_special,'',edit_template)
 }
 
-function std_delete_items(prefix_special)
+function std_delete_items(prefix_special, t, $ajax)
 {
-	if (inpConfirm('Are you sure you want to delete selected items?'))
-  	submit_event(prefix_special,'OnMassDelete')
+	if (inpConfirm('Are you sure you want to delete selected items?')) {
+  		submit_event(prefix_special, 'OnMassDelete', t, null, $ajax);
+	}
 }
 
 
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -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 -->
 
Index: trunk/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -N -r5041 -r5061
--- trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5041)
+++ trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5061)
@@ -8,6 +8,8 @@
 <inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1"/>
 $Catalog.setItemCount('c', '<inp2:c_TotalRecords no_special="1"/>');
 $Catalog.ParentCategoryID = <inp2:c_GetParentCategory/>;
+document.getElementById('c_search_warning').style.display = '<inp2:m_if check="m_RecallEquals" var="c_search_keyword" value="" inverse="inverse">block<inp2:m_else/>none</inp2:m_if>';
+document.getElementById('c_search_keyword').value = '<inp2:c_SearchKeyword no_special="1" js_escape="1"/>';
 <inp2:m_DefineElement name="root_cat_caption">
 	<span class="NAV_CURRENT_ITEM">
 		<inp2:m_if check="m_ParamEquals" name="current" value="1">
@@ -38,7 +40,6 @@
 </inp2:m_if>
 #separator#
 <inp2:c_UpdateLastTemplate template="catalog"/>
-<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
@@ -61,4 +62,3 @@
 		<span class="text"><inp2:m_phrase name="la_text_NoCategories"/></span>
 	</inp2:m_if>
 </table></br>
-<inp2:m_RenderElement name="kernel_form_end"/>
\ No newline at end of file
Index: trunk/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -N -r5041 -r5061
--- trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5041)
+++ trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 5061)
@@ -8,6 +8,8 @@
 <inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1"/>
 $Catalog.setItemCount('c', '<inp2:c_TotalRecords no_special="1"/>');
 $Catalog.ParentCategoryID = <inp2:c_GetParentCategory/>;
+document.getElementById('c_search_warning').style.display = '<inp2:m_if check="m_RecallEquals" var="c_search_keyword" value="" inverse="inverse">block<inp2:m_else/>none</inp2:m_if>';
+document.getElementById('c_search_keyword').value = '<inp2:c_SearchKeyword no_special="1" js_escape="1"/>';
 <inp2:m_DefineElement name="root_cat_caption">
 	<span class="NAV_CURRENT_ITEM">
 		<inp2:m_if check="m_ParamEquals" name="current" value="1">
@@ -38,7 +40,6 @@
 </inp2:m_if>
 #separator#
 <inp2:c_UpdateLastTemplate template="catalog"/>
-<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
@@ -61,4 +62,3 @@
 		<span class="text"><inp2:m_phrase name="la_text_NoCategories"/></span>
 	</inp2:m_if>
 </table></br>
-<inp2:m_RenderElement name="kernel_form_end"/>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/blocks.tpl
===================================================================
diff -u -N -r4610 -r5061
--- trunk/kernel/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 4610)
+++ trunk/kernel/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 5061)
@@ -1,4 +1,4 @@
-<inp2:m_block name="kernel_form"/>
+<inp2:m_DefineElement name="kernel_form">
 	<inp2:m_if check="m_ParamEquals" name="form_name" value="" inverse="inverse">
 		<inp2:m_set form_name="$form_name"/>
 	<inp2:m_else/>
@@ -7,7 +7,7 @@
 		
 	<form id="<inp2:m_get name="form_name"/>" name="<inp2:m_get name="form_name"/>" enctype="multipart/form-data" method="post" action="<inp2:m_t pass="all"/>">
 		<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="<inp2:m_getconst name="MAX_UPLOAD_SIZE"/>" />
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
 <inp2:m_block name="kernel_form_end"/>
 		<inp2:m_DumpSystemInfo/>