Changeset 52158

Timestamp:

11/15/2021 03:42:08 AM (3 years ago)

Author:

noisysocks

Message:

Editor: Fix how the Site Editor is linked to

• Add 'Edit site' to the top admin bar.
• Link to the Template and Template Part CPTs.
• Add deep link to the Global Styles UI.

Follows [52069].
See #54337.

Location:

trunk/src

Files:

• wp-admin/menu.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (3 diffs)
• wp-includes/class-wp-admin-bar.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)

trunk/src/wp-admin/menu.php

@@ -213 +213 @@
         'site-editor.php',
     );
+
+    $submenu['themes.php'][7] = array(
+        __( 'Styles' ),
+        'edit_theme_options',
+        'site-editor.php?styles=open',
+    );
 }
 

trunk/src/wp-includes/admin-bar.php

@@ -410 +410 @@
 
 /**
+ * Adds the "Edit site" link to the Toolbar.
+ *
+ * @since 5.9.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+ */
+function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+    // Don't show if a block theme is not activated.
+    if ( ! wp_is_block_template_theme() ) {
+        return;
+    }
+
+    // Don't show for users who can't edit theme options or when in the admin.
+    if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) {
+        return;
+    }
+
+    $wp_admin_bar->add_node(
+        array(
+            'id'    => 'site-editor',
+            'title' => __( 'Edit site' ),
+            'href'  => admin_url( 'site-editor.php' ),
+        )
+    );
+}
+
+/**
  * Adds the "Customize" link to the Toolbar.
  *
@@ -419 +446 @@
 function wp_admin_bar_customize_menu( $wp_admin_bar ) {
     global $wp_customize;
+
+    // Don't show if a block theme is activated.
+    if ( wp_is_block_template_theme() ) {
+        return;
+    }
 
     // Don't show for users who can't access the customizer or when in the admin.
@@ -429 +461 @@
         && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() )
     ) {
-        return;
-    }
-
-    // Don't show if a block theme is activated.
-    if ( wp_is_block_template_theme() ) {
         return;
     }

trunk/src/wp-includes/class-wp-admin-bar.php

@@ -643 +643 @@
         add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_edit_site_menu', 40 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );

trunk/src/wp-includes/post.php

@@ -341 +341 @@
                 'edit_item'             => __( 'Edit Template' ),
                 'view_item'             => __( 'View Template' ),
-                'all_items'             => __( 'All Templates' ),
+                'all_items'             => __( 'Templates' ),
                 'search_items'          => __( 'Search Templates' ),
                 'parent_item_colon'     => __( 'Parent Template:' ),
@@ -357 +357 @@
             '_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
             'has_archive'           => false,
-            'show_ui'               => false,
-            'show_in_menu'          => false,
+            'show_ui'               => wp_is_block_template_theme(),
+            'show_in_menu'          => 'themes.php',
             'show_in_rest'          => true,
             'rewrite'               => false,
@@ -400 +400 @@
                 'edit_item'             => __( 'Edit Template Part' ),
                 'view_item'             => __( 'View Template Part' ),
-                'all_items'             => __( 'All Template Parts' ),
+                'all_items'             => __( 'Template Parts' ),
                 'search_items'          => __( 'Search Template Parts' ),
                 'parent_item_colon'     => __( 'Parent Template Part:' ),
@@ -416 +416 @@
             '_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
             'has_archive'           => false,
-            'show_ui'               => false,
-            'show_in_menu'          => false,
+            'show_ui'               => wp_is_block_template_theme(),
+            'show_in_menu'          => 'themes.php',
             'show_in_rest'          => true,
             'rewrite'               => false,