Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Masterbar: Remove User Info side-panel #39546

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Masterbar: Remove User Info side-panel #39546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ebb575
Masterbar: Remove User Info side-panel
fgiannar Sep 26, 2024
4cab918
changelog
fgiannar Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/packages/masterbar/changelog/update-masterbar-remove-user-info-sidepanel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: removed

Masterbar: Remove User Info side-panel
82 changes: 0 additions & 82 deletions projects/packages/masterbar/src/masterbar/class-masterbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,16 +721,6 @@ public function wpcom_adminbar_add_secondary_groups( $wp_admin_bar ) {
)
);

$wp_admin_bar->add_group(
array(
'parent' => 'blog',
'id' => 'blog-secondary',
'meta' => array(
'class' => 'ab-sub-secondary',
),
)
);

$wp_admin_bar->add_group(
array(
'id' => 'top-secondary',
Expand Down Expand Up @@ -767,69 +757,6 @@ public function add_me_submenu( $wp_admin_bar ) {
),
)
);

/** This filter is documented in modules/masterbar.php */
if ( apply_filters( 'jetpack_load_admin_menu_class', false ) ) {
return;
}

$id = 'user-actions';
$wp_admin_bar->add_group(
array(
'parent' => 'my-account',
'id' => $id,
)
);

$logout_url = wp_logout_url();
$logout_url = add_query_arg( 'context', 'masterbar', $logout_url );

$user_info = get_avatar( $this->user_email, 128, 'mm', '', array( 'force_display' => true ) );
$user_info .= '<span class="display-name">' . $this->display_name . '</span>';
$user_info .= '<span class="username">' . $this->user_login . '</span>';

$blog_id = Connection_Manager::get_site_id( true );

$args = array();
if ( $blog_id ) {
$args['site'] = $blog_id;
}

$wp_admin_bar->add_menu(
array(
'parent' => $id,
'id' => 'user-info',
'title' => $user_info,
'meta' => array(
'class' => 'user-info user-info-item',
'tabindex' => -1,
),
)
);

$wp_admin_bar->add_menu(
array(
'parent' => $id,
'id' => 'profile',
'title' => esc_html__( 'Profile', 'jetpack-masterbar' ),
'href' => Redirect::get_url( 'calypso-me', $args ),
'meta' => array(
'class' => 'mb-icon',
),
)
);

$wp_admin_bar->add_menu(
array(
'parent' => $id,
'id' => 'logout',
'title' => esc_html__( 'Log Out', 'jetpack-masterbar' ),
'href' => $logout_url,
'meta' => array(
'class' => 'mb-icon',
),
)
);
}

/**
Expand Down Expand Up @@ -870,15 +797,6 @@ public function add_write_button( $wp_admin_bar ) {
* @param WP_Admin_Bar $wp_admin_bar Admin Bar instance.
*/
public function add_my_sites_submenu( $wp_admin_bar ) {
$blog_name = get_bloginfo( 'name' );
if ( empty( $blog_name ) ) {
$blog_name = $this->primary_site_slug;
}

if ( mb_strlen( $blog_name ) > 20 ) {
$blog_name = mb_substr( html_entity_decode( $blog_name, ENT_QUOTES ), 0, 20 ) . '&hellip;';
}

$my_site_url = 'https://wordpress.com/sites/' . $this->primary_site_url;
if ( 'wp-admin' === get_option( 'wpcom_admin_interface' ) ) {
$my_site_url = 'https://wordpress.com/sites';
Expand Down
Loading