diff --git src/bp-core/bp-core-buddybar.php src/bp-core/bp-core-buddybar.php index 8a67505..9edb8e7 100644 --- src/bp-core/bp-core-buddybar.php +++ src/bp-core/bp-core-buddybar.php @@ -306,6 +306,11 @@ function bp_core_new_subnav_item( $args = '' ) { 'no_access_url' => $no_access_url, 'screen_function' => &$screen_function ); + + if ( ! empty( $r['in_admin_bar'] ) ) { + $subnav_item['in_admin_bar'] = (bool) $r['in_admin_bar']; + } + $bp->bp_options_nav[$parent_slug][$slug] = $subnav_item; /** diff --git src/bp-groups/bp-groups-adminbar.php src/bp-groups/bp-groups-adminbar.php index 33e7679..7b5c874 100644 --- src/bp-groups/bp-groups-adminbar.php +++ src/bp-groups/bp-groups-adminbar.php @@ -23,15 +23,18 @@ if ( !defined( 'ABSPATH' ) ) exit; * access to group admin options. */ function bp_groups_group_admin_menu() { - global $wp_admin_bar, $bp; + global $wp_admin_bar; + $bp = buddypress(); // Only show if viewing a group - if ( !bp_is_group() ) + if ( ! bp_is_group() || bp_is_group_create() ) { return false; + } // Only show this menu to group admins and super admins - if ( !bp_current_user_can( 'bp_moderate' ) && !bp_group_is_admin() ) + if ( ! bp_current_user_can( 'bp_moderate' ) && ! bp_group_is_admin() ) { return false; + } // Unique ID for the 'Edit Group' menu $bp->group_admin_menu_id = 'group-admin'; @@ -43,67 +46,35 @@ function bp_groups_group_admin_menu() { 'href' => bp_get_group_permalink( $bp->groups->current_group ) ) ); - // Group Admin > Edit details - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'edit-details', - 'title' => __( 'Edit Details', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/edit-details' ) - ) ); - - // Group Admin > Group settings - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'group-settings', - 'title' => __( 'Edit Settings', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/group-settings' ) - ) ); + // Index of the Manage tabs parent slug + $nav_index = $bp->groups->current_group->slug . '_manage'; - // Group Admin > Group avatar - if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) { - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'group-avatar', - 'title' => __( 'Edit Profile Photo', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/group-avatar' ) - ) ); + // Check if current group has Manage tabs + if ( empty( $bp->bp_options_nav[ $nav_index ] ) ) { + return; } - // Group Admin > Manage invitations - if ( bp_is_active( 'friends' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'manage-invitations', - 'title' => __( 'Manage Invitations', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'send-invites' ) - ) ); - } + // Build the Group Admin menus + foreach ( $bp->bp_options_nav[ $nav_index ] as $menu ) { + // Only display the core tabs (could be an option in Group Extension API) + if ( empty( $menu['in_admin_bar'] ) ) { + continue; + } - // Group Admin > Manage members - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'manage-members', - 'title' => __( 'Manage Members', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/manage-members' ) - ) ); + $title = sprintf( _x( 'Edit Group %s', 'Group WP Admin Bar manage links', 'buddypress' ), $menu['name'] ); + + // Title is specific for delete + if ( 'delete-group' == $menu['slug'] ) { + $title = sprintf( _x( '%s Group', 'Group WP Admin Bar delete link', 'buddypress' ), $menu['name'] ); + } - // Group Admin > Membership Requests - if ( bp_get_group_status( $bp->groups->current_group ) == 'private' ) { $wp_admin_bar->add_menu( array( 'parent' => $bp->group_admin_menu_id, - 'id' => 'membership-requests', - 'title' => __( 'Membership Requests', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/membership-requests' ) + 'id' => $menu['slug'] . '-group-manage-links', + 'title' => $title, + 'href' => bp_get_groups_action_link( 'admin/' . $menu['slug'] ) ) ); } - - // Delete Group - $wp_admin_bar->add_menu( array( - 'parent' => $bp->group_admin_menu_id, - 'id' => 'delete-group', - 'title' => __( 'Delete Group', 'buddypress' ), - 'href' => bp_get_groups_action_link( 'admin/delete-group' ) - ) ); } add_action( 'admin_bar_menu', 'bp_groups_group_admin_menu', 99 ); diff --git src/bp-groups/bp-groups-classes.php src/bp-groups/bp-groups-classes.php index f84e2f7..5a65456 100644 --- src/bp-groups/bp-groups-classes.php +++ src/bp-groups/bp-groups-classes.php @@ -3655,8 +3655,7 @@ class BP_Group_Extension { $current_group = groups_get_current_group(); $admin_link = trailingslashit( bp_get_group_permalink( $current_group ) . 'admin' ); - // Add the tab to the manage navigation - bp_core_new_subnav_item( array( + $subnav_args = array( 'name' => $screen['name'], 'slug' => $screen['slug'], 'parent_slug' => $current_group->slug . '_manage', @@ -3664,7 +3663,15 @@ class BP_Group_Extension { 'user_has_access' => bp_is_item_admin(), 'position' => $position, 'screen_function' => 'groups_screen_group_admin', - ) ); + ); + + // Should we add a menu to the Group's WP Admin Bar + if ( ! empty( $screen['in_admin_bar'] ) ) { + $subnav_args['in_admin_bar'] = true; + } + + // Add the tab to the manage navigation + bp_core_new_subnav_item( $subnav_args ); // Catch the edit screen and forward it to the plugin template if ( bp_is_groups_component() && bp_is_current_action( 'admin' ) && bp_is_action_variable( $screen['slug'], 0 ) ) { diff --git src/bp-groups/bp-groups-loader.php src/bp-groups/bp-groups-loader.php index d3ccbcf..2a30d71 100644 --- src/bp-groups/bp-groups-loader.php +++ src/bp-groups/bp-groups-loader.php @@ -507,10 +507,7 @@ class BP_Groups_Component extends BP_Component { 'item_css_id' => 'admin', 'no_access_url' => $group_link, ); - } - // If viewing an admin page, create the group admin subnav items - if ( bp_is_group_admin_page() ) { $admin_link = trailingslashit( $group_link . 'admin' ); // Common params to all nav items @@ -519,6 +516,7 @@ class BP_Groups_Component extends BP_Component { 'parent_slug' => $this->current_group->slug . '_manage', 'screen_function' => 'groups_screen_group_admin', 'user_has_access' => bp_is_item_admin(), + 'in_admin_bar' => true, ); $sub_nav[] = array_merge( array(