Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

minor template & syntax improvements

  • Loading branch information...
commit 3891253ef3acb38752ab9a6fe3ad6c9db72eacef 1 parent fee38a4
@aristath aristath authored
Showing with 23 additions and 16 deletions.
  1. +1 −1  404.php
  2. +21 −14 base.php
  3. +1 −1  comments.php
View
2  404.php
@@ -10,4 +10,4 @@
<li><?php _e('an out-of-date link', 'shoestrap'); ?></li>
</ul>
-<?php get_search_form(); ?>
+<?php get_search_form();
View
35 base.php
@@ -5,19 +5,25 @@
<!--[if lt IE 7]><div class="alert">Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</div><![endif]-->
<?php
- do_action('get_header');
- // Use Bootstrap's navbar if enabled in config.php
- if (current_theme_supports('bootstrap-top-navbar')) {
- get_template_part('templates/header-top-navbar');
- }
+ do_action('get_header');
+ // Use Bootstrap's navbar if enabled in config.php
+ if (current_theme_supports('bootstrap-top-navbar'))
+ get_template_part('templates/header-top-navbar');
?>
- <?php do_action('shoestrap_branding'); ?>
- <?php do_action('shoestrap_hero'); ?>
- <?php if ( get_theme_mod( 'shoestrap_navbar_secondary' ) == 1 ) {
- get_template_part('templates/navbar');
- } ?>
+ <?php
+ // Load the extra branding area
+ do_action('shoestrap_branding');
+ // load the shoestrap hero area
+ do_action('shoestrap_hero');
+ ?>
+
+ <?php
+ // load the secondary navbar if one is selected in the customizer
+ if ( get_theme_mod( 'shoestrap_navbar_secondary' ) == 1 )
+ get_template_part('templates/navbar');
+ ?>
<?php dynamic_sidebar('hero-area'); ?>
@@ -25,9 +31,9 @@
<div id="wrap" class="<?php shoestrap_fluid_body_classes( 'container' ); ?>" role="document">
<?php do_action('shoestrap_pre_content'); ?>
<div id="content" class="<?php shoestrap_fluid_body_classes( 'row' ); ?>">
- <?php if ( in_array ( $layout, array ( 'mps', 'pms', 'smp', 'spm' ) ) && shoestrap_display_sidebar() && shoestrap_display_primary_sidebar() ) { ?>
+ <?php if ( in_array ( $layout, array ( 'mps', 'pms', 'smp', 'spm' ) ) && shoestrap_display_sidebar() && shoestrap_display_primary_sidebar() ) ?>
<div class="m_p_wrap">
- <?php } ?>
+
<?php do_action('shoestrap_pre_main'); ?>
<div id="main" class="<?php echo shoestrap_main_class(); ?>" role="main">
<?php include shoestrap_template_path(); ?>
@@ -41,9 +47,9 @@
<?php do_action('shoestrap_after_sidebar'); ?>
</aside>
<?php } ?>
- <?php if ( in_array ( $layout, array ( 'mps', 'pms', 'smp', 'spm' ) ) && shoestrap_display_sidebar() && shoestrap_display_primary_sidebar() ) { ?>
+ <?php if ( in_array ( $layout, array ( 'mps', 'pms', 'smp', 'spm' ) ) && shoestrap_display_sidebar() && shoestrap_display_primary_sidebar() ) ?>
</div>
- <?php } ?>
+
<?php if ( !in_array ( $layout, array ( 'm', 'mp', 'pm' ) ) && shoestrap_display_sidebar() && shoestrap_display_secondary_sidebar() ) { ?>
<aside id="secondary" class="<?php echo shoestrap_sidebar_class( 'secondary' ); ?>" role="complementary">
<?php do_action('shoestrap_pre_sidebar'); ?>
@@ -52,6 +58,7 @@
</aside>
<?php } ?>
<?php endif; ?>
+
</div><!-- /#content -->
<?php do_action('shoestrap_after_content'); ?>
</div><!-- /#wrap -->
View
2  comments.php
@@ -1 +1 @@
-<?php get_template_part('templates/comments'); ?>
+<?php get_template_part('templates/comments');
Please sign in to comment.
Something went wrong with that request. Please try again.