Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r11113 -r11368
--- branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11113)
+++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11368)
@@ -1,17 +1,47 @@
 <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:c_InitList no_special="1" per_page="-1"/>
-Grids['c'] = new Grid('c', 'table_white_selected', ':original', edit, a_toolbar);
-Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
-Grids['c'].InitItems();
+<inp2:m_include t="incs/in-portal"/>
+<inp2:m_include t="categories/ci_blocks"/>
+
+<inp2:c_InitList grid="Structure" no_special="1"/>
+
+<inp2:m_DefineElement name="page_entercat_td" format="" no_special="">
+	<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');">
+		<inp2:m_Phrase label="lu_ViewSubPages"/>
+	</a> <span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="page_browse_td" format="" no_special="">
+	<a href="<inp2:PageBrowseLink/>"><inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/></a>
+
+	<!--&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_if check="Field" field="IsSystem">
+		<span class="field-required">&nbsp;*</span>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+var catalog_height = $Catalog.BottomVisible ? 200 : 'auto';
+
+<inp2:m_if check="m_GetEquals" name="tm" value="single">
+	<inp2:m_RenderElement name="grid_js" PrefixSpecial="c" IdField="CategoryId" grid="Structure" grid_height="catalog_height" no_special="1" grid_status="0" menu_filters="yes" selector="radio"/>
+<inp2:m_else/>
+	<inp2:m_RenderElement name="grid_js" PrefixSpecial="c" IdField="CategoryId" grid="Structure" grid_height="catalog_height" no_special="1" grid_status="0" menu_filters="yes"/>
+</inp2:m_if>
+
 Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-<inp2:c_ViewMenu block="nlsmenu_declaration" grid="Default" no_special="1" menu_perpage="no" menu_filters="yes" ajax="1"/>
 
 // substiture form action, like from was created from here
 document.getElementById('categories_form').action = '<inp2:m_t pass="all" js_escape="1"/>';
 $Catalog.setItemCount('c', '<inp2:c_TotalRecords no_special="1"/>');
+
+document.getElementById('top_pagination_bar[c]').innerHTML = '<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="c" no_special="1" ajax="1" js_escape="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"/>';
@@ -37,7 +67,6 @@
 	a_toolbar.EnableButton('homecat');
 </inp2:m_if>
 <inp2:m_if check="m_GetEquals" name="tm" value="single">
-	Grids['c'].EnableRadioMode();
 	Grids['c'].DblClick = function() {return false};
 </inp2:m_if>
 $Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
@@ -46,38 +75,8 @@
 	alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
 	<inp2:m_RemoveVar name="root_delete_error"/>
 </inp2:m_if>
+GridScrollers['c'].afterLoad();
 #separator#
 <inp2:c_UpdateLastTemplate template="catalog/catalog"/>
-<inp2:m_include t="categories/ci_blocks"/>
-<br />
-<table border="0" width="100%">
-	<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>
-			<a class="link" href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');"><b><inp2:Field name="Name" no_special="1"/></b></a><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="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="<inp2:ModulePath module="in-portal"/>img/spacer.gif" width="1" height="4">
-			</div>
-		</td>
-	</inp2:m_DefineElement>
-	<inp2:m_if check="c_TotalRecords" no_special="1">
-		<inp2:c_CategoryList no_special="1" block_main="category_td" per_page="-1" columns="2" direction="V" IdField="CategoryId" />
-	<inp2:m_else/>
-		<tr>
-			<td class="text">
-				<inp2:m_phrase name="la_text_NoCategories"/>
-			</td>
-		</tr>
-	</inp2:m_if>
-</table></br>
+
+<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="c" IdField="CategoryId" grid="Structure" no_special="1" grid_status="0" menu_filters="yes"/>
\ No newline at end of file