2 files changed, 43 insertions, 38 deletions

diff --git a/plugins/jetpack/modules/masterbar/masterbar.php b/plugins/jetpack/modules/masterbar/masterbar.php
index 300c7bde..fde17fb6 100644
--- a/plugins/jetpack/modules/masterbar/masterbar.php
+++ b/plugins/jetpack/modules/masterbar/masterbar.php
@@ -122,7 +122,7 @@ class A8C_WPCOM_Masterbar {
 		}
 
 		wp_enqueue_script( 'jetpack-accessible-focus', plugins_url( '_inc/accessible-focus.js', JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
-		wp_enqueue_script( 'a8c_wpcom_masterbar_overrides', $this->wpcom_static_url( '/wp-content/mu-plugins/admin-bar/masterbar-overrides/masterbar.js' ), array(), JETPACK__VERSION );
+		wp_enqueue_script( 'a8c_wpcom_masterbar_overrides', $this->wpcom_static_url( '/wp-content/mu-plugins/admin-bar/masterbar-overrides/masterbar.js' ), array( 'jquery' ), JETPACK__VERSION );
 	}
 
 	function wpcom_static_url( $file ) {
@@ -643,76 +643,89 @@ class A8C_WPCOM_Masterbar {
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'publish',
 			'id'     => 'publish-header',
-			'title'  => esc_html_x( 'Publish', 'admin bar menu group label', 'jetpack' ),
+			'title'  => esc_html_x( 'Manage', 'admin bar menu group label', 'jetpack' ),
 			'meta'   => array(
 				'class' => 'ab-submenu-header',
 			),
 		) );
 
-		// Blog Posts
-		$posts_title = $this->create_menu_item_pair(
+		// Pages
+		$pages_title = $this->create_menu_item_pair(
 			array(
-				'url'   => 'https://wordpress.com/posts/' . esc_attr( $this->primary_site_slug ),
-				'id'    => 'wp-admin-bar-edit-post',
-				'label' => esc_html__( 'Blog Posts', 'jetpack' ),
+				'url'   => 'https://wordpress.com/pages/' . esc_attr( $this->primary_site_slug ),
+				'id'    => 'wp-admin-bar-edit-page',
+				'label' => esc_html__( 'Site Pages', 'jetpack' ),
 			),
 			array(
-				'url'   => 'https://wordpress.com/post/' . esc_attr( $this->primary_site_slug ),
-				'id'    => 'wp-admin-bar-new-post',
+				'url'   => 'https://wordpress.com/page/' . esc_attr( $this->primary_site_slug ),
+				'id'    => 'wp-admin-bar-new-page',
 				'label' => esc_html_x( 'Add', 'admin bar menu new item label', 'jetpack' ),
 			)
 		);
 
-		if ( ! current_user_can( 'edit_posts' ) ) {
-			$posts_title = $this->create_menu_item_anchor(
+		if ( ! current_user_can( 'edit_pages' ) ) {
+			$pages_title = $this->create_menu_item_anchor(
 				'ab-item ab-primary mb-icon',
-				'https://wordpress.com/posts/' . esc_attr( $this->primary_site_slug ),
-				esc_html__( 'Blog Posts', 'jetpack' ),
-				'wp-admin-bar-edit-post'
+				'https://wordpress.com/pages/' . esc_attr( $this->primary_site_slug ),
+				esc_html__( 'Site Pages', 'jetpack' ),
+				'wp-admin-bar-edit-page'
 			);
 		}
 
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'publish',
-			'id'     => 'new-post',
-			'title'  => $posts_title,
+			'id'     => 'new-page',
+			'title'  => $pages_title,
 			'meta'   => array(
 				'class' => 'inline-action',
 			),
 		) );
 
-		// Pages
-		$pages_title = $this->create_menu_item_pair(
+		// Blog Posts
+		$posts_title = $this->create_menu_item_pair(
 			array(
-				'url'   => 'https://wordpress.com/pages/' . esc_attr( $this->primary_site_slug ),
-				'id'    => 'wp-admin-bar-edit-page',
-				'label' => esc_html__( 'Pages', 'jetpack' ),
+				'url'   => 'https://wordpress.com/posts/' . esc_attr( $this->primary_site_slug ),
+				'id'    => 'wp-admin-bar-edit-post',
+				'label' => esc_html__( 'Blog Posts', 'jetpack' ),
 			),
 			array(
-				'url'   => 'https://wordpress.com/page/' . esc_attr( $this->primary_site_slug ),
-				'id'    => 'wp-admin-bar-new-page',
+				'url'   => 'https://wordpress.com/post/' . esc_attr( $this->primary_site_slug ),
+				'id'    => 'wp-admin-bar-new-post',
 				'label' => esc_html_x( 'Add', 'admin bar menu new item label', 'jetpack' ),
 			)
 		);
 
-		if ( ! current_user_can( 'edit_pages' ) ) {
-			$pages_title = $this->create_menu_item_anchor(
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			$posts_title = $this->create_menu_item_anchor(
 				'ab-item ab-primary mb-icon',
-				'https://wordpress.com/pages/' . esc_attr( $this->primary_site_slug ),
-				esc_html__( 'Pages', 'jetpack' ),
-				'wp-admin-bar-edit-page'
+				'https://wordpress.com/posts/' . esc_attr( $this->primary_site_slug ),
+				esc_html__( 'Blog Posts', 'jetpack' ),
+				'wp-admin-bar-edit-post'
 			);
 		}
 
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'publish',
-			'id'     => 'new-page',
-			'title'  => $pages_title,
+			'id'     => 'new-post',
+			'title'  => $posts_title,
 			'meta'   => array(
 				'class' => 'inline-action',
 			),
 		) );
 
+		// Comments
+		if ( current_user_can( 'moderate_comments' ) ) {
+			$wp_admin_bar->add_menu( array(
+				'parent' => 'publish',
+				'id'     => 'comments',
+				'title'  => __( 'Comments' ),
+				'href'   => 'https://wordpress.com/comments/' . esc_attr( $this->primary_site_slug ),
+				'meta'   => array(
+					'class' => 'mb-icon',
+				),
+			) );
+		}
+
 		// Testimonials
 		if ( Jetpack::is_module_active( 'custom-content-types' ) && get_option( 'jetpack_testimonial' ) ) {
 			$testimonials_title = $this->create_menu_item_pair(
diff --git a/plugins/jetpack/modules/masterbar/overrides.css b/plugins/jetpack/modules/masterbar/overrides.css
index 689b283d..4440c21c 100644
--- a/plugins/jetpack/modules/masterbar/overrides.css
+++ b/plugins/jetpack/modules/masterbar/overrides.css
@@ -54,11 +54,3 @@
 #wp-admin-bar-notes.active .noticon-bell:before {
     content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cmVjdCB4PSIwIiBmaWxsPSJub25lIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiLz48Zz48cGF0aCBmaWxsPSIjMjMyODJkIiBkPSJNNi4xNCAxNC45N2wyLjgyOCAyLjgyN2MtLjM2Mi4zNjItLjg2Mi41ODYtMS40MTQuNTg2LTEuMTA1IDAtMi0uODk1LTItMiAwLS41NTIuMjI0LTEuMDUyLjU4Ni0xLjQxNHptOC44NjcgNS4zMjRMMTQuMyAyMSAzIDkuN2wuNzA2LS43MDcgMS4xMDIuMTU3Yy43NTQuMTA4IDEuNjktLjEyMiAyLjA3Ny0uNTFsMy44ODUtMy44ODRjMi4zNC0yLjM0IDYuMTM1LTIuMzQgOC40NzUgMHMyLjM0IDYuMTM1IDAgOC40NzVsLTMuODg1IDMuODg2Yy0uMzg4LjM4OC0uNjE4IDEuMzIzLS41MSAyLjA3N2wuMTU3IDEuMXoiLz48L2c+PC9zdmc+") !important;
 }
-
-/* Fix changing height issue on hover in pop-up menus */
-#wpadminbar .quicklinks .menupop ul li .ab-item {
-	height: auto !important;
-}
-#wpadminbar .menupop .ab-submenu .ab-submenu-header > .ab-empty-item {
-	line-height: 1 !important;
-}