Index: branches/5.1.x/core/units/users/users_config.php =================================================================== diff -u -N -r12127 -r12657 --- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 12127) +++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 12657) @@ -1,6 +1,6 @@ 'u', 'ItemClass' => Array('class'=>'UsersItem','file'=>'users_item.php','build_event'=>'OnItemBuild'), 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), @@ -130,7 +132,7 @@ 'users_list' => Array ( 'prefixes' => Array ('u_List'), 'format' => "!la_title_Users!", - 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view', 'dbl-click'), ), 'users_edit' => Array ( @@ -140,12 +142,12 @@ 'user_edit_images' => Array ( 'prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images!", - 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'approve', 'decline', 'setprimary', 'move_up', 'move_down', 'view', 'dbl-click'), ), 'user_edit_groups' => Array ( 'prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups!", - 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'edit', 'delete', 'setprimary', 'view', 'dbl-click'), ), 'user_edit_items' => Array ( @@ -160,7 +162,7 @@ 'admin_list' => Array ( 'prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators!", - 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'clone', 'refresh', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'clone', 'refresh', 'view', 'dbl-click'), ), 'admins_edit' => Array ( @@ -236,7 +238,7 @@ 'in-portal:admins' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'users', + 'icon' => 'administrators', 'label' => 'la_title_Administrators', 'url' => Array ('t' => 'users/admins_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -248,7 +250,7 @@ // user settings 'in-portal:user_setting_folder' => Array ( 'parent' => 'in-portal:system', - 'icon' => 'conf', + 'icon' => 'conf_users', 'label' => 'la_title_Users', 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -259,7 +261,7 @@ 'in-portal:configure_users' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'users_settings', + 'icon' => 'conf_users_general', 'label' => 'la_tab_ConfigSettings', 'url' => Array ('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -269,7 +271,7 @@ 'in-portal:user_email' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'settings_email', + 'icon' => 'conf_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -279,7 +281,7 @@ 'in-portal:user_custom' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'settings_custom', + 'icon' => 'conf_customfields', 'label' => 'la_tab_ConfigCustom', 'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 6, 'pass_section' => true, 'pass' => 'm,cf'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -337,13 +339,22 @@ 'Fields' => Array ( - 'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')), - 'Password' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')), - 'FirstName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), - 'LastName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), - 'Company' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', /*'required'=>1, */'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ), + 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Login' => Array ('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')), + 'Password' => Array ('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')), + 'FirstName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'LastName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Company' => Array ('type' => 'string','not_null' => '1','default' => ''), + 'Email' => Array ( + 'type' => 'string', 'formatter' => 'kFormatter', + 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', + 'sample_value' => 'email@domain.com', 'unique' => Array ('Email'), 'not_null' => 1, + 'required' => 1, + 'default' => '', + 'error_msgs' => Array ( + 'invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!' + ), + ), 'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'Phone' => Array('type' => 'string','default' => null), 'Fax' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -397,7 +408,11 @@ 'Grids' => Array( // not in use 'Default' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 2 => 'icon16_user_pending.png' + ), 'Fields' => Array( 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'), @@ -410,43 +425,54 @@ // used 'UserSelector' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 2 => 'icon16_user_pending.png' + ), 'Selector' => 'radio', 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter'), - 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'), - 'FirstName' => Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'), - 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'), - 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'), + 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), ), ), // used 'Admins' => Array ( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_admin_disabled.png', + 1 => 'icon16_admin.png', + 2 => 'icon16_admin_disabled.png', + ), 'Fields' => Array ( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width'=>150), - 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width'=>140), + 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), + 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), ), ), // used 'RegularUsers' => Array ( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 2 => 'icon16_user_pending.png' + ), 'Fields' => Array( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width'=>150), - 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width'=>140), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width'=>100), + 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), + 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), ), - ); -?> \ No newline at end of file + ); \ No newline at end of file