From 6bd30f7de862896e443c07ff0fa8c5ea6299891e Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Thu, 26 Jun 2014 11:48:25 -0400
Subject: [PATCH] Commit of header.php

---
 header.php | 94 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/header.php b/header.php
index 434c8fe..a4744a1 100755
--- a/header.php
+++ b/header.php
@@ -41,54 +41,58 @@
 		$headerImg = get_header_image();
 	?>
 	<header id="masthead" class="site-header <?php if ($headerImg != ''){echo 'header-image';} ?>" role="banner">
-		<div id="site-title" class="container">
-			<?php if ($headerImg != ''){ echo '<div id="header-image-wrap"><img src="' . get_header_image() . '" height="' . get_custom_header()->height . '" width="' . get_custom_header()->width . '" id="header-image" alt="Decorative header image of '. get_bloginfo('name') .'" /></div> ';}?>
-			<div class="site-branding hidden-xs" id="uc-site-header">
-					<?php
-						if(strlen($secondary) > 0 && strlen($secondarylink) > 0){
-							if(substr($secondarylink,0,4) != 'http'){
-								$secondarylink = 'http://'.$secondarylink;
+		<div id="site-title">
+			<div class="container">
+				<?php if ($headerImg != ''){ echo '<div id="header-image-wrap"><img src="' . get_header_image() . '" height="' . get_custom_header()->height . '" width="' . get_custom_header()->width . '" id="header-image" alt="Decorative header image of '. get_bloginfo('name') .'" /></div> ';}?>
+				<div class="site-branding hidden-xs" id="uc-site-header">
+						<?php
+							if(strlen($secondary) > 0 && strlen($secondarylink) > 0){
+								if(substr($secondarylink,0,4) != 'http'){
+									$secondarylink = 'http://'.$secondarylink;
+								}
+								echo '<p id="uc-site-parent" class="'.$parentColor.'"><a href="'.$secondarylink.'">'.$secondary.'</a></p>';
 							}
-							echo '<p id="uc-site-parent" class="'.$parentColor.'"><a href="'.$secondarylink.'">'.$secondary.'</a></p>';
-						}
-					?>
-					<h1 id="uc-site-title" class="<?php echo $headingColor; ?>"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+						?>
+						<h1 id="uc-site-title" class="<?php echo $headingColor; ?>"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+				</div>
 			</div>
 		</div>
-		<div id="nav-wrapper" class="container">
-			<nav id="site-navigation" class="navbar navbar-default" role="navigation">
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#primary-nav">
-						<span class="sr-only">Toggle navigation</span>
-						<span class="menu-icon">
-							<span class="icon-bar"></span>
-							<span class="icon-bar"></span>
-							<span class="icon-bar"></span>
-						</span>
-						<span class="menu-label">Menu</span>
-					</button>
-					<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
-				</div>
-				<a class="skip-link screen-reader-text sr-only" href="#content">
-					<?php _e( 'Skip to content', 'cs' ); ?></a>
-				<div class="collapse navbar-collapse" id="primary-nav">
-					<?php 
-						wp_nav_menu( 
-						array( 
-							'menu' => 'primary', /* menu name */
-							'menu_class' => 'nav navbar-nav'.$nav1.' '.$nav2,
-							'theme_location' => 'primary', /* where in the theme it's assigned */
-							'container' => false, /* container class */
-							'fallback_cb' => 'hale_main_nav_fallback',
-							'items_wrap' =>	'<ul id="%1$s" class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-							'walker' => new Bootstrap_Nav_Walker()/*,
-							'with_search' => true*/
-						)
-					);
-					?>
-				</div>
-			</nav>
-			<!-- #site-navigation -->	
+		<div id="nav-wrapper">
+			<div class="container">
+				<nav id="site-navigation" class="navbar navbar-default" role="navigation">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#primary-nav">
+							<span class="sr-only">Toggle navigation</span>
+							<span class="menu-icon">
+								<span class="icon-bar"></span>
+								<span class="icon-bar"></span>
+								<span class="icon-bar"></span>
+							</span>
+							<span class="menu-label">Menu</span>
+						</button>
+						<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
+					</div>
+					<a class="skip-link screen-reader-text sr-only" href="#content">
+						<?php _e( 'Skip to content', 'cs' ); ?></a>
+					<div class="collapse navbar-collapse" id="primary-nav">
+						<?php 
+							wp_nav_menu( 
+							array( 
+								'menu' => 'primary', /* menu name */
+								'menu_class' => 'nav navbar-nav'.$nav1.' '.$nav2,
+								'theme_location' => 'primary', /* where in the theme it's assigned */
+								'container' => false, /* container class */
+								'fallback_cb' => 'hale_main_nav_fallback',
+								'items_wrap' =>	'<ul id="%1$s" class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+								'walker' => new Bootstrap_Nav_Walker()/*,
+								'with_search' => true*/
+							)
+						);
+						?>
+					</div>
+				</nav>
+				<!-- #site-navigation -->	
+			</div>
 		</div>
 	</header>
 	<!-- #masthead -->