From c8885982bdf788e84ed217cc2de02995e45d6065 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 14 Oct 2011 15:27:40 -0600
Subject: [PATCH] cleanup to output of menus

---
 header.php | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/header.php b/header.php
index 81877c0..0435549 100644
--- a/header.php
+++ b/header.php
@@ -38,36 +38,29 @@
 					<img src="<?php echo get_header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="<?php bloginfo('name'); ?>">
 				</a>
 				
-				<?php if ($roots_options['clean_menu']) { ?>
-					<nav id="nav-main" role="navigation">
+				<nav id="nav-main" role="navigation">
+					<?php if ($roots_options['clean_menu']) { ?>
 						<?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new roots_nav_walker())); ?>
-					</nav>
-					<?php 					
-						$utility_nav = wp_get_nav_menu_object('Utility Navigation');
-						$utility_nav_term_id = (int) $utility_nav->term_id;
-						$menu_items = wp_get_nav_menu_items($utility_nav_term_id);					
-						if ($menu_items || !empty($menu_items)) {
-					?>
-					<nav id="nav-utility">
-						<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
-					</nav>
-					<?php } ?>		
-				<?php } else { ?>
-					<nav id="nav-main" role="navigation">
+					<?php } else { ?>
 						<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
-					</nav>
-					<?php 					
-						$utility_nav = wp_get_nav_menu_object('Utility Navigation');
-						$utility_nav_term_id = (int) $utility_nav->term_id;
-						$menu_items = wp_get_nav_menu_items($utility_nav_term_id);					
-						if ($menu_items || !empty($menu_items)) {
-					?>
-					<nav id="nav-utility">
+					<?php } ?>
+				</nav>
+				
+				<?php 					
+					$utility_nav = wp_get_nav_menu_object('Utility Navigation');
+					$utility_nav_term_id = (int) $utility_nav->term_id;
+					$menu_items = wp_get_nav_menu_items($utility_nav_term_id);					
+					if ($menu_items || !empty($menu_items)) {
+				?>
+				<nav id="nav-utility">
+					<?php if ($roots_options['clean_menu']) { ?>
+						<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
+					<?php } else { ?>
 						<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
-					</nav>
-					<?php } ?>								
+					<?php } ?>
+				</nav>
 				<?php } ?>
-			
+
 			</div>
 		</header>
 	<?php roots_header_after(); ?>
\ No newline at end of file