Index: branches/5.1.x/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_messages_config.php 11906 2009-07-18 00:11:13Z dmitrya $
+* @version	$Id: email_messages_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,6 +11,8 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'emailmessages',
 		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -29,11 +31,12 @@
 
 		'IDField' => 'EmailMessageId',
 		'TitleField' => 'Subject',
+		'StatusField' => Array ('Enabled'),
 
 		'TitlePresets' => Array (
 			'email_messages_direct_list' => Array (
 				'prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!",
-				'toolbar_buttons' => Array ('edit', 'view', 'dbl-click'),
+				'toolbar_buttons' => Array ('edit', 'approve', 'decline', 'view', 'dbl-click'),
 				),
 			'email_messages_edit_direct' => Array (
 				'prefixes' => Array ('emailmessages'),
@@ -47,11 +50,11 @@
 		'Sections' => Array (
 			'in-portal:configemail'	=>	Array(
 				'parent'		=>	'in-portal:site',
-				'icon'			=>	'core:e-mail',
+				'icon'			=>	'email_templates',
 				'label'			=>	'la_tab_E-mails',
 				'url'			=>	Array('t' => 'languages/email_message_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'edit'),
-				'priority'		=>	6,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 		),
@@ -64,10 +67,11 @@
 			 		LEFT JOIN '.TABLE_PREFIX.'Events ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId'
 		),
 
-		'ItemSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s
-					FROM %1$s
-			 		LEFT JOIN '.TABLE_PREFIX.'Events ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId'
+		'ListSortings' => Array (
+			'' => Array (
+				'ForcedSorting' => Array ('Enabled' => 'desc'),
+				'Sorting' => Array ('Description' => 'asc')
+			),
 		),
 
 		'ForeignKey' => 'LanguageId',
@@ -82,6 +86,7 @@
 				'Module' => TABLE_PREFIX.'Events.Module',
 				'Type' => TABLE_PREFIX.'Events.Type',
 				'ReplacementTags' => TABLE_PREFIX.'Events.ReplacementTags',
+				'Enabled' => TABLE_PREFIX.'Events.Enabled',
 			),
 		),
 
@@ -106,6 +111,12 @@
 			'Module' 			=>	Array('type' => 'string','not_null' => '1','default' => ''),
 			'Type' 				=>	Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
 
+			'Enabled' => Array (
+            	'type' => 'int',
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+            	'not_null' => 1, 'default' => 1
+            ),
+
 			// for mass mail sending
 			'MassSubject'		=>	Array ('type' => 'string', 'default' => ''),
 			'MassAttachment'	=>	Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000, 'default' => ''),
@@ -115,27 +126,30 @@
 
 		'Grids'	=> Array(
 			'Default'		=>	Array(
-				'Icons' => Array('default'=>'icon16_custom.gif'),
+//				'Icons' => Array('default'=>'icon16_item.png'),
 				'Fields' => Array(
-					'Subject'		=>	Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'),
-					'Description'	=>	Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
-					'Type'			=>	Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
+					'Subject'		=>	Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
+					'Description'	=>	Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
+					'Type'			=>	Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
 				),
 
 			),
 
 			'Emails' => Array(
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+				),
 				'Fields' => Array(
-					'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'),
-					'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'),
-					'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
-					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
-					'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter'),
+					'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
+					'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+					'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+					'Enabled' => Array( 'title'=>'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
 				),
 
 			),
 		),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file