From cec8466ed5168f5e2b42887eb6da026d6573bd25 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 1 Sep 2021 12:25:51 -0700
Subject: [PATCH] Header/Footer: Minor cleanup

* Rename files, since they'll no longer be directly `include`'d by classic themes
* Restore FSE editor formatting, to avoid future diff noise
* Add OpenVerse, since it'll launch before this does

See https://github.com/WordPress/wporg-news-2021/issues/6
---
 .../{universal-footer.php => footer.php}      | 27 ++++++++++++++++---
 .../{universal-header.php => header.php}      |  2 ++
 2 files changed, 25 insertions(+), 4 deletions(-)
 rename mu-plugins/blocks/global-header-footer/{universal-footer.php => footer.php} (94%)
 rename mu-plugins/blocks/global-header-footer/{universal-header.php => header.php} (95%)

diff --git a/mu-plugins/blocks/global-header-footer/universal-footer.php b/mu-plugins/blocks/global-header-footer/footer.php
similarity index 94%
rename from mu-plugins/blocks/global-header-footer/universal-footer.php
rename to mu-plugins/blocks/global-header-footer/footer.php
index 7e2ab2097..806c2ddee 100644
--- a/mu-plugins/blocks/global-header-footer/universal-footer.php
+++ b/mu-plugins/blocks/global-header-footer/footer.php
@@ -7,35 +7,54 @@
 ?>
 
 <!-- wp:group {"tagName":"footer","className":"site-footer","layout":{"inherit":true}} -->
-<footer class="wp-block-group site-footer">
-<!-- wp:navigation {"orientation":"horizontal","isResponsive":true} -->
+<footer class="wp-block-group site-footer"><!-- wp:navigation {"orientation":"horizontal","isResponsive":true} -->
 <!-- wp:navigation-link {"label":"About","url":"https://wordpress.org/about/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Blog","url":"https://wordpress.org/news","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Hosting","url":"https://wordpress.org/hosting/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Donate","url":"https://wordpressfoundation.org/donate/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Support","url":"https://wordpress.org/support/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Developers","url":"https://developer.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Get Involved","url":"https://make.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Learn","url":"https://learn.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Showcase","url":"https://wordpress.org/showcase/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Plugins","url":"https://wordpress.org/plugins/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Themes","url":"https://wordpress.org/themes/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Patterns","url":"https://wordpress.org/patterns/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"OpenVerse","url":"https://wordpress.org/openverse/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Mobile","url":"https://wordpress.org/mobile/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"WordCamp","url":"https://central.wordcamp.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"WordPress.TV","url":"https://wordpress.tv/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"BuddyPress","url":"https://buddypress.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"bbPress","url":"https://bbpress.org/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"WordPress.com","url":"https://wordpress.com/?ref=wporg-footer","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Matt","url":"https://ma.tt/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Privacy","url":"https://wordpress.org/about/privacy/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Public Code","url":"https://publiccode.eu/","kind":"custom","isTopLevelLink":true} /-->
 <!-- /wp:navigation -->
 
 <!-- wp:group {"className":"site-footer__logos-container","layout":{"inherit":true}} -->
-<div class="wp-block-group site-footer__logos-container">
-	<!-- wp:image {"width":155,"height":24} -->
+<div class="wp-block-group site-footer__logos-container"><!-- wp:image {"width":155,"height":24} -->
 <figure class="wp-block-image is-resized"><img src="https://s.w.org/style/images/wporg-logo.svg?3" alt="" width="155" height="24"/></figure>
 <!-- /wp:image -->
 
diff --git a/mu-plugins/blocks/global-header-footer/universal-header.php b/mu-plugins/blocks/global-header-footer/header.php
similarity index 95%
rename from mu-plugins/blocks/global-header-footer/universal-header.php
rename to mu-plugins/blocks/global-header-footer/header.php
index af559d519..edc97325a 100644
--- a/mu-plugins/blocks/global-header-footer/universal-header.php
+++ b/mu-plugins/blocks/global-header-footer/header.php
@@ -25,6 +25,8 @@
 
 <!-- wp:navigation-link {"label":"Patterns","url":"https://wordpress.org/patterns/","kind":"custom","isTopLevelLink":true} /-->
 
+<!-- wp:navigation-link {"label":"OpenVerse","url":"https://wordpress.org/openverse/","kind":"custom","isTopLevelLink":true} /-->
+
 <!-- wp:navigation-link {"label":"Learn","url":"https://learn.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->
 
 <!-- wp:navigation-link {"label":"Support","url":"https://wordpress.org/support/","kind":"custom","isTopLevelLink":true} /-->