refactored site-navigation

coutoire/template-parts/header/header-content.php

@@ -1,29 +1,7 @@
 <header id="masthead" class="site-header alignfull">
 
 	<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
-
-	<?php if ( has_nav_menu( 'menu-1' ) ) : ?>
-		<nav id="site-navigation" class="main-navigation" aria-label="<?php esc_attr_e( 'Main Navigation', 'varia' ); ?>">
-			<input type="checkbox" role="button" aria-haspopup="true" id="toggle" class="hide-visually">
-			<label for="toggle" id="toggle-menu" class="button">
-				<?php _e( 'Menu', 'varia' ); ?>
-				<span class="dropdown-icon open">+</span>
-				<span class="dropdown-icon close">&times;</span>
-				<span class="hide-visually expanded-text"><?php _e( 'expanded', 'varia' ); ?></span>
-				<span class="hide-visually collapsed-text"><?php _e( 'collapsed', 'varia' ); ?></span>
-			</label>
-			<?php
-			wp_nav_menu(
-				array(
-					'theme_location' => 'menu-1',
-					'menu_class'     => 'main-menu',
-					'items_wrap'     => '<ul id="%1$s" class="%2$s" aria-label="submenu">%3$s</ul>',
-				)
-			);
-			?>
-		</nav><!-- #site-navigation -->
-	<?php endif; ?>
-
+	<?php get_template_part( 'template-parts/header/site', 'navigation' ); ?>
 	<?php get_template_part( 'template-parts/header/social', 'navigation' ); ?>
 
 </header><!-- #masthead -->

dalston/template-parts/header/site-navigation.php

@@ -1,25 +0,0 @@
-<?php 
-$has_primary_nav = has_nav_menu( 'menu-1' );
-if ( $has_primary_nav) : ?>
-	<nav id="site-navigation" class="main-navigation" aria-label="<?php esc_attr_e( 'Main Navigation', 'varia' ); ?>">
-		<input type="checkbox" role="button" aria-haspopup="true" id="toggle" class="hide-visually">
-		<label for="toggle" id="toggle-menu" class="button">
-			<?php _e( 'Menu', 'varia' ); ?>
-			<span class="dropdown-icon open">+</span>
-			<span class="dropdown-icon close">&times;</span>
-			<span class="hide-visually expanded-text"><?php _e( 'expanded', 'varia' ); ?></span>
-			<span class="hide-visually collapsed-text"><?php _e( 'collapsed', 'varia' ); ?></span>
-		</label>
-		<?php
-			$main_nav_args = array(
-			'theme_location'  => 'menu-1',
-			'menu_class'      => 'main-menu',
-			'items_wrap'      => '<ul id="%1$s" class="%2$s" aria-label="submenu">%3$s</ul>',
-		);
-		if ( get_theme_mod( 'enable_side_menu' ) === 1 ) {
-			$main_nav_args[ 'container_class' ] = 'main-menu-container';
-		}
-		wp_nav_menu( $main_nav_args );
-		?>
-	</nav><!-- #site-navigation -->
-<?php endif; ?>

morden/template-parts/header/site-navigation.php

@@ -1,27 +0,0 @@
-<?php 
-$has_primary_nav = has_nav_menu( 'menu-1' );	
-if ( $has_primary_nav ) : ?>
-	<nav id="site-navigation" class="main-navigation" aria-label="<?php esc_attr_e( 'Main Navigation', 'varia' ); ?>">
-
-		<input type="checkbox" role="button" aria-haspopup="true" id="toggle" class="hide-visually">
-		<label for="toggle" id="toggle-menu" class="button">
-			<?php _e( 'Menu', 'varia' ); ?>
-			<span class="dropdown-icon open">+</span>
-			<span class="dropdown-icon close">&times;</span>
-			<span class="hide-visually expanded-text"><?php _e( 'expanded', 'varia' ); ?></span>
-			<span class="hide-visually collapsed-text"><?php _e( 'collapsed', 'varia' ); ?></span>
-		</label>
-
-		<?php
-		$main_nav_args = array(
-			'theme_location'  => 'menu-1',
-			'menu_class'      => 'main-menu',
-			'items_wrap'      => '<ul id="%1$s" class="%2$s" aria-label="submenu">%3$s</ul>',
-		);
-		if ( get_theme_mod( 'enable_side_menu' ) === 1 ) {
-			$main_nav_args[ 'container_class' ] = 'main-menu-container';
-		}
-		wp_nav_menu( $main_nav_args );
-		?>
-	</nav><!-- #site-navigation -->
-<?php endif; ?>

varia/template-parts/header/header-content.php

@@ -9,4 +9,5 @@ $header_classes .= $has_primary_nav ? ' has-menu' : '';
 <header id="masthead" class="<?php echo $header_classes; ?>" role="banner">
 	<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
 	<?php get_template_part( 'template-parts/header/site', 'navigation' ); ?>
+	<?php get_template_part( 'template-parts/header/social', 'navigation' ); ?>
 </header><!-- #masthead -->

varia/template-parts/header/site-navigation.php

@@ -33,6 +33,4 @@
 		wp_nav_menu( $main_nav_args );
 		?>
 	</nav><!-- #site-navigation -->
-<?php endif; ?>
-
-<?php get_template_part( 'template-parts/header/social', 'navigation' ); ?>
+<?php endif; ?>