Index: branches/5.1.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r13941 -r13951
--- branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13941)
+++ branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13951)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 13941 2010-09-14 09:16:10Z alex $
+* @version	$Id: categories_config.php 13951 2010-09-15 07:24:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -290,7 +290,6 @@
 				'LocalImage'	=>	'img.LocalImage',
 				'LocalPath'		=>	'img.LocalPath',
 				'FullUrl'		=>	'img.Url',
-				'CreatedBySystem' => 'IF(ThemeId != 0, 1, 0)',
 			),
 			'-virtual' => Array (),
 		),
@@ -299,7 +298,11 @@
 
 		'Fields' => Array (
 		    'CategoryId'				=>	Array ('type' => 'int', 'not_null' => 1,'default' => 0),
-		    'Type'						=>	Array ('type' => 'int', 'not_null' => 1,'default' => 0),
+		    'Type'						=>	Array (
+		    	'type' => 'int',
+		    	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Virtual', 2 => 'la_opt_Template'), 'use_phrases' => 1,
+		    	'not_null' => 1,'default' => 1
+		    ),
 		    'SymLinkCategoryId'			=>	Array ('type' => 'int', 'default' => NULL),
 		    'ParentId'					=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required' => 1),
 		    'Name'						=>	Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
@@ -374,7 +377,7 @@
 			'MetaTitle'			=>	Array ('type' => 'string', 'default' => null),
 			'IndexTools'		=>	Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
 			'IsMenu'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
-			'IsSystem'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_System', 0 => 'la_text_User'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+			'Protected'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 			'FormId'			=>	Array (
 				'type' => 'int',
 				'formatter' => 'kOptionsFormatter', 'options' => Array ('' => ''),
@@ -414,12 +417,11 @@
 			'LocalImage'	=>	Array('type' => 'string', 'default' => ''),
 			'LocalPath'		=>	Array('type' => 'string', 'default' => ''),
 			'FullUrl'		=>	Array('type' => 'string', 'default' => ''),
-			'CreatedBySystem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_System', 0 => 'la_text_User'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 		),
 
 		'Grids'	=> Array(
 			'Default' => Array (
-				'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status'
+				'Icons' => Array( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
 					'default' => 'icon_section.png',
 					'1_0_0' => 'icon16_section_system.png', // system
 					'1_0_1' => 'icon16_section_system.png', // system
@@ -438,15 +440,16 @@
 					'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
 					'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
 					'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
-					'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
 
 				),
 			),
 
 			'Radio' => Array (
 				'Selector' => 'radio',
-				'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status'
+				'Icons' => Array( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
 					'default' => 'icon_section.png',
 					'1_0_0' => 'icon16_section_system.png', // system
 					'1_0_1' => 'icon16_section_system.png', // system
@@ -465,14 +468,15 @@
 					'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
 					'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
 					'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
-					'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
 
 				),
 			),
 
 			'Structure' => Array (
-				'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status'
+				'Icons' => Array( // 'StatusField' => Array ('Type', 'Status', 'IsMenu'), // 'Status'
 					'default' => 'icon_section.png',
 					'1_0_0' => 'icon16_section_system.png', // system
 					'1_0_1' => 'icon16_section_system.png', // system
@@ -492,8 +496,9 @@
 					'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter'),
 					'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
 					'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
-					'CreatedBySystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+					'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
 
 				),
 			),