Merge pull request #223 from ZXCVLuke/master - Thx @ZXCVLuke

Sidebar adjustments
This commit is contained in:
Holger 2017-01-20 09:19:30 +01:00 committed by GitHub
commit 0e1d91dbb5
3 changed files with 59 additions and 2 deletions

View File

@ -76,7 +76,7 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
$wp_customize,
'understrap_sidebar_position', array(
'label' => __( 'Sidebar Positioning', 'understrap' ),
'description' => __( "Set sidebar's position. Can either be: right, left, both or none",
'description' => __( "Set sidebar's default position. Can either be: right, left, both or none. Note: this can be overridden on individual pages.",
'understrap' ),
'section' => 'understrap_theme_layout_options',
'settings' => 'understrap_sidebar_position',

View File

@ -23,7 +23,11 @@ $container = get_theme_mod( 'understrap_container_type' );
<?php get_sidebar( 'left' ); ?>
<div
class="<?php if ( is_active_sidebar( 'left-sidebar' ) || is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-4<?php else : ?>col-md-12<?php endif; ?> content-area"
class="<?php
if ( is_active_sidebar( 'left-sidebar' ) xor is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-8<?php
elseif ( is_active_sidebar( 'left-sidebar' ) && is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-4<?php
else : ?>col-md-12<?php
endif; ?> content-area"
id="primary">
<main class="site-main" id="main" role="main">
@ -44,7 +48,9 @@ $container = get_theme_mod( 'understrap_container_type' );
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar( 'right' ); ?>
</div><!-- .row -->
</div><!-- Container end -->

View File

@ -0,0 +1,51 @@
<?php
/**
* Template Name: Right Sidebar Layout
*
* This template can be used to override the default template and sidebar setup
*
* @package understrap
*/
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>
<div class="wrapper" id="page-wrapper">
<div class="<?php echo esc_html( $container ); ?>" id="content">
<div class="row">
<div
class="<?php if ( is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area"
id="primary">
<main class="site-main" id="main" role="main">
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'loop-templates/content', 'page' ); ?>
<?php
// If comments are open or we have at least one comment, load up the comment template.
if ( comments_open() || get_comments_number() ) :
comments_template();
endif;
?>
<?php endwhile; // end of the loop. ?>
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar( 'right' ); ?>
</div><!-- .row -->
</div><!-- Container end -->
</div><!-- Wrapper end -->
<?php get_footer(); ?>