Merge pull request #711 from alex-wright-net/master-sidebar-organize

Organize sidebar files into loop-templates directory

footer.php

@@ -11,7 +11,7 @@ $the_theme = wp_get_theme();
 $container = get_theme_mod( 'understrap_container_type' );
 ?>
 
-<?php get_sidebar( 'footerfull' ); ?>
+<?php get_template_part( 'sidebar-templates/sidebar', 'footerfull' ); ?>
 
 <div class="wrapper" id="wrapper-footer">
 

global-templates/hero.php

@@ -11,11 +11,11 @@
 
 	<div class="wrapper" id="wrapper-hero">
 	
-		<?php get_sidebar( 'hero' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'hero' ); ?>
 		
-		<?php get_sidebar( 'herocanvas' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'herocanvas' ); ?>
 
-		<?php get_sidebar( 'statichero' ); ?>
+		<?php get_template_part( 'sidebar-templates/sidebar', 'statichero' ); ?>
 
 	</div>
 

global-templates/left-sidebar-check.php

@@ -12,7 +12,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-	<?php get_sidebar( 'left' ); ?>
+	<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 <?php endif; ?>
 
 <?php

global-templates/right-sidebar-check.php

@@ -12,6 +12,6 @@
 
 <?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
 
-  <?php get_sidebar( 'right' ); ?>
+  <?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 
 <?php endif; ?>

page-templates/both-sidebarspage.php

@@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<?php get_sidebar( 'left' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 
 			<div
 				class="<?php
@@ -46,7 +46,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 			</div><!-- #primary -->
 
-			<?php get_sidebar( 'right' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 			
 		</div><!-- .row -->
 

page-templates/left-sidebarpage.php

@@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<?php get_sidebar( 'left' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
 
 			<div
 				class="<?php if ( is_active_sidebar( 'left-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area"

page-templates/right-sidebarpage.php

@@ -40,7 +40,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 			</div><!-- #primary -->
 
-			<?php get_sidebar( 'right' ); ?>
+			<?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 
 		</div><!-- .row -->
 

sidebar-templates/sidebar-left.php

@@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 	<?php endif; ?>
 <?php dynamic_sidebar( 'left-sidebar' ); ?>
 
-</div><!-- #secondary -->
+</div><!-- #left-sidebar -->

sidebar-templates/sidebar-right.php

@@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 	<?php endif; ?>
 <?php dynamic_sidebar( 'right-sidebar' ); ?>
 
-</div><!-- #secondary -->
+</div><!-- #right-sidebar -->

sidebar.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * The sidebar containing the main widget area.
- *
- * @package understrap
- */
-
-if ( ! is_active_sidebar( 'sidebar-1' ) ) {
-	return;
-}
-?>
-
-<div class="col-md-4 widget-area" id="secondary" role="complementary">
-
-	<?php dynamic_sidebar( 'sidebar-1' ); ?>
-
-</div><!-- #secondary -->