Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -N -r11117 -r11368
--- branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11117)
+++ branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11368)
@@ -64,6 +64,7 @@
 					'TableName'			=>	TABLE_PREFIX.'Category',
 
 					'ViewMenuPhrase'	=>	'la_text_Categories',
+					'CatalogTabIcon' => 'icon16_cat.gif',
 
 					'TitlePresets'		=>	Array(
 													'default'		=>	Array(	'new_status_labels'		=> Array('c' => '!la_title_Adding_Category!'),
@@ -72,7 +73,7 @@
 																		),
 													'category_list' =>	Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
 
-													'catalog' 		=>	Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='c_item_count'>#c_recordcount#</span>)"),
+													'catalog' 		=>	Array('prefixes' => Array('c_List'), 'format' => "<span id='category_path'>!la_title_Categories!</span>"),
 
 													'advanced_view'	=>	Array('prefixes' => Array('c_List'), 'format' => "!la_title_AdvancedView!"),
 
@@ -304,17 +305,47 @@
 					),
 
 					'Grids'	=> Array(
-								'Default'		=>	Array(
-															'Icons' => Array('default'=>'icon16_cat.gif'),
-															'Fields' => Array(
-																				'Name' => Array('title' => 'la_col_Name', 'data_block' => 'category_td'),
-																				'Description' => Array('title' => 'la_col_Description'),
-																				'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
-																		),
+						'Default' => Array (
+							'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
+							'Fields' => Array(
+								'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+								'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
+								'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ),
+								'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
+								'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
+								'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ),
+							),
+						),
 
-													),
-								),
+						'Radio' => Array (
+							'Selector' => 'radio',
+							'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
+							'Fields' => Array(
+								'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', ),
+								'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
+								'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ),
+								'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
+								'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
+								'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ),
+							),
+						),
 
+						'Structure' => Array (
+							'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
+							'Fields' => Array(
+								'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+								'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
+								'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ),
+								'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
+								'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
+								'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+								'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ),
+							),
+						),
+					),
+
+
+
 					'ConfigMapping' => 	Array(
 												'PerPage'				=>	'Perpage_Category',
 												'ShortListPerPage'		=>	'Perpage_Category_Short',