Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_pending.gif
===================================================================
diff -u -r2399 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon_payment__pending.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_currency_disabled.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_manuf.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_tax.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/units/category_items/category_items_config.php
===================================================================
diff -u -r2308 -r3114
--- trunk/kernel/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 2308)
+++ trunk/kernel/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 3114)
@@ -14,6 +14,8 @@
 												3	=>	'event',
 											),
 					'IDField'			=>	'CategoryId',	// in this case idfield doesn't exit in destination table
+					'StatusField'		=>	Array('CategoryStatus'),	// field, that is affected by Approve/Decline events
+					
 					'TableName'		=>	TABLE_PREFIX.'CategoryItems',
 					'ParentTableKey'=>	'ResourceId',
 					'ForeignKey'	=>	'ItemResourceId',
@@ -22,10 +24,11 @@
 					'AutoClone'		=>	false,
 					
 					'CalculatedFields' => Array(
-										'' => Array (
-													'CategoryName'	=>	'c.CachedNavbar',
-													'DummyId'		=>	'IF(ISNULL(c.CategoryId),0,c.CategoryId)',
-										)
+												'' => Array (
+															'CategoryName'	=>	'c.CachedNavbar',
+															'DummyId'		=>	'IF(ISNULL(c.CategoryId),0,c.CategoryId)',
+															'CategoryStatus'=>	'c.Status',
+												)
 										),
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
@@ -45,13 +48,14 @@
 											    'PrimaryCat' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 											),
 					'VirtualFields'	=> 	Array(
-											'CategoryName' => Array(),	
-											'DummyId' => Array(),
+											'CategoryName'		=>	Array(),	
+											'DummyId' 			=>	Array(),
+											'CategoryStatus'	=>	Array(),
 										),
 											
 					'Grids'	=> Array(
 								'Default'		=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+																	'Icons' => Array('default' => 'icon16_cat.gif', 0 => 'icon16_cat_disabled.gif', 1 => 'icon16_cat.gif', 2 => 'icon16_cat_pending.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
 																			'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
 																			),
Index: trunk/kernel/admin_templates/img/itemicons/icon16_shipping_disabled.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_product.gif
===================================================================
diff -u -r1720 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file.gif
===================================================================
diff -u -r2329 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_orders_pending.gif
===================================================================
diff -u -r1723 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file_primary.gif
===================================================================
diff -u -r2329 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_discount.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_payment_type_disabled.gif
===================================================================
diff -u -r2638 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_payment_type.gif
===================================================================
diff -u -r2638 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_discount_disabled.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_payment_type_primary.gif
===================================================================
diff -u -r2638 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_product_disabled.gif
===================================================================
diff -u -r1720 -r3114
Binary files differ
Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r3088 -r3114
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 3088)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 3114)
@@ -1369,7 +1369,16 @@
 	 */
 	function ModulePath($params)
 	{
-		$module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder');
+		$force_module = getArrayValue($params, 'module');
+		if($force_module)
+		{
+			$force_module = strtolower($force_module);
+			$module_folder = trim( $this->Conn->GetOne('SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name) = '.$this->Conn->qstr($force_module) ), '/');
+		}
+		else
+		{
+			$module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder');
+		}
 		return '../../'.$module_folder.'/admin_templates/';
 	}
 }
Index: trunk/kernel/admin_templates/img/itemicons/icon16_listing.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_currency.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_payment.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_pricing.gif
===================================================================
diff -u -r2068 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_product_pending.gif
===================================================================
diff -u -r1720 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_currency_primary.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_listing_type.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_payment_disabled.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_payment_primary.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_pricing_primary.gif
===================================================================
diff -u -r2068 -r3114
Binary files differ
Index: trunk/core/units/category_items/category_items_config.php
===================================================================
diff -u -r2308 -r3114
--- trunk/core/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 2308)
+++ trunk/core/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 3114)
@@ -14,6 +14,8 @@
 												3	=>	'event',
 											),
 					'IDField'			=>	'CategoryId',	// in this case idfield doesn't exit in destination table
+					'StatusField'		=>	Array('CategoryStatus'),	// field, that is affected by Approve/Decline events
+					
 					'TableName'		=>	TABLE_PREFIX.'CategoryItems',
 					'ParentTableKey'=>	'ResourceId',
 					'ForeignKey'	=>	'ItemResourceId',
@@ -22,10 +24,11 @@
 					'AutoClone'		=>	false,
 					
 					'CalculatedFields' => Array(
-										'' => Array (
-													'CategoryName'	=>	'c.CachedNavbar',
-													'DummyId'		=>	'IF(ISNULL(c.CategoryId),0,c.CategoryId)',
-										)
+												'' => Array (
+															'CategoryName'	=>	'c.CachedNavbar',
+															'DummyId'		=>	'IF(ISNULL(c.CategoryId),0,c.CategoryId)',
+															'CategoryStatus'=>	'c.Status',
+												)
 										),
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
@@ -45,13 +48,14 @@
 											    'PrimaryCat' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 											),
 					'VirtualFields'	=> 	Array(
-											'CategoryName' => Array(),	
-											'DummyId' => Array(),
+											'CategoryName'		=>	Array(),	
+											'DummyId' 			=>	Array(),
+											'CategoryStatus'	=>	Array(),
 										),
 											
 					'Grids'	=> Array(
 								'Default'		=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+																	'Icons' => Array('default' => 'icon16_cat.gif', 0 => 'icon16_cat_disabled.gif', 1 => 'icon16_cat.gif', 2 => 'icon16_cat_pending.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
 																			'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
 																			),
Index: trunk/kernel/admin_templates/img/itemicons/icon16_listing_disabled.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate.gif
===================================================================
diff -u -r2399 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_discount_pending.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_plan.gif
===================================================================
diff -u -r2325 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_plan_primary.gif
===================================================================
diff -u -r2667 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/category_selector.tpl
===================================================================
diff -u -r3101 -r3114
--- trunk/kernel/admin_templates/category_selector.tpl	(.../category_selector.tpl)	(revision 3101)
+++ trunk/kernel/admin_templates/category_selector.tpl	(.../category_selector.tpl)	(revision 3114)
@@ -60,7 +60,7 @@
 <inp2:m_block name="category_td" />
 	<td valign="top" class="table_white text" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="ResourceId"/>">
 		<input type="radio" name="<inp2:InputName field="$IdField" IdField="$IdField"/>" id="<inp2:InputName field="$IdField" IdField="$IdField"/>">
-		<img src="img/itemicons/<inp2:ItemIcon grid="Default"/>">&nbsp;<span class="priority"><inp2:m_if prefix="$PrefixSpecial" function="fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:$PrefixSpecial_field field="Priority"/></sup><inp2:m_endif/></span>
+		<img src="<inp2:ModulePath />img/itemicons/<inp2:ItemIcon grid="Default"/>">&nbsp;<span class="priority"><inp2:m_if prefix="$PrefixSpecial" function="fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:$PrefixSpecial_field field="Priority"/></sup><inp2:m_endif/></span>
 		<a class="link" href="<inp2:CategoryLink pass="all"/>"><b><inp2:field field="Name"/></b></a><span class="cat_desc">:</span>
 		<span class="cat_pick"><inp2:m_if check="IsPick"/>Pick<inp2:m_endif/></span>
 		<span class="cat_new"><inp2:m_if check="IsNew"/>New<inp2:m_endif/></span>		
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_payment.gif
===================================================================
diff -u -r2458 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_entire_order.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_orders_disabled.gif
===================================================================
diff -u -r1723 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_orders.gif
===================================================================
diff -u -r1723 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_listing_pending.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_file_disabled.gif
===================================================================
diff -u -r2329 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_plan_disabled.gif
===================================================================
diff -u -r2325 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_affiliate_disabled.gif
===================================================================
diff -u -r2399 -r3114
Binary files differ
Index: trunk/kernel/admin_templates/img/itemicons/icon16_shipping.gif
===================================================================
diff -u -r1566 -r3114
Binary files differ