Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r11146 -r11368
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11146)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11368)
@@ -1,95 +1,109 @@
-<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-	<div id="categories_div" prefix="c.showall" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
-	<script type="text/javascript">$Catalog.registerTab('categories');</script>
-<inp2:m_else/>
-	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
-	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
-	<inp2:m_include t="incs/blocks"/>
-	<inp2:m_include t="incs/grid_blocks"/>
-	<inp2:m_include t="categories/ci_blocks"/>
-	<inp2:c.showall_InitList parent_cat_id="any" no_special="1"/>
-	$Catalog.setItemCount('c.showall', '<inp2:c.showall_CatalogItemCount no_special="1"/>');
-	$Catalog.setCurrentCategory('c.showall', <inp2:m_get name="m_cat_id"/>);
-	<inp2:m_if check="m_CheckPermission" permissions="CATEGORY.VIEW" pass_params="true">
-		<inp2:m_RenderElement name="grid_js" selected_class="table_white_selected" tag_name="td" PrefixSpecial="c.showall" IdField="CategoryId" grid="Default" menu_filters="yes"/>
-		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="c.showall" grid="Default" ajax="1"/>
-		Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline'));
-		<inp2:m_if check="m_GetEquals" name="tm" value="single">
-			Grids['c.showall'].EnableRadioMode();
-			Grids['c.showall'].DblClick = function() {return false};
+<inp2:m_DefineElement name="catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+		 	a_toolbar.AddButton(
+				new ToolBarButton(
+					'new_cat',
+					'<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>',
+					function() {
+						$form_name = $Catalog.queryTabRegistry('prefix', '<inp2:m_param name="prefix"/>', 'tab_id') + '_form';
+						std_precreate_item('<inp2:m_param name="prefix"/>', 'categories/categories_edit');
+					}, true
+				)
+			);
 		</inp2:m_if>
-	</inp2:m_if>
 
-	<inp2:m_if check="m_Recall" name="root_delete_error">
-		alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
-		<inp2:m_RemoveVar name="root_delete_error"/>
-	</inp2:m_if>
-	#separator#
-	<inp2:m_if check="m_CheckPermission" permissions="CATEGORY.VIEW" pass_params="true">
-		<!-- categories tab: begin -->
-		<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
+		<inp2:m_if check="m_Param" name="tab_init" equals_to="2">
+			<div id="categories_div" prefix="<inp2:m_param name='prefix'/>" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="new_cat" class="catalog-tab"></div>
+			<script type="text/javascript">$Catalog.registerTab('categories');</script>
+		</inp2:m_if>
 
-		<inp2:m_DefineElement name="category_caption">
-			<inp2:m_if check="m_ParamEquals" name="cat_id" value="0" inverse="inverse">
-			<inp2:m_param name="separator"/>
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
+			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+		<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+
+		<inp2:m_if check="m_Param" name="prefix" equals_to="c.showall">
+			<inp2:$prefix_InitList grid="$grid_name" parent_cat_id="any"/>
+		<inp2:m_else/>
+			<inp2:$prefix_InitList grid="$grid_name"/>
+		</inp2:m_if>
+
+		// substiture form action, like from was created from here
+		document.getElementById('categories_form').action = '<inp2:m_t pass="all" no_amp="1" js_escape="1"/>';
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:$prefix_CatalogItemCount/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_DefineElement name="page_browse_td" format="">
+			<inp2:m_if check="m_Param" name="Special" equals_to="showall|user">
+				<inp2:Field field="$field" grid="$grid" format="$format"/>
+				<inp2:m_if check="Field" field="IsSystem">
+					<span class="field-required">&nbsp;*</span>
+				</inp2:m_if>
+				<br />
+		    	<span class="cats_stats">
+		    		<inp2:Field name="ParentId" result_to_var="item_category"/>
+		    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName cat_id="$item_category"/></a><br />
+		    	</span>
+			<inp2:m_else/>
+				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
+				<inp2:m_if check="Field" field="IsSystem">
+					<span class="field-required">&nbsp;*</span>
+				</inp2:m_if>
 			</inp2:m_if>
-			<inp2:m_param name="cat_name"/>
-		</inp2:m_DefineElement>
 
-		<inp2:m_DefineElement name="category_td">
-			<td valign="top" class="table_white text" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="CategoryId"/>" width="50%">
-				<input type="<inp2:m_if check="m_GetEquals" name="tm" value="single">radio<inp2:m_else/>checkbox</inp2:m_if>" name="<inp2:InputName field="$IdField"/>" id="<inp2:InputName field="$IdField"/>">
-				<img src="<inp2:ModulePath module="in-portal"/>img/itemicons/<inp2:ItemIcon grid="Default"/>">&nbsp;<span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse"><sup><inp2:Field field="Priority"/></sup></inp2:m_if></span>
-				<span class="link"><b><inp2:Field name="Name" no_special="1"/></b></span><span class="cat_desc">:</span>
-				<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
-				<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
-				<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span><br>
-				<div style="padding-left: 3px;">
-					<inp2:m_if check="m_ParamEquals" name="Special" value="showall">
-				    	<span class="cats_stats">
-				    		<inp2:Field name="ParentId" result_to_var="item_category"/>
-				    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:FieldCategoryPath field="ParentId" separator=" &gt; " render_as="category_caption" /></a>
-				    	</span>
-				    	<br />
-					</inp2:m_if>
-					<inp2:m_if check="Field" name="Description" no_special="1" first_chars="30">
-						<span class="cat_desc"><inp2:Field field="Description" no_special="1" first_chars="30"/></span><br>
-					</inp2:m_if>
-					<inp2:m_if check="m_IsDebugMode">
-						<span class="cat_desc">ParentPath: <b><inp2:Field name="ParentPath"/></b></span><br />
-					</inp2:m_if>
-					<span class="cats_stats">(<inp2:Field field="CreatedOn" format="_regional_DateFormat"/>)</span><br />
-					<img src="img/blank.gif" width="1" height="4">
-				</div>
-			</td>
-		</inp2:m_DefineElement>
+			<!--<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>-->
 
-		<inp2:c.showall_SaveWarning name="grid_save_warning" no_toolbar="no_toolbar"/>
-		<inp2:m_if check="m_RecallEquals" var="c.showall_search_keyword" value="" inverse="inverse">
-		<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_nobottom">
-	  		<tr>
-	    		<td valign="top" class="hint_red">
-	    			<inp2:m_phrase name="la_Warning_Filter"/>
-	    		</td>
-	  		</tr>
-		</table>
-		</inp2:m_if>
+			<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_Browse' html_escape='1'/>">
+				<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_Browse' html_escape='1'/>" border="0"/>
+			</a>
 
-		<inp2:m_RenderElement name="grid_pagination" grid="Default" PrefixSpecial="c.showall" no_special="1" search="on" no_toolbar="no_toolbar" ajax="1"/>
-		<br />
+			<!--&nbsp;
+			<span class="priority">
+				<inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse">
+					<sup><inp2:Field field="Priority"/></sup>
+				</inp2:m_if>
+			</span>-->
 
-		<inp2:m_DefineElement name="wg_empty_cell">
-			<td width="<inp2:m_param name="column_width"/>%">&nbsp;</td>
+
+
+			<br />
+			<inp2:m_if check="m_IsDebugMode">
+				PP: <inp2:Field name="ParentPath"/>
+			</inp2:m_if>
 		</inp2:m_DefineElement>
 
-		<table width="100%" border="0" cellspacing="2" cellpadding="4">
-			<inp2:m_set c.showall_sequence="1" odd_even="table-color1"/>
-			<inp2:c.showall_PrintList2 block="category_td" no_special="1" IdField="CategoryId" empty_cell_render_as="wg_empty_cell" direction="V" columns="2"/>
-		</table>
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="CategoryId" grid="$grid_name"  menu_filters="yes"/>
+		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
 
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
+
+		<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0">
+			a_toolbar.DisableButton('upcat');
+			a_toolbar.DisableButton('homecat');
+		<inp2:m_else/>
+			a_toolbar.EnableButton('upcat');
+			a_toolbar.EnableButton('homecat');
+		</inp2:m_if>
+		$Catalog.reflectPasteButton(<inp2:$prefix_HasClipboard/>);
+
+		<inp2:m_if check="m_Recall" name="root_delete_error">
+			alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
+			<inp2:m_RemoveVar name="root_delete_error"/>
+		</inp2:m_if>
+		#separator#
+		<!-- categories tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
+		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="CategoryId" grid="$grid_name" menu_filters="yes"/>
 		<inp2:m_RenderElement name="kernel_form_end"/>
 		<!-- categories tab: end -->
-	<inp2:m_else/>
-		<inp2:m_RenderElement name="no_perm_grid" perm_label="la_text_NoCategories"/>
 	</inp2:m_if>
-</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:c_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file