Merge pull request #4070 from Automattic/update/quadrat-templates

Quadrat: Simplify templates

quadrat/404.php

@@ -14,12 +14,6 @@
  */
 get_header();
 
-	// the header
-	get_template_part( 'template-parts/header' );
-
 	echo gutenberg_block_template_part( '404' );
 
-	// the footer
-	echo gutenberg_block_template_part( 'footer' );
-
 get_footer();

quadrat/block-template-parts/404.html

@@ -1,3 +1,5 @@
+<!-- wp:template-part {"slug":"header"} /-->
+
 <!-- wp:group {"layout":{"inherit":true}, "className":"page-content"} -->
 <div class="wp-block-group page-content">
 
@@ -12,3 +14,5 @@
 <!-- wp:search {"label":"","buttonText":"Search"} /-->
 </div>
 <!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-template-parts/header.html

@@ -1,6 +1,6 @@
 <!-- wp:group {"tagName":"header","className":"site-header"} -->
-<div class="wp-block-group site-header"><!-- wp:site-logo /--><!-- wp:site-title /-->
+<header class="wp-block-group site-header"><!-- wp:site-title /-->
 
-<!-- wp:navigation {"isResponsive":true} -->
-<!-- /wp:navigation --></div>
-<!-- /wp:group -->
+<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} -->
+<!-- /wp:navigation --></header>
+<!-- /wp:group -->

quadrat/block-template-parts/query.html → quadrat/block-template-parts/index.html

@@ -1,3 +1,5 @@
+<!-- wp:template-part {"slug":"header"} /-->
+
 <!-- wp:query {"className":"page-content","layout":{"inherit":true},"queryId":1,"query":{"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true}} -->
 <div class="wp-block-query page-content">
 <!-- wp:query-loop -->
@@ -20,3 +22,5 @@
 
 </div>
 <!-- /wp:query -->
+
+<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-template-parts/page.html

@@ -0,0 +1,5 @@
+<!-- wp:template-part {"slug":"header"} /-->
+
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
+
+<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-template-parts/search.html

@@ -1,3 +1,5 @@
+<!-- wp:template-part {"slug":"header"} /-->
+
 <!-- wp:group {"layout":{"inherit":true}, "className":"page-content"} -->
 <div class="wp-block-group page-content">
 
@@ -16,3 +18,5 @@
 
 </div>
 <!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-template-parts/single.html

@@ -1,3 +1,5 @@
+<!-- wp:template-part {"slug":"header"} /-->
+
 <!-- wp:group {"className":"post-header"} -->
 <div class="wp-block-group post-header">
 
@@ -49,3 +51,5 @@
 	<!-- wp:post-comments /-->
 </div>
 <!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-templates/404.html

@@ -1,5 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
 <!-- wp:template-part {"slug":"404"} /-->
-
-<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-templates/page.html

@@ -1,6 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"footer"} /-->
-
+<!-- wp:template-part {"slug":"page"} /-->

quadrat/block-templates/search.html

@@ -1,5 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
 <!-- wp:template-part {"slug":"search"} /-->
-
-<!-- wp:template-part {"slug":"footer"} /-->

quadrat/block-templates/single.html

@@ -1,5 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
 <!-- wp:template-part {"slug":"single"} /-->
-
-<!-- wp:template-part {"slug":"footer"} /-->

quadrat/index.php

@@ -14,13 +14,7 @@
  */
 get_header();
 
-	// the header
-	get_template_part( 'template-parts/header' );
-
-	// the query
-	echo gutenberg_block_template_part( 'query' );
-
-	// the footer
-	echo gutenberg_block_template_part( 'footer' );
+// the query
+echo gutenberg_block_template_part( 'index' );
 
 get_footer();

quadrat/search.php

@@ -14,12 +14,6 @@
  */
 get_header();
 
-	// the header
-	get_template_part( 'template-parts/header' );
-
-	echo gutenberg_block_template_part( 'search' );
-
-	// the footer
-	echo gutenberg_block_template_part( 'footer' );
+echo gutenberg_block_template_part( 'search' );
 
 get_footer();

quadrat/single.php

@@ -9,12 +9,6 @@
  */
 get_header();
 
-	// the header
-	get_template_part( 'template-parts/header' );
-
-	echo gutenberg_block_template_part( 'single' );
-
-	// the footer
-	echo gutenberg_block_template_part( 'footer' );
+echo gutenberg_block_template_part( 'single' );
 
 get_footer();