Index: branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -N -r12506 -r12561
--- branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12506)
+++ branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12561)
@@ -4,14 +4,14 @@
 		<folder
 			name="<inp2:Field name='Name'/>"
 			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
-			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='IsSystem' value='1'>_system</inp2:m_if>.png"
+			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
 			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"
 			load_url="<inp2:CategoryLink pass='m'/>">
 		</folder>
 	<inp2:m_else/>
 		<item
 			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
-			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='IsSystem' value='1'>_system</inp2:m_if>.png"
+			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
 			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
 	</inp2:m_if>
 </inp2:m_DefineElement>
Index: branches/5.0.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r12557 -r12561
--- branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12557)
+++ branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12561)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 12557 2009-09-16 23:45:02Z dmitrya $
+* @version	$Id: categories_config.php 12561 2009-09-18 03:38:49Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,7 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
 
 	$config = Array (
 		'Prefix' => 'c',
@@ -128,7 +128,7 @@
 
 			'categories_relations' => Array (
 				'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!",
-				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_relation', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'),
 				),
 
 			'categories_related_searches' => Array (
@@ -138,7 +138,7 @@
 
 			'categories_images' => Array (
 				'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!",
-				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'setprimary', 'view', 'dbl-click'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'),
 				),
 
 			'categories_permissions' => Array (
@@ -279,6 +279,7 @@
 				'LocalImage'	=>	'img.LocalImage',
 				'LocalPath'		=>	'img.LocalPath',
 				'FullUrl'		=>	'img.Url',
+				'CreatedBySystem' => 'IF(ThemeId != 0, 1, 0)',
 			)
 		),
 
@@ -381,6 +382,7 @@
 			'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(
@@ -398,16 +400,14 @@
 					'NEW' => 'icon16_section_new.png', // section is new
 				),
 				'Fields' => Array(
-					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
 					'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
-					'Priority' => Array ( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60),
-					'IsMenu' => Array ( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75),
-					'Modified' => Array ( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-					'Template' => Array ( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+					'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 65),
+					'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),
 
-					'IsSystem' => Array ( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80),
-
 				),
 			),
 
@@ -426,15 +426,14 @@
 					'NEW' => 'icon16_section_new.png', // section is new
 				),
 				'Fields' => Array(
-					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
 					'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
-					'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60),
-					'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75),
-					'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-					'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+					'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
+					'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),
 
-					'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80),
 				),
 			),
 
@@ -452,16 +451,15 @@
 					'NEW' => 'icon16_section_new.png', // section is new
 				),
 				'Fields' => Array(
-					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
 					'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
-					'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60),
-					'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75),
-					'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter', 'width' => 150),
-					'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-					'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+					'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
+					'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+					'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),
 
-					'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80),
 				),
 			),
 		),