Merge pull request #770 from Automattic/simplify/mobile-menu

Refactor: Simplify the mobile menu files

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>

newspack-theme/template-parts/header/mobile-sidebar.php

@@ -1,26 +1,36 @@
 <?php
 /**
- * Template for display the AMP mobile navigation.
+ * Template to 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; ?>