Index: branches/RC/core/units/users/users_config.php =================================================================== diff -u -r11412 -r11538 --- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11412) +++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11538) @@ -117,20 +117,20 @@ ), 'users_list' => Array ( - 'prefixes' => Array ('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)", + 'prefixes' => Array ('u_List'), 'format' => "!la_title_Users!", 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view'), ), 'users_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"), - 'user_edit_images' => Array ('prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images! (#u-img_recordcount#)"), - 'user_edit_groups' => Array ('prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"), + 'user_edit_images' => Array ('prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images!"), + 'user_edit_groups' => Array ('prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups!"), 'user_edit_items' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Items!"), 'user_edit_custom' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"), - 'admins_list' => Array ('prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators! (#u.admins_recordcount#)"), + 'admin_list' => Array ('prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators!"), 'admins_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"), - 'regular_users_list' => Array ('prefixes' => Array ('u.regular_List'), 'format' => "!la_title_Users! (#u.regular_recordcount#)"), + 'regular_users_list' => Array ('prefixes' => Array ('u.regular_List'), 'format' => "!la_title_Users!"), 'root_edit' => Array ('prefixes' => Array ('u'), 'format' => "!la_title_Editing_User! 'root'"), 'user_edit_group' => Array ( @@ -147,7 +147,8 @@ 'format' => "#u_status# '#u_titlefield#' - #u-img_status# '#u-img_titlefield#'", ), - 'users_select' => Array ('prefixes' => Array ('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), + 'user_select' => Array ('prefixes' => Array ('u_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!"), + 'group_user_select' => Array ('prefixes' => Array ('u.group_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!"), 'tree_users' => Array('format' => '!la_section_overview!'), ), @@ -160,11 +161,6 @@ 'custom' => Array ('title' => 'la_tab_Custom', 't' => 'users/users_edit_custom', 'priority' => 5), ), - 'RegularUsers' => Array ( - 'general' => Array ('title' => 'la_tab_General', 't' => 'users/users_edit', 'priority' => 1), - 'groups' => Array ('title' => 'la_tab_Groups', 't' => 'users/users_edit_groups', 'priority' => 2), - ), - 'Admins' => Array ( 'general' => Array ('title' => 'la_tab_General', 't' => 'users/admins_edit', 'priority' => 1), 'groups' => Array ('title' => 'la_tab_Groups', 't' => 'users/admins_edit_groups', 'priority' => 2),