header cleanup including moving google analytics to the roots_head hook

This commit is contained in:
Ben Word
2011-06-26 20:07:36 -06:00
parent d92a532ad2
commit a088b21d9c
2 changed files with 61 additions and 51 deletions

View File

@@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
<title><?php wp_title('|', true, 'right'); bloginfo('name'); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -23,42 +23,37 @@
<?php roots_head(); ?>
<script src="<?php echo get_template_directory_uri(); ?>/js/scripts.js"></script>
<?php
global $roots_options;
$google_analytics_id = $roots_options['google_analytics_id'];
if ($google_analytics_id !== '') { ?>
<script>
var _gaq=[['_setAccount','<?php echo esc_attr($roots_options['google_analytics_id']); ?>'],['_trackPageview'],['_trackPageLoadTime']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
<?php } ?>
</head>
<body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
<?php roots_wrap_before(); ?>
<div id="wrap" class="container" role="document">
<?php roots_header_before(); ?>
<header id="banner" class="<?php global $roots_options; echo $roots_options['container_class']; ?>" role="banner">
<?php roots_header_inside(); ?>
<div class="container">
<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
<?php if ($roots_options['clean_menu']) { ?>
<nav id="nav-main" role="navigation">
<?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new roots_nav_walker())); ?>
</nav>
<nav id="nav-utility">
<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
</nav>
<?php } else { ?>
<nav id="nav-main" role="navigation">
<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
</nav>
<nav id="nav-utility">
<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
</nav>
<?php } ?>
<a id="logo" href="<?php echo home_url(); ?>/">
<img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>">
</a>
<?php if ($roots_options['clean_menu']) { ?>
<nav id="nav-main" role="navigation">
<?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new roots_nav_walker())); ?>
</nav>
<nav id="nav-utility">
<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
</nav>
<?php } else { ?>
<nav id="nav-main" role="navigation">
<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
</nav>
<nav id="nav-utility">
<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
</nav>
<?php } ?>
</div>
</header>
<?php roots_header_after(); ?>