From 023b999cc8a29b68e5f042fe7b8c47b9f66b49ee Mon Sep 17 00:00:00 2001
From: Laurel Fulford <laurel.fulford@automattic.com>
Date: Tue, 11 Feb 2020 14:36:20 -0800
Subject: [PATCH 1/2] Refactor: Simplify the mobile menu files.

---
 newspack-theme/header.php                     |  8 +---
 .../header/mobile-sidebar-fallback.php        | 26 -------------
 .../template-parts/header/mobile-sidebar.php  | 38 ++++++++++++-------
 3 files changed, 25 insertions(+), 47 deletions(-)
 delete mode 100644 newspack-theme/template-parts/header/mobile-sidebar-fallback.php

diff --git a/newspack-theme/header.php b/newspack-theme/header.php
index 5e3897e38..1118ebfc5 100755
--- a/newspack-theme/header.php
+++ b/newspack-theme/header.php
@@ -21,13 +21,7 @@
 <?php do_action( 'wp_body_open' ); ?>
 <?php do_action( 'before_header' ); ?>
 
-<?php
-	if ( newspack_is_amp() ) {
-		get_template_part( 'template-parts/header/mobile', 'sidebar' );
-	} else {
-		get_template_part( 'template-parts/header/mobile', 'sidebar-fallback' );
-	}
-?>
+<?php get_template_part( 'template-parts/header/mobile', 'sidebar' ); ?>
 
 <div id="page" class="site">
 	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'newspack' ); ?></a>
diff --git a/newspack-theme/template-parts/header/mobile-sidebar-fallback.php b/newspack-theme/template-parts/header/mobile-sidebar-fallback.php
deleted file mode 100644
index e0a3ecbac..000000000
--- a/newspack-theme/template-parts/header/mobile-sidebar-fallback.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Template for display the non-AMP mobile navigation.
- *
- * @package Newspack
- */
-?>
-
-<aside id="mobile-sidebar-fallback" class="mobile-sidebar">
-
-	<button class="mobile-menu-toggle">
-		<?php echo wp_kses( newspack_get_icon_svg( 'close', 20 ), newspack_sanitize_svgs() ); ?>
-		<?php esc_html_e( 'Close', 'newspack' ); ?>
-	</button>
-
-	<?php newspack_tertiary_menu(); ?>
-
-	<?php get_search_form(); ?>
-
-	<?php newspack_primary_menu(); ?>
-
-	<?php newspack_secondary_menu(); ?>
-
-	<?php newspack_social_menu_header(); ?>
-
-</aside>
diff --git a/newspack-theme/template-parts/header/mobile-sidebar.php b/newspack-theme/template-parts/header/mobile-sidebar.php
index a6b844b45..776ba6892 100644
--- a/newspack-theme/template-parts/header/mobile-sidebar.php
+++ b/newspack-theme/template-parts/header/mobile-sidebar.php
@@ -1,26 +1,36 @@
 <?php
 /**
- * Template for display the AMP mobile navigation.
+ * Template for display the mobile navigation, either AMP or fallback.
  *
  * @package Newspack
  */
-?>
 
-<amp-sidebar id="mobile-sidebar" layout="nodisplay" side="right" class="mobile-sidebar">
+if ( newspack_is_amp() ) : ?>
+	<amp-sidebar id="mobile-sidebar" layout="nodisplay" side="right" class="mobile-sidebar">
+		<button class="mobile-menu-toggle" on='tap:mobile-sidebar.toggle'>
+			<?php echo wp_kses( newspack_get_icon_svg( 'close', 20 ), newspack_sanitize_svgs() ); ?>
+			<?php esc_html_e( 'Close', 'newspack' ); ?>
+		</button>
+<?php else : ?>
+	<aside id="mobile-sidebar-fallback" class="mobile-sidebar">
+		<button class="mobile-menu-toggle">
+			<?php echo wp_kses( newspack_get_icon_svg( 'close', 20 ), newspack_sanitize_svgs() ); ?>
+			<?php esc_html_e( 'Close', 'newspack' ); ?>
+		</button>
+<?php endif; ?>
 
-	<button class="mobile-menu-toggle" on='tap:mobile-sidebar.toggle'>
-		<?php echo wp_kses( newspack_get_icon_svg( 'close', 20 ), newspack_sanitize_svgs() ); ?>
-		<?php esc_html_e( 'Close', 'newspack' ); ?>
-	</button>
+		<?php newspack_tertiary_menu(); ?>
 
-	<?php newspack_tertiary_menu(); ?>
+		<?php get_search_form(); ?>
 
-	<?php get_search_form(); ?>
+		<?php newspack_primary_menu(); ?>
 
-	<?php newspack_primary_menu(); ?>
+		<?php newspack_secondary_menu(); ?>
 
-	<?php newspack_secondary_menu(); ?>
+		<?php newspack_social_menu_header(); ?>
 
-	<?php newspack_social_menu_header(); ?>
-
-</amp-sidebar>
+<?php if ( newspack_is_amp() ) : ?>
+	</amp-sidebar>
+<?php else : ?>
+	</aside>
+<?php endif; ?>

From 98439e46c627edfdf891421407d0ad7eb3299c41 Mon Sep 17 00:00:00 2001
From: Laurel Fulford <laurel.fulford@automattic.com>
Date: Mon, 24 Feb 2020 20:09:41 -0800
Subject: [PATCH 2/2] Refactor: Correct code comment.

---
 newspack-theme/template-parts/header/mobile-sidebar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newspack-theme/template-parts/header/mobile-sidebar.php b/newspack-theme/template-parts/header/mobile-sidebar.php
index 776ba6892..e511d1936 100644
--- a/newspack-theme/template-parts/header/mobile-sidebar.php
+++ b/newspack-theme/template-parts/header/mobile-sidebar.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template for display the mobile navigation, either AMP or fallback.
+ * Template to display the mobile navigation, either AMP or fallback.
  *
  * @package Newspack
  */