Skip to content

Commit

Permalink
Formatting & Spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Aug 20, 2014
1 parent d7df22b commit 437ceb7
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 48 deletions.
109 changes: 62 additions & 47 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*
*/

//$secondary = get_option( 'parentSiteTitle','');
//$secondarylink = get_option( 'parentSiteLink','');
//$headingColor = get_theme_mod( 'headingColor');
//$parentColor = get_theme_mod( 'parentColor');
$secondary = get_option( 'parentSiteTitle','');
$secondarylink = get_option( 'parentSiteLink','');
$headingColor = get_theme_mod( 'headingColor');
$parentColor = get_theme_mod( 'parentColor');

//$nav1 = get_theme_mod( 'navoption1','textnav');
//$nav2 = get_theme_mod( 'navoption2','with-drop');
Expand All @@ -24,20 +24,30 @@
<html <?php language_attributes(); ?>>
<!--<![endif]-->




<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>
<?php wp_title( '|', true, 'right' ); ?>
</title>
<title><?php wp_title( '|', true, 'right' ); ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11">
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">

<?php wp_head(); ?>


</head>

<body <?php body_class(); ?> >
<nav id="skiplinks"> <a href="#site-navigation">Skip to Navigation</a> <a href="#uc-search">Skip to UConn Search</a> <a href="#content">Skip to Content</a> </nav>

<nav id="skiplinks">
<a href="#site-navigation">Skip to Navigation</a>
<a href="#uc-search">Skip to UConn Search</a>
<a href="#content">Skip to Content</a>

</nav>
<?php if(function_exists('uconn_banner_hook')){uconn_banner_hook();}?>
<div id="page" class="hfeed site">
<?php
Expand All @@ -51,26 +61,24 @@
<div class="col-sm-8">
<div class="site-branding" 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>';
if(strlen($secondary) > 0 && strlen($secondarylink) > 0){
if(substr($secondarylink,0,4) != 'http'){
$secondarylink = 'http://'.$secondarylink;
}
?>
<h1 id="uc-site-title" class="<?php echo $headingColor; ?>"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
<?php bloginfo( 'name' ); ?>
</a></h1>
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>
</div>
</div>
<div class="col-sm-4 <?php
if(strlen($secondary) > 0 && strlen($secondarylink) > 0){
if(substr($secondarylink,0,4) != 'http'){
$secondarylink = 'http://'.$secondarylink;
}
echo 'parent-spacing';
if(strlen($secondary) > 0 && strlen($secondarylink) > 0){
if(substr($secondarylink,0,4) != 'http'){
$secondarylink = 'http://'.$secondarylink;
}
?>">
echo 'parent-spacing';
}
?>">
<?php get_search_form(); ?>
</div>
</div>
Expand All @@ -79,40 +87,47 @@
<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>
<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>
<?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*/
)
);
?>
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 class="visible-xs-block">
<div class="navbar-form navbar-right">
<?php get_search_form(); ?>
</div>
<div class="navbar-form navbar-right">
<?php get_search_form(); ?>
</div>
</div>
</div>
</nav>
<!-- #site-navigation -->
<!-- #site-navigation -->
</div>
</div>
</header>
<!-- #masthead -->
<!-- #masthead -->
<div id="content" class="site-content">
<div class="container">
2 changes: 1 addition & 1 deletion inc/submenu-check.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
<?php include('sidemenu-walker.php')?>
</nav>
</div>
<div class="col-sm-9">
<div class="col-sm-8 col-sm-offset-1">
<?php } /* end checkMenu */?>

0 comments on commit 437ceb7

Please sign in to comment.