Merge pull request #471 from Vishal-Deshpande/master

Right Sidebar Check - Thx @Vishal-Deshpande
This commit is contained in:
Holger 2017-12-22 07:35:30 +01:00 committed by GitHub
commit 8382633fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 42 deletions

View File

@ -12,7 +12,6 @@ get_header();
<?php <?php
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
<div class="wrapper" id="archive-wrapper"> <div class="wrapper" id="archive-wrapper">
@ -64,11 +63,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div> <!-- .row --> </div> <!-- .row -->

View File

@ -9,7 +9,6 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
@ -88,11 +87,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div> <!-- .row --> </div> <!-- .row -->

View File

@ -0,0 +1,15 @@
<?php
/**
* Right sidebar check.
*
* @package understrap
*/
?>
<?php $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' ); ?>
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>

View File

@ -14,7 +14,6 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
<?php if ( is_front_page() && is_home() ) : ?> <?php if ( is_front_page() && is_home() ) : ?>
@ -64,11 +63,8 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div><!-- .row --> </div><!-- .row -->

View File

@ -13,7 +13,6 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
@ -46,11 +45,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div><!-- .row --> </div><!-- .row -->

View File

@ -8,7 +8,7 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
<div class="wrapper" id="search-wrapper"> <div class="wrapper" id="search-wrapper">
@ -61,11 +61,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div><!-- .row --> </div><!-- .row -->

View File

@ -7,7 +7,6 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
<div class="wrapper" id="single-wrapper"> <div class="wrapper" id="single-wrapper">
@ -41,11 +40,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div><!-- .row --> </div><!-- .row -->

View File

@ -13,7 +13,7 @@
get_header(); get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
@ -55,11 +55,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
</div><!-- #primary --> </div><!-- #primary -->
<!-- Do the right sidebar check --> <!-- Do the right sidebar check -->
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
<?php get_sidebar( 'right' ); ?>
<?php endif; ?>
</div><!-- .row --> </div><!-- .row -->