Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -r4077 -r4287
--- trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 4077)
+++ trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 4287)
@@ -48,14 +48,37 @@
 											),
 
 					'IDField' 			=>	'PortalUserId',
+					
+					'StatusField'		=>	Array('Status'),
+					
+					'TitleField'		=>	'Login',
+					
 					'ItemType'			=>	6,	// used for custom fields only (on user's case)
+					
+					'TitlePresets'		=>	Array(
+												'default'	=>	Array(	'new_status_labels'		=> Array('u'=>'!la_title_Adding_User!'),
+																		'edit_status_labels'	=> Array('u'=>'!la_title_Editing_User!'),
+																		'new_titlefield'		=> Array('u'=>'!la_title_New_User!'),
+																),
+												
+												'users_list'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"),
+												
+												'users_edit'		=>	Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"),
+												
+												'users_select'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
+											),
+					
 					'TableName'			=>	TABLE_PREFIX.'PortalUser',
 
 					'ListSQLs'			=>	Array(	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
+																LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
+																LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											),
 											
 					'ItemSQLs'			=>	Array(	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
+																LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
+																LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											),
 											
@@ -67,6 +90,24 @@
 
 					'SubItems'		=> Array('addr', 'u-cdata'),
 
+					'FilterMenu'		=>	Array(
+												'Groups' => Array(
+													Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
+												),
+												
+												'Filters' => Array(
+													0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
+													1	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
+													2	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
+												)
+											),
+											
+					'CalculatedFields'	=>	Array(
+													''	=>	Array(
+																'PrimaryGroup'	=>	'g.Name',
+															),
+											),
+					
 					'Fields' => Array
 							    (
 							        'PortalUserId' => Array(),
@@ -115,9 +156,34 @@
 					'VirtualFields'	=> 	Array(
 											'ValidateLogin' => Array('type'=>'string','default'=>''),
 											'SubscribeEmail' => Array('type'=>'string','default'=>''),
+											'PrimaryGroup'	=>	Array('type' => 'string', 'default' => ''),
 										),
 
-					'Grids'	=> Array(),
+					'Grids'	=> Array(
+										'Default'	=>	Array(
+																'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
+																'Fields' => Array(
+																		'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
+																		'LastName'		=> Array( 'title'=>'la_col_LastName'),
+																		'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
+																		'Email'			=> Array( 'title'=>'la_col_Email'),
+																		'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup'),
+																		'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
+																	),
+														),
+														
+										'UserSelector'	=>	Array(
+																'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
+																'Fields' => Array(
+																		'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'),
+																		'LastName'		=> Array( 'title'=>'la_col_LastName'),
+																		'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
+																		'Email'			=> Array( 'title'=>'la_col_Email'),
+																		'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup'),
+																		'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
+																	),
+														),
+													),
 
 	);