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

…rl-rewrites
pewresearch · Mar 5, 2024 · 106dd6b · 106dd6b
1 parent 3e0a280
commit 106dd6b
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 20,059 deletions.
diff --git a/includes/decoded/class-decoded.php b/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,

diff --git a/includes/gutenberg/class-gutenberg.php b/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 ) {

diff --git a/includes/homepages/class-homepages.php b/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' ),

diff --git a/includes/interactives/blocks/loader-block/build/block.json b/includes/interactives/blocks/loader-block/build/block.json
@@ -30,6 +30,26 @@
           "type": "string"
         },
         "deps": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "legacyAssetsS3": {
+      "type": "object",
+      "properties": {
+        "path": {
+          "type": "string"
+        },
+        "react": {
+          "type": "string"
+        },
+        "libraries": {
+          "type": "string"
+        },
+        "styles": {
           "type": "string"
         }
       }
@@ -49,6 +69,5 @@
     "postType"
   ],
   "textdomain": "prc-platform-interactive-loader",
-  "editorScript": "file:./index.js",
-  "style": "file:./style-index.css"
+  "editorScript": "file:./index.js"
 }
diff --git a/includes/interactives/blocks/loader-block/build/index.asset.php b/includes/interactives/blocks/loader-block/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '8b748b48794fa4d2e372');
+<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '7f7c92b447cefccfda24');
diff --git a/includes/interactives/blocks/loader-block/build/index.js b/includes/interactives/blocks/loader-block/build/index.js
diff --git a/includes/interactives/blocks/loader-block/build/index.js.map b/includes/interactives/blocks/loader-block/build/index.js.map
diff --git a/includes/interactives/blocks/loader-block/build/style-index.css b/includes/interactives/blocks/loader-block/build/style-index.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '8b748b48794fa4d2e372');
		<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '7f7c92b447cefccfda24');