See pewresearch/pewresearch-org@19aacfc from refs/heads/release/5.0-u…

…rl-rewrites

includes/decoded/class-decoded.php

@@ -80,8 +80,8 @@ public function register_type() {
 			'label'               => __( 'Decoded', 'text_domain' ),
 			'description'         => __( 'A post type for Decoded blog posts.', 'text_domain' ),
 			'labels'              => $labels,
-			'supports'            => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions', 'custom-fields' ),
-			'taxonomies'          => array( 'category', 'research-teams', 'collection', 'languages', 'formats' ),
+			'supports'            => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions' ),
+			'taxonomies'          => array( 'formats' ),
 			'hierarchical'        => false,
 			'public'              => true,
 			'show_ui'             => true,

includes/gutenberg/class-gutenberg.php

@@ -76,7 +76,6 @@ public function load_gutenberg( $use_block_editor, $post ) {
 	/**
 	 * Enable revisions for reusable blocks.
 	 * @hook init
-	 * @TODO: Look into this, I'm pretty sure a recent Gutenberg release defaulted to this.
 	 */
 	public function add_revisions_to_reusable_blocks() {
 		add_post_type_support( 'wp_block', 'revisions' );
@@ -92,8 +91,12 @@ public function group_admin_menus_together( $menu_order ) {
 		$new_menu_order = array();
 
 		$reorder = array(
-			'edit.php?post_type=block_module',
-			'edit.php?post_type=wp_block',
+			'edit.php?post_type=topic-page', // Legacy
+			'edit.php?post_type=template-block', // Legacy
+			'edit.php?post_type=block_module', // New
+			'edit.php?post_type=wp_block', // Core Patterns
+			'edit.php?post_type=blockmeister_pattern', // Block Meister Patterns
+			'admin.php?page=blockmeister', // Block Meister Settings
 		);
 
 		foreach ( $menu_order as $index => $item ) {

includes/homepages/class-homepages.php

@@ -205,8 +205,8 @@ public function add_front_page_quick_edit( $admin_bar ) {
 			$admin_bar->remove_menu( 'edit' );
 			$admin_bar->add_menu(
 				array(
-					'id'    => 'edit',
-					'title' => __( 'Edit Homepage' ),
+					'id'    => 'edit-homepage',
+					'title' => '<span class="ab-icon dashicons dashicons-admin-home"></span>' . _( 'Edit Homepage' ),
 					'href'  => $link,
 					'meta'  => array(
 						'title' => __( 'Edit Homepage' ),