Index: trunk/core/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/categories/categories_tabs.tpl	(revision 0)
+++ trunk/core/admin_templates/categories/categories_tabs.tpl	(revision 5102)
@@ -0,0 +1,16 @@
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="right" width="100%">
+  	<table cellpadding="0" cellspacing="0" border="0" height="23">
+		<tr>
+			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/categories/ci_blocks.tpl	(revision 0)
+++ trunk/kernel/admin_templates/categories/ci_blocks.tpl	(revision 5102)
@@ -0,0 +1,18 @@
+<inp2:m_DefineElement name="status_mark">
+	<inp2:m_if check="FieldEquals" name="$field" value="1">
+		<img src="img/ic_<inp2:m_param name="type"/>.gif" title="<inp2:m_phrase label="la_{$type}"/>" width="11" height="11" align="absmiddle" />
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_catitem_td" format="" no_special="">
+	<td valign="top" class="text">
+		<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format" cut_first="100"/>
+		<inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse">
+			<span class="priority"><sup><inp2:Field field="Priority"/></sup></span>
+		</inp2:m_if>
+		<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsPop" type="pop" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsHot" type="hot" PrefixSpecial="$PrefixSpecial"/>
+	</td>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/categories/categories_tabs.tpl	(revision 0)
+++ trunk/kernel/admin_templates/categories/categories_tabs.tpl	(revision 5102)
@@ -0,0 +1,16 @@
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="right" width="100%">
+  	<table cellpadding="0" cellspacing="0" border="0" height="23">
+		<tr>
+			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/categories/categories_edit_custom.tpl	(revision 0)
+++ trunk/kernel/admin_templates/categories/categories_edit_custom.tpl	(revision 5102)
@@ -0,0 +1,64 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_custom" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:l_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancelEdit');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				function edit(){ }
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>	
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_ParseBlock name="grid" PrefixSpecial="cf" SourcePrefix="c" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" NoPagination="1" no_init="no_init"/>
+
+<inp2:m_include t="incs/footer"/>
+		
\ No newline at end of file
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -r5096 -r5102
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5096)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5102)
@@ -50,11 +50,11 @@
 													
 													'catalog' 		=>	Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='c_item_count'>#c_recordcount#</span>)"),
 													
-													'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
-														
-													'category_items'=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),
+													'categories_edit'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
+													'categories_properties'	=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"),
+													'categories_custom'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),
 													
-													'tree_site'		=>	Array('format' => '!la_selecting_categories!'),
+													'tree_site'				=>	Array('format' => '!la_selecting_categories!'),
 											),
 					
 					'PermSection'		=>	Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
@@ -206,7 +206,7 @@
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
-									            'Status' => Array('type' => 'int','not_null' => '1','default' => '0'),
+									            'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => '1','default' => 2),
 									            'Pop' => Array('type' => 'int','default' => ''),
 									            'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => ''),
 									            'MetaKeywords' => Array('type' => 'string','default' => ''),
@@ -217,9 +217,9 @@
 									            'ParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'NamedParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'MetaDescription' => Array('type' => 'string','default' => ''),
-									            'HotItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
-									            'NewItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
-									            'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
+									            'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
+									            'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
+									            'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
 									            'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
Index: trunk/kernel/admin_templates/categories/categories_edit_properties.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/categories/categories_edit_properties.tpl	(revision 0)
+++ trunk/kernel/admin_templates/categories/categories_edit_properties.tpl	(revision 5102)
@@ -0,0 +1,64 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+	
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_properties" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:c_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancelEdit');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>			
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_ModuleInclude template="category_items" />
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/categories/categories_edit_custom.tpl	(revision 0)
+++ trunk/core/admin_templates/categories/categories_edit_custom.tpl	(revision 5102)
@@ -0,0 +1,64 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_custom" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:l_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancelEdit');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				function edit(){ }
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>	
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_ParseBlock name="grid" PrefixSpecial="cf" SourcePrefix="c" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" NoPagination="1" no_init="no_init"/>
+
+<inp2:m_include t="incs/footer"/>
+		
\ No newline at end of file
Index: trunk/core/admin_templates/categories/categories_edit_properties.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/categories/categories_edit_properties.tpl	(revision 0)
+++ trunk/core/admin_templates/categories/categories_edit_properties.tpl	(revision 5102)
@@ -0,0 +1,64 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+	
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_properties" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:c_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancelEdit');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>			
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_ModuleInclude template="category_items" />
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -r5096 -r5102
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5096)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5102)
@@ -50,11 +50,11 @@
 													
 													'catalog' 		=>	Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='c_item_count'>#c_recordcount#</span>)"),
 													
-													'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
-														
-													'category_items'=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),
+													'categories_edit'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
+													'categories_properties'	=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"),
+													'categories_custom'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),
 													
-													'tree_site'		=>	Array('format' => '!la_selecting_categories!'),
+													'tree_site'				=>	Array('format' => '!la_selecting_categories!'),
 											),
 					
 					'PermSection'		=>	Array('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),
@@ -206,7 +206,7 @@
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
-									            'Status' => Array('type' => 'int','not_null' => '1','default' => '0'),
+									            'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => '1','default' => 2),
 									            'Pop' => Array('type' => 'int','default' => ''),
 									            'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => ''),
 									            'MetaKeywords' => Array('type' => 'string','default' => ''),
@@ -217,9 +217,9 @@
 									            'ParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'NamedParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'MetaDescription' => Array('type' => 'string','default' => ''),
-									            'HotItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
-									            'NewItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
-									            'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
+									            'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
+									            'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
+									            'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => '1', 'default' => 2),
 									            'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
Index: trunk/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/categories/categories_edit.tpl	(revision 0)
+++ trunk/core/admin_templates/categories/categories_edit.tpl	(revision 5102)
@@ -0,0 +1,93 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="reflect_filename();">
+
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+	
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_edit" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:c_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancel');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>			
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_ParseBlock name="subsection" title="!la_section_Category!"/>	
+		<inp2:m_ParseBlock name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Name" title="!la_fld_Name!" size="30"/>
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="Description" title="!la_fld_Description!" rows="5" cols="60"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="63"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="ItemTemplate" title="!la_fld_ItemTemplate!" size="40"/>
+	
+	<inp2:m_ParseBlock name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_ParseBlock name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!" use_phrases="1"/>
+		<inp2:m_ParseBlock name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!" use_phrases="1"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
+		<inp2:m_ParseBlock name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="30"/>
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="2" cols="60"/>
+		
+	<!-- custom fields: begin -->		
+	<inp2:m_include t="incs/custom_blocks"/>
+	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
+	<!-- custom fields: end -->
+</table>
+
+<script type="text/javascript">
+	function reflect_filename()
+    {
+    	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
+    	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
+    }
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/categories/ci_blocks.tpl	(revision 0)
+++ trunk/core/admin_templates/categories/ci_blocks.tpl	(revision 5102)
@@ -0,0 +1,18 @@
+<inp2:m_DefineElement name="status_mark">
+	<inp2:m_if check="FieldEquals" name="$field" value="1">
+		<img src="img/ic_<inp2:m_param name="type"/>.gif" title="<inp2:m_phrase label="la_{$type}"/>" width="11" height="11" align="absmiddle" />
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_catitem_td" format="" no_special="">
+	<td valign="top" class="text">
+		<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format" cut_first="100"/>
+		<inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse">
+			<span class="priority"><sup><inp2:Field field="Priority"/></sup></span>
+		</inp2:m_if>
+		<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsPop" type="pop" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_RenderElement name="status_mark" field="IsHot" type="hot" PrefixSpecial="$PrefixSpecial"/>
+	</td>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/categories/categories_edit.tpl	(revision 0)
+++ trunk/kernel/admin_templates/categories/categories_edit.tpl	(revision 5102)
@@ -0,0 +1,93 @@
+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="reflect_filename();">
+
+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
+
+<inp2:m_include t="categories/categories_tabs"/>
+	
+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_edit" module="in-portal" icon="icon46_catalog"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('c','<inp2:c_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('c','OnCancel');
+						}
+				 ) );
+				
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('c', '<inp2:c_NextId/>');
+						}
+				 ) );
+				
+				a_toolbar.Render();
+				
+				<inp2:m_if check="c_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>			
+					<inp2:m_if check="c_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>			
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_ParseBlock name="subsection" title="!la_section_Category!"/>	
+		<inp2:m_ParseBlock name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Name" title="!la_fld_Name!" size="30"/>
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="Description" title="!la_fld_Description!" rows="5" cols="60"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="63"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="ItemTemplate" title="!la_fld_ItemTemplate!" size="40"/>
+	
+	<inp2:m_ParseBlock name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_ParseBlock name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!" use_phrases="1"/>
+		<inp2:m_ParseBlock name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!" use_phrases="1"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
+		<inp2:m_ParseBlock name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="30"/>
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="2" cols="60"/>
+		
+	<!-- custom fields: begin -->		
+	<inp2:m_include t="incs/custom_blocks"/>
+	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
+	<!-- custom fields: end -->
+</table>
+
+<script type="text/javascript">
+	function reflect_filename()
+    {
+    	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
+    	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
+    }
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file