In-Portal Issue Tracker

Index: core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
--- core/admin_templates/categories/xml/tree_categories.tpl	(revision 13754)
+++ core/admin_templates/categories/xml/tree_categories.tpl	(working copy)
@@ -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='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
+			icon="<inp2:c_ModulePath module='core'/>img/icons/<inp2:ItemIcon grid='Default' icon_prefix='icon24_'/>"
 			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"
-			load_url="<inp2:CategoryLink direct_link="1" pass='m'/>">
+			load_url="<inp2:CategoryLink direct_link="1" 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='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
+			icon="<inp2:c_ModulePath module='core'/>img/icons/<inp2:ItemIcon grid='Default' icon_prefix='icon24_'/>"
 			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
 	</inp2:m_if>
 </inp2:m_DefineElement>
Index: core/units/categories/categories_tag_processor.php
===================================================================
--- core/units/categories/categories_tag_processor.php	(revision 13754)
+++ core/units/categories/categories_tag_processor.php	(working copy)
@@ -77,6 +77,7 @@
 		}
 
 		$icons = $grid['Icons'];
+		$icon_prefix = array_key_exists('icon_prefix', $params)? $params['icon_prefix'] : 'icon16_';
 
 		if (array_key_exists('name', $params)) {
 			$icon_name = $params['name'];
@@ -88,32 +89,32 @@
 
 		if ($object->GetDBField('CreatedBySystem')) {
 			if (!$object->GetDBField('IsMenu')) {
-				return 'icon16_section_menuhidden_system.png';
+				return $icon_prefix . 'section_menuhidden_system.png';
 			}
-			return 'icon16_section_system.png';
+			return $icon_prefix . 'section_system.png';
 		}
 
 		$status = $object->GetDBField('Status');
 
 		if ($status == STATUS_DISABLED) {
-			return 'icon16_section_disabled.png';
+			return $icon_prefix . 'section_disabled.png';
 		}
 
 		if (!$object->GetDBField('IsMenu')) {
-			return 'icon16_section_menuhidden.png';
+			return $icon_prefix . 'section_menuhidden.png';
 		}
 
 		if ($status == STATUS_PENDING) {
-			return 'icon16_section_pending.png';
+			return $icon_prefix . 'section_pending.png';
 		}
 
-		if ($object->GetDBField('IsNew')) {
-			return 'icon16_section_new.png';
+		if ($object->GetDBField('IsNew') && ($icon_prefix == 'icon16_')) {
+			return $icon_prefix . 'section_new.png'; // show yhis icon only in grids
 		}
 
-		return 'icon16_section.png';
+		return $icon_prefix . 'section.png';
 	}
-
+	
 	function ItemCount($params)
 	{
 		$object =& $this->getObject($params);