From 8594263c99fabbe9adf044d45da5901a5ea2778a Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Tue, 4 Aug 2015 15:38:27 -0400
Subject: [PATCH] Nav fixes

---
 inc/nav-drop-multi-walker.php |  64 ---
 inc/nav-tabs-walker.php       | 728 ++++++++++++++++------------------
 inc/nav-tabs.php              | 320 ++++++++-------
 inc/nav-walker.php            |   2 +-
 4 files changed, 507 insertions(+), 607 deletions(-)

diff --git a/inc/nav-drop-multi-walker.php b/inc/nav-drop-multi-walker.php
index e942b12..2a2bbc6 100644
--- a/inc/nav-drop-multi-walker.php
+++ b/inc/nav-drop-multi-walker.php
@@ -167,68 +167,4 @@ function display_element ($element, &$children_elements, $max_depth, $depth = 0,
 		}         
 	}
 }
-// add hook
-add_filter( 'wp_nav_menu_objects', 'my_drop_multi_nav_menu_objects_sub_menu', 10, 2 );
-
-// filter_hook function to react on sub_menu flag
-function my_drop_multi_nav_menu_objects_sub_menu( $sorted_menu_items, $args ) {
-	if ( isset( $args->sub_menu ) ) {
-		  
-		  
-		$root_id = 0;
-		$root_level = 0;
-		$parent_id = 0;
-		$second_level_parent = 0;
-		$newmenu = array();
-		$level = 0;
-		$stack = array('0');
-		foreach($sorted_menu_items as $key => $menu_item) {
-			while(in_array($menu_item->menu_item_parent, $stack) && $menu_item->menu_item_parent != array_pop($stack)) {
-				$level--;
-			}   
-			$level++;
-			$stack[] = $menu_item->menu_item_parent;
-			$stack[] = $menu_item->ID;
-			$sorted_menu_items[$key]->level = $level;
-			if(!isset($newmenu[$level])){
-				$newmenu[$level] = array();
-			}
-			$newmenu[$level][$menu_item->ID] = $menu_item->menu_item_parent;
-			
-			if ( $menu_item->current ) {
-				// set the root id based on whether the current menu item has a parent or not
-				$root_id = $menu_item->ID;
-				$root_level = $level;
-				$parent_id = $menu_item->menu_item_parent;
-			}
-		}  
-		if($root_level == 2){
-			$second_level_parent = $root_id;
-		}
-		elseif($root_level == 3){
-			$second_level_parent = $parent_id;
-		}
-		elseif($root_level == 4){
-			$second_level_parent = $newmenu[3][$parent_id];
-		}
-		else return array();
-		if( isset($newmenu[3]) && is_array($newmenu[3]) ){
-			foreach($newmenu[3] as $id=>$menu_item){
-				if($menu_item != $second_level_parent) unset($newmenu[3][$id]);
-			}
-		}
-		if( isset($newmenu[4]) && is_array($newmenu[4]) ){
-			foreach($newmenu[4] as $id=>$menu_item){
-				if(!isset($newmenu[3][$menu_item])) unset($newmenu[4][$id]);
-			}
-		}
-		foreach($sorted_menu_items as $key => $menu_item) {
-			if(!isset($newmenu[3][$menu_item->ID]) && !isset($newmenu[4][$menu_item->ID])) unset($sorted_menu_items[$key]);
-		}
-		return $sorted_menu_items;
-	} else {
-		return $sorted_menu_items;
-	}
-}
-
 ?>
\ No newline at end of file
diff --git a/inc/nav-tabs-walker.php b/inc/nav-tabs-walker.php
index 311e7f9..cf7dacd 100644
--- a/inc/nav-tabs-walker.php
+++ b/inc/nav-tabs-walker.php
@@ -1,397 +1,333 @@
-<?php 
-/*Top Tabs Nav Menu Walker*/
-if(!class_exists('Top_Tabs_Nav_Walker')) {
-	class Top_Tabs_Nav_Walker extends Walker_Nav_Menu {     
-		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
-		/* Skip private pages
-		 */ 
-		function skip( $item ) {
-			$parent = is_parent_private($item->object_id);
-			if($parent !== false) $page = $parent;
-			else $page = $item->object_id;
-			$private = get_post_meta($page, 'uc-private', true);
-			if($private == 'admins' || $private == 'users' || $private == 'list'){
-				return true;
-			}
-			else{
-				return false;
-			}
-		}
-		/* Start of the <ul> 
-		 * 
-		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
-		 *                   So basically add one to what you'd expect it to be 
-		 */         
-		function start_lvl(&$output, $depth, $args) 
-		{
-			if(isset($args->with_search) && $args->with_search == true){
-				add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2);	
-			}
-			
-			$tabs = str_repeat("\t", $depth); 
-			// If we are about to start the first submenu, we need to give it a dropdown-menu class 
-			if ($depth >= 0) { //really, level-1 or level-2, because $depth is misleading here (see note above) 
-				$output .= "\n{$tabs}<ul class=\"dropdown-menu\">\n"; 
-			} else { 
-				$output .= "\n{$tabs}<ul>\n"; 
-			} 	
-			return;
-		} 
-	
-		/* End of the <ul> 
-		 * 
-		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
-		 *                   So basically add one to what you'd expect it to be 
-		 */         
-		function end_lvl(&$output, $depth)  
-		{
-			if ($depth == 0) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) 
-	
-				// we don't have anything special for Bootstrap, so we'll just leave an HTML comment for now 
-				$output .= '<!--.dropdown-->'; 
-			} 
-			$tabs = str_repeat("\t", $depth); 
-			$output .= "\n{$tabs}</ul>\n"; 
-			return; 
-		}
-	
-		/* Output the <li> and the containing <a> 
-		 * Note: $depth is "correct" at this level 
-		 */         
-		function start_el(&$output, $item, $depth, $args)  
-		{    
-			global $wp_query; 
-    		if ( $this->skip( $item ) ) return;
-			$indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; 
-			$class_names = $value = ''; 
-			$classes = empty( $item->classes ) ? array() : (array) $item->classes; 
-	
-			/* If this item has a dropdown menu, add the 'dropdown' class for Bootstrap */ 
-			if($item->post_type == 'page') { //page has no classes..
-				$classes[] = 'menu-item';
-			}
-			if ($item->hasChildren) { 
-				$classes[] = 'dropdown'; 
-				// level-1 menus also need the 'dropdown-submenu' class 
-				if($depth > 0 ) { 
-					$classes[] = 'dropdown-submenu'; 
-				} 
-			} 
-			if($item->current_item_ancestor) $classes[] = 'active';
-	
-			/* This is the stock Wordpress code that builds the <li> with all of its attributes */ 
-			$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); 
-			$class_names = ' class="' . esc_attr( $class_names ) . '"'; 
-			$output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';             
-			$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : ''; 
-			$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : ''; 
-			$attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
-			if($item->post_type == 'page') {
-				$attributes .= ! empty( $item->guid )        ? ' href="'   . esc_attr( $item->guid       ) .'"' : '';
-			} else {
-				$attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
-			}
-			
-			$item_output = "";
-			if($item->post_type == 'page') {
-				
-				$item_output .= '<a'. $attributes .'>'; 
-				
-				$item_output .= apply_filters('the_title', $item->post_title, $item->ID);
-			
-				$item_output .= '</a>'; 
-				
-				
-			} else {
-				$item_output = $args->before; 
-	
-				$item_output .= '<a'. $attributes .'>'; 
-				
-				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; 
-		
-				/* Output the actual caret for the user to click on to toggle the menu */             
-				
-				$item_output .= '</a>'; 
-				
-				$item_output .= $args->after; 
-			}
-			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args ); 
-			return; 
-		}
-	
-		/* Close the <li> 
-		 * Note: the <a> is already closed 
-		 * Note 2: $depth is "correct" at this level 
-		 */         
-		function end_el (&$output, $item, $depth, $args)
-		{
-    		if ( $this->skip( $item ) ) return;
-			$output .= '</li>'; 
-			return;
-		} 
-	
-		/* Add a 'hasChildren' property to the item 
-		 * Code from: http://wordpress.org/support/topic/how-do-i-know-if-a-menu-item-has-children-or-is-a-leaf#post-3139633  
-		 */ 
-		function display_element ($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) 
-		{ 
-		/*	if($element->post_type == 'page' && !isset($children_elements[$element->ID])) {
-				
-				$children = get_children(array('post_parent' => $element->ID, 'numberposts' => -1, 'post_type' => 'page'));
-				$children_elements[$element->ID] = $children;
-			}*/
-			// check whether this item has children, and set $item->hasChildren accordingly 
-			$element->hasChildren = isset($children_elements[$element->ID]) && !empty($children_elements[$element->ID]); 
-			
-			//var_dump($children_elements);
-//		var_dump($element);
-			/*if($element->hasChildren) {
-				$element2 = $children_elements[$element->ID];
-				$child2 = $children_elements[$element2->ID];
-				$element2->hasChildren = isset($child2[$element2->ID]) && !empty($child2[$element2->ID]); 
-			}*/
-			// continue with normal behavior 
-			return parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output); 
-		}         
-	}
-}
-/*Top Tabs Nav Menu Walker*/
-if(!class_exists('Tabs_Drop_Nav_Walker')) {
-	class Tabs_Drop_Nav_Walker extends Walker_Nav_Menu {     
-		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
-		/* Skip private pages
-		 */ 
-	    var $current_tree = array();
-		function skip( $item ) {
-			$parent = is_parent_private($item->object_id);
-			if($parent !== false) $page = $parent;
-			else $page = $item->object_id;
-			$private = get_post_meta($page, 'uc-private', true);
-			if($private == 'admins' || $private == 'users' || $private == 'list'){
-				return true;
-			}
-			else{
-				return false;
-			}
-		}
-		/* Start of the <ul> 
-		 * 
-		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
-		 *                   So basically add one to what you'd expect it to be 
-		 */         
-		function start_lvl(&$output, $depth, $args) 
-		{
-			if(isset($args->with_search) && $args->with_search == true){
-				add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2);	
-			}
-			
-			$tabs = str_repeat("\t", $depth); 
-			// If we are about to start the first submenu, we need to give it a dropdown-menu class 
-			if ($depth > 0) { //really, level-1 or level-2, because $depth is misleading here (see note above) 
-				$output .= "\n{$tabs}<ul class=\"dropdown-menu\">\n"; 
-			}	
-			return;
-		} 
-	
-		/* End of the <ul> 
-		 * 
-		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
-		 *                   So basically add one to what you'd expect it to be 
-		 */         
-		function end_lvl(&$output, $depth)  
-		{
-			if ($depth == 1) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) 
-	
-				// we don't have anything special for Bootstrap, so we'll just leave an HTML comment for now 
-				$output .= '<!--.dropdown-->'; 
-			} 
-			if($depth > 0){
-				$tabs = str_repeat("\t", $depth); 
-				$output .= "\n{$tabs}</ul>\n"; 
-			}
-			return; 
-		}
-	
-		/* Output the <li> and the containing <a> 
-		 * Note: $depth is "correct" at this level 
-		 */         
-		function start_el(&$output, $item, $depth, $args)  
-		{    
-			global $wp_query; 
-    		if ( $this->skip( $item ) ) return;
-			if(($item->current_item_ancestor || $item->current) && $depth == 0) $this->current_tree[] = $item->ID;
-			if(in_array($item->menu_item_parent, $this->current_tree)) $this->current_tree[] = $item->ID;
-			if($depth == 0 || !in_array($item->menu_item_parent, $this->current_tree)) return;
-			$indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; 
-			$class_names = $value = ''; 
-			$classes = empty( $item->classes ) ? array() : (array) $item->classes; 
-	
-			/* If this item has a dropdown menu, add the 'dropdown' class for Bootstrap */ 
-			if($item->post_type == 'page') { //page has no classes..
-				$classes[] = 'menu-item';
-			}
-			if ($item->hasChildren) { 
-				$classes[] = 'dropdown'; 
-				// level-1 menus also need the 'dropdown-submenu' class 
-				
-				if($depth > 1 ) { 
-					$classes[] = 'dropdown-submenu'; 
-				} 
-			} 
-			if($item->current_item_ancestor) $classes[] = 'active';
-	
-			/* This is the stock Wordpress code that builds the <li> with all of its attributes */ 
-			$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); 
-			$class_names = ' class="' . esc_attr( $class_names ) . '"'; 
-			$output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';             
-			$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : ''; 
-			$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : ''; 
-			$attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
-			if($item->post_type == 'page') {
-				$attributes .= ! empty( $item->guid )        ? ' href="'   . esc_attr( $item->guid       ) .'"' : '';
-			} else {
-				$attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
-			}
-			//print_r($item);
-			$item_output = "";
-			if($item->post_type == 'page') {
-				if ($item->hasChildren) { 
-					$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
-				} else { 
-					$item_output .= '<a'. $attributes .'>'; 
-				} 
-				$item_output .= apply_filters('the_title', $item->post_title, $item->ID);
-				if ($item->hasChildren && $depth == 0) { 
-					$item_output .= '<b class="caret"></b></a>'; 
-				} else { 
-					$item_output .= '</a>'; 
-				} 
-				
-			} else {
-				$item_output = $args->before; 
-	
-				/* If this item has a dropdown menu, make clicking on this link toggle it */ 
-				if ($item->hasChildren) { 
-					$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
-				} else { 
-					$item_output .= '<a'. $attributes .'>'; 
-				} 
-				//var_dump($item);
-				
-				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; 
-		
-				/* Output the actual caret for the user to click on to toggle the menu */             
-				
-				if ($item->hasChildren && $depth == 0) { 
-					$item_output .= '<b class="caret"></b></a>'; 
-				} else { 
-					$item_output .= '</a>'; 
-				} 
-				$item_output .= $args->after; 
-			}
-			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args ); 
-			return; 
-		}
-	
-		/* Close the <li> 
-		 * Note: the <a> is already closed 
-		 * Note 2: $depth is "correct" at this level 
-		 */         
-		function end_el (&$output, $item, $depth, $args)
-		{
-    		if ( $this->skip( $item ) ) return;
-			$output .= '</li>'; 
-			return;
-		} 
-	
-		/* Add a 'hasChildren' property to the item 
-		 * Code from: http://wordpress.org/support/topic/how-do-i-know-if-a-menu-item-has-children-or-is-a-leaf#post-3139633  
-		 */ 
-		function display_element ($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) 
-		{ 
-		/*	if($element->post_type == 'page' && !isset($children_elements[$element->ID])) {
-				
-				$children = get_children(array('post_parent' => $element->ID, 'numberposts' => -1, 'post_type' => 'page'));
-				$children_elements[$element->ID] = $children;
-			}*/
-			// check whether this item has children, and set $item->hasChildren accordingly 
-			$element->hasChildren = isset($children_elements[$element->ID]) && !empty($children_elements[$element->ID]); 
-			
-			//var_dump($children_elements);
-//		var_dump($element);
-			/*if($element->hasChildren) {
-				$element2 = $children_elements[$element->ID];
-				$child2 = $children_elements[$element2->ID];
-				$element2->hasChildren = isset($child2[$element2->ID]) && !empty($child2[$element2->ID]); 
-			}*/
-			// continue with normal behavior 
-			return parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output); 
-		}     
-
-	}
-}
-// add hook
-add_filter( 'wp_nav_menu_objects', 'my_tabs_nav_menu_objects_sub_menu', 10, 2 );
-
-// filter_hook function to react on sub_menu flag
-function my_tabs_nav_menu_objects_sub_menu( $sorted_menu_items, $args ) {
-	if ( isset( $args->sub_menu ) ) {
-		  
-		  
-		$root_id = 0;
-		$root_level = 0;
-		$parent_id = 0;
-		$second_level_parent = 0;
-		$newmenu = array();
-		$level = 0;
-		$stack = array('0');
-		foreach($sorted_menu_items as $key => $menu_item) {
-			while(in_array($menu_item->menu_item_parent, $stack) && $menu_item->menu_item_parent != array_pop($stack)) {
-				$level--;
-			}   
-			$level++;
-			$stack[] = $menu_item->menu_item_parent;
-			$stack[] = $menu_item->ID;
-			$sorted_menu_items[$key]->level = $level;
-			if(!isset($newmenu[$level])){
-				$newmenu[$level] = array();
-			}
-			$newmenu[$level][$menu_item->ID] = $menu_item->menu_item_parent;
-			
-			if ( $menu_item->current ) {
-				// set the root id based on whether the current menu item has a parent or not
-				$root_id = $menu_item->ID;
-				$root_level = $level;
-				$parent_id = $menu_item->menu_item_parent;
-			}
-		}  
-		if($root_level == 2){
-			$second_level_parent = $root_id;
-		}
-		elseif($root_level == 3){
-			$second_level_parent = $parent_id;
-		}
-		elseif($root_level == 4){
-			$second_level_parent = $newmenu[3][$parent_id];
-		}
-		else return array();
-		if( isset($newmenu[3]) && is_array($newmenu[3]) ){
-			foreach($newmenu[3] as $id=>$menu_item){
-				if($menu_item != $second_level_parent) unset($newmenu[3][$id]);
-			}
-		}
-		if( isset($newmenu[4]) && is_array($newmenu[4]) ){
-			foreach($newmenu[4] as $id=>$menu_item){
-				if(!isset($newmenu[3][$menu_item])) unset($newmenu[4][$id]);
-			}
-		}
-		foreach($sorted_menu_items as $key => $menu_item) {
-			if(!isset($newmenu[3][$menu_item->ID]) && !isset($newmenu[4][$menu_item->ID])) unset($sorted_menu_items[$key]);
-		}
-		return $sorted_menu_items;
-	} else {
-		return $sorted_menu_items;
-	}
-}
-
+<?php 
+/*Top Tabs Nav Menu Walker*/
+if(!class_exists('Top_Tabs_Nav_Walker')) {
+	class Top_Tabs_Nav_Walker extends Walker_Nav_Menu {     
+		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
+		/* Skip private pages
+		 */ 
+		function skip( $item ) {
+			$parent = is_parent_private($item->object_id);
+			if($parent !== false) $page = $parent;
+			else $page = $item->object_id;
+			$private = get_post_meta($page, 'uc-private', true);
+			if($private == 'admins' || $private == 'users' || $private == 'list'){
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+		/* Start of the <ul> 
+		 * 
+		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
+		 *                   So basically add one to what you'd expect it to be 
+		 */         
+		function start_lvl(&$output, $depth, $args) 
+		{
+			if(isset($args->with_search) && $args->with_search == true){
+				add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2);	
+			}
+			
+			$tabs = str_repeat("\t", $depth); 
+			// If we are about to start the first submenu, we need to give it a dropdown-menu class 
+			if ($depth >= 0) { //really, level-1 or level-2, because $depth is misleading here (see note above) 
+				$output .= "\n{$tabs}<ul class=\"dropdown-menu\">\n"; 
+			} else { 
+				$output .= "\n{$tabs}<ul>\n"; 
+			} 	
+			return;
+		} 
+	
+		/* End of the <ul> 
+		 * 
+		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
+		 *                   So basically add one to what you'd expect it to be 
+		 */         
+		function end_lvl(&$output, $depth)  
+		{
+			if ($depth == 0) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) 
+	
+				// we don't have anything special for Bootstrap, so we'll just leave an HTML comment for now 
+				$output .= '<!--.dropdown-->'; 
+			} 
+			$tabs = str_repeat("\t", $depth); 
+			$output .= "\n{$tabs}</ul>\n"; 
+			return; 
+		}
+	
+		/* Output the <li> and the containing <a> 
+		 * Note: $depth is "correct" at this level 
+		 */         
+		function start_el(&$output, $item, $depth, $args)  
+		{    
+			global $wp_query; 
+    		if ( $this->skip( $item ) ) return;
+			$indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; 
+			$class_names = $value = ''; 
+			$classes = empty( $item->classes ) ? array() : (array) $item->classes; 
+	
+			/* If this item has a dropdown menu, add the 'dropdown' class for Bootstrap */ 
+			if($item->post_type == 'page') { //page has no classes..
+				$classes[] = 'menu-item';
+			}
+			if ($item->hasChildren) { 
+				$classes[] = 'dropdown'; 
+				// level-1 menus also need the 'dropdown-submenu' class 
+				if($depth > 0 ) { 
+					$classes[] = 'dropdown-submenu'; 
+				} 
+			} 
+			if($item->current_item_ancestor) $classes[] = 'active';
+	
+			/* This is the stock Wordpress code that builds the <li> with all of its attributes */ 
+			$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); 
+			$class_names = ' class="' . esc_attr( $class_names ) . '"'; 
+			$output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';             
+			$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : ''; 
+			$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : ''; 
+			$attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
+			if($item->post_type == 'page') {
+				$attributes .= ! empty( $item->guid )        ? ' href="'   . esc_attr( $item->guid       ) .'"' : '';
+			} else {
+				$attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
+			}
+			
+			$item_output = "";
+			if($item->post_type == 'page') {
+				
+				$item_output .= '<a'. $attributes .'>'; 
+				
+				$item_output .= apply_filters('the_title', $item->post_title, $item->ID);
+			
+				$item_output .= '</a>'; 
+				
+				
+			} else {
+				$item_output = $args->before; 
+	
+				$item_output .= '<a'. $attributes .'>'; 
+				
+				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; 
+		
+				/* Output the actual caret for the user to click on to toggle the menu */             
+				
+				$item_output .= '</a>'; 
+				
+				$item_output .= $args->after; 
+			}
+			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args ); 
+			return; 
+		}
+	
+		/* Close the <li> 
+		 * Note: the <a> is already closed 
+		 * Note 2: $depth is "correct" at this level 
+		 */         
+		function end_el (&$output, $item, $depth, $args)
+		{
+    		if ( $this->skip( $item ) ) return;
+			$output .= '</li>'; 
+			return;
+		} 
+	
+		/* Add a 'hasChildren' property to the item 
+		 * Code from: http://wordpress.org/support/topic/how-do-i-know-if-a-menu-item-has-children-or-is-a-leaf#post-3139633  
+		 */ 
+		function display_element ($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) 
+		{ 
+		/*	if($element->post_type == 'page' && !isset($children_elements[$element->ID])) {
+				
+				$children = get_children(array('post_parent' => $element->ID, 'numberposts' => -1, 'post_type' => 'page'));
+				$children_elements[$element->ID] = $children;
+			}*/
+			// check whether this item has children, and set $item->hasChildren accordingly 
+			$element->hasChildren = isset($children_elements[$element->ID]) && !empty($children_elements[$element->ID]); 
+			
+			//var_dump($children_elements);
+//		var_dump($element);
+			/*if($element->hasChildren) {
+				$element2 = $children_elements[$element->ID];
+				$child2 = $children_elements[$element2->ID];
+				$element2->hasChildren = isset($child2[$element2->ID]) && !empty($child2[$element2->ID]); 
+			}*/
+			// continue with normal behavior 
+			return parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output); 
+		}         
+	}
+}
+/*Top Tabs Nav Menu Walker*/
+if(!class_exists('Tabs_Drop_Nav_Walker')) {
+	class Tabs_Drop_Nav_Walker extends Walker_Nav_Menu {     
+		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
+		/* Skip private pages
+		 */ 
+	    var $current_tree = array();
+		function skip( $item ) {
+			$parent = is_parent_private($item->object_id);
+			if($parent !== false) $page = $parent;
+			else $page = $item->object_id;
+			$private = get_post_meta($page, 'uc-private', true);
+			if($private == 'admins' || $private == 'users' || $private == 'list'){
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+		/* Start of the <ul> 
+		 * 
+		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
+		 *                   So basically add one to what you'd expect it to be 
+		 */         
+		function start_lvl(&$output, $depth, $args) 
+		{
+			if(isset($args->with_search) && $args->with_search == true){
+				add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2);	
+			}
+			
+			$tabs = str_repeat("\t", $depth); 
+			// If we are about to start the first submenu, we need to give it a dropdown-menu class 
+			if ($depth > 0) { //really, level-1 or level-2, because $depth is misleading here (see note above) 
+				$output .= "\n{$tabs}<ul class=\"dropdown-menu\">\n"; 
+			}	
+			return;
+		} 
+	
+		/* End of the <ul> 
+		 * 
+		 * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu".  
+		 *                   So basically add one to what you'd expect it to be 
+		 */         
+		function end_lvl(&$output, $depth)  
+		{
+			if ($depth == 1) { // This is actually the end of the level-1 submenu ($depth is misleading here too!) 
+	
+				// we don't have anything special for Bootstrap, so we'll just leave an HTML comment for now 
+				$output .= '<!--.dropdown-->'; 
+			} 
+			if($depth > 0){
+				$tabs = str_repeat("\t", $depth); 
+				$output .= "\n{$tabs}</ul>\n"; 
+			}
+			return; 
+		}
+	
+		/* Output the <li> and the containing <a> 
+		 * Note: $depth is "correct" at this level 
+		 */         
+		function start_el(&$output, $item, $depth, $args)  
+		{    
+			global $wp_query; 
+    		if ( $this->skip( $item ) ) return;
+			if(($item->current_item_ancestor || $item->current) && $depth == 0) $this->current_tree[] = $item->ID;
+			if(in_array($item->menu_item_parent, $this->current_tree)) $this->current_tree[] = $item->ID;
+			if($depth == 0 || !in_array($item->menu_item_parent, $this->current_tree)) return;
+			$indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; 
+			$class_names = $value = ''; 
+			$classes = empty( $item->classes ) ? array() : (array) $item->classes; 
+	
+			/* If this item has a dropdown menu, add the 'dropdown' class for Bootstrap */ 
+			if($item->post_type == 'page') { //page has no classes..
+				$classes[] = 'menu-item';
+			}
+			if ($item->hasChildren) { 
+				$classes[] = 'dropdown'; 
+				// level-1 menus also need the 'dropdown-submenu' class 
+				
+				if($depth > 1 ) { 
+					$classes[] = 'dropdown-submenu'; 
+				} 
+			} 
+			if($item->current_item_ancestor) $classes[] = 'active';
+	
+			/* This is the stock Wordpress code that builds the <li> with all of its attributes */ 
+			$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); 
+			$class_names = ' class="' . esc_attr( $class_names ) . '"'; 
+			$output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';             
+			$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : ''; 
+			$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : ''; 
+			$attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
+			if($item->post_type == 'page') {
+				$attributes .= ! empty( $item->guid )        ? ' href="'   . esc_attr( $item->guid       ) .'"' : '';
+			} else {
+				$attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
+			}
+			//print_r($item);
+			$item_output = "";
+			if($item->post_type == 'page') {
+				if ($item->hasChildren) { 
+					$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
+				} else { 
+					$item_output .= '<a'. $attributes .'>'; 
+				} 
+				$item_output .= apply_filters('the_title', $item->post_title, $item->ID);
+				if ($item->hasChildren && $depth == 1) { 
+					$item_output .= '<b class="caret"></b></a>'; 
+				} else { 
+					$item_output .= '</a>'; 
+				} 
+				
+			} else {
+				$item_output = $args->before; 
+	
+				/* If this item has a dropdown menu, make clicking on this link toggle it */ 
+				if ($item->hasChildren) { 
+					$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
+				} else { 
+					$item_output .= '<a'. $attributes .'>'; 
+				} 
+				//var_dump($item);
+				
+				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; 
+		
+				/* Output the actual caret for the user to click on to toggle the menu */             
+				
+				if ($item->hasChildren && $depth == 1) { 
+					$item_output .= '<b class="caret"></b></a>'; 
+				} else { 
+					$item_output .= '</a>'; 
+				} 
+				$item_output .= $args->after; 
+			}
+			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args ); 
+			return; 
+		}
+	
+		/* Close the <li> 
+		 * Note: the <a> is already closed 
+		 * Note 2: $depth is "correct" at this level 
+		 */         
+		function end_el (&$output, $item, $depth, $args)
+		{
+    		if ( $this->skip( $item ) ) return;
+			$output .= '</li>'; 
+			return;
+		} 
+	
+		/* Add a 'hasChildren' property to the item 
+		 * Code from: http://wordpress.org/support/topic/how-do-i-know-if-a-menu-item-has-children-or-is-a-leaf#post-3139633  
+		 */ 
+		function display_element ($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) 
+		{ 
+		/*	if($element->post_type == 'page' && !isset($children_elements[$element->ID])) {
+				
+				$children = get_children(array('post_parent' => $element->ID, 'numberposts' => -1, 'post_type' => 'page'));
+				$children_elements[$element->ID] = $children;
+			}*/
+			// check whether this item has children, and set $item->hasChildren accordingly 
+			$element->hasChildren = isset($children_elements[$element->ID]) && !empty($children_elements[$element->ID]); 
+			
+			//var_dump($children_elements);
+//		var_dump($element);
+			/*if($element->hasChildren) {
+				$element2 = $children_elements[$element->ID];
+				$child2 = $children_elements[$element2->ID];
+				$element2->hasChildren = isset($child2[$element2->ID]) && !empty($child2[$element2->ID]); 
+			}*/
+			// continue with normal behavior 
+			return parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output); 
+		}     
+
+	}
+}
 ?>
\ No newline at end of file
diff --git a/inc/nav-tabs.php b/inc/nav-tabs.php
index 2443978..464fdd1 100644
--- a/inc/nav-tabs.php
+++ b/inc/nav-tabs.php
@@ -1,146 +1,174 @@
-<!-- CSS code from Bootply.com editor -->
-<style type="text/css">
-.marginBottom-0 {
-	margin-bottom: 0;
-}
-.dropdown-submenu {
-	position: relative;
-}
-.dropdown-submenu>.dropdown-menu {
-	top: 0;
-	left: 100%;
-	margin-top: -6px;
-	margin-left: -1px;
-	-webkit-border-radius: 0 6px 6px 6px;
-	-moz-border-radius: 0 6px 6px 6px;
-	border-radius: 0 6px 6px 6px;
-}
-.dropdown-submenu>a:after {
-	display: block;
-	content: " ";
-	float: right;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 0 5px 5px;
-	border-left-color: #cccccc;
-	margin-top: 5px;
-	margin-right: -10px;
-}
-.dropdown-submenu:hover>a:after {
-	border-left-color: #555;
-}
-.dropdown-submenu.pull-left {
-	float: none;
-}
-.dropdown-submenu.pull-left>.dropdown-menu {
-	left: -100%;
-	margin-left: 10px;
-	-webkit-border-radius: 6px 0 6px 6px;
-	-moz-border-radius: 6px 0 6px 6px;
-	border-radius: 6px 0 6px 6px;
-}
-</style>
-<nav class="navbar navbar-default visible-xs-block hidden-sm hidden-md hidden-lg" role="navigation">
-	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
-		<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
-	</div>
-	<div class="collapse navbar-collapse" id="navbar-collapse-1">
-    <?php
-			$locations = get_nav_menu_locations();
-			$menu_at_primary_location = $locations['primary'];
-			$items = wp_get_nav_menu_items( $menu_at_primary_location );
-			if(empty($items)){
-				echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-			} else {
-				$menu = wp_nav_menu( 
-					array(
-						'menu_class' => 'nav navbar-nav',
-						'theme_location' => 'primary', /* where in the theme it's assigned */
-						'container' => false, /* container class */
-						'fallback_cb' => 'hale_main_nav_fallback',
-						'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-						'walker' => new Drop_Multi_Nav_Walker()/*,
-						'with_search' => true*/
-					)
-				);			
-			}
-		?>
-    </div>
-</nav>
-
-<div id="nav-tabs" class="hidden-xs">
-	<div id="tabs-top-wrapper" class="tabs-wrapper">
-		<nav id="tabs-top" class="container">
-			<?php
-				$locations = get_nav_menu_locations();
-				$menu_at_primary_location = $locations['primary'];
-				$items = wp_get_nav_menu_items( $menu_at_primary_location );
-				if(empty($items)){
-					echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
-				} else {
-					$menu = wp_nav_menu( 
-						array(
-							'menu_class' => 'nav nav-tabs',
-							'theme_location' => 'primary', /* where in the theme it's assigned */
-							'container' => false, /* container class */
-							'fallback_cb' => 'hale_main_nav_fallback',
-							'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
-							'walker' => new Top_Tabs_Nav_Walker()/*,
-							'with_search' => true*/
-						)
-					);	
-					?>
-		</nav>
-	</div>
-	
-	<div id="tabs-bottom-wrapper" class="tabs-wrapper">
-		<div id="tabs-bottom" class="container">
-			<nav class="navbar navbar-default" role="navigation">
-		
-			<?php
-					$menu = wp_nav_menu( 
-						array(
-							'menu_class' => 'nav navbar-nav',
-							'theme_location' => 'primary', /* where in the theme it's assigned */
-							'container' => false, /* container class */
-							'fallback_cb' => 'hale_main_nav_fallback',
-							'items_wrap' =>	'<ul class="%2$s">%3$s</ul>',
-							'walker' => new Tabs_Drop_Nav_Walker()/*,
-							'with_search' => true*/
-						)
-					);			
-				}
-			?>
-			</nav>
-		</div>
-	</div>
-</div>
-
-<!-- JavaScript jQuery code from Bootply.com editor  --> 
-
-<script type='text/javascript'>
-        
-            (function($){
-
-	$(document).ready(function(){
-
-		$('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
-
-			event.preventDefault(); 
-
-			event.stopPropagation(); 
-
-			$(this).parent().siblings().removeClass('open');
-
-			$(this).parent().toggleClass('open');
-
-		});
-
-	});
-
-})(jQuery);
-        
-        </script> 
+<!-- CSS code from Bootply.com editor -->
+<style type="text/css">
+.marginBottom-0 {
+	margin-bottom: 0;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu>.dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu>a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover>a:after {
+	border-left-color: #555;
+}
+.dropdown-submenu.pull-left {
+	float: none;
+}
+.dropdown-submenu.pull-left>.dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+</style>
+<nav class="navbar navbar-default visible-xs-block hidden-sm hidden-md hidden-lg" role="navigation">
+	<div class="navbar-header">
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+		<a class="navbar-brand visible-xs" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
+	</div>
+	<div class="collapse navbar-collapse" id="navbar-collapse-1">
+    <?php
+			$locations = get_nav_menu_locations();
+			$menu_at_primary_location = $locations['primary'];
+			$items = wp_get_nav_menu_items( $menu_at_primary_location );
+			if(empty($items)){
+				echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
+			} else {
+				$menu = wp_nav_menu( 
+					array(
+						'menu_class' => 'nav navbar-nav',
+						'theme_location' => 'primary', /* where in the theme it's assigned */
+						'container' => false, /* container class */
+						'fallback_cb' => 'hale_main_nav_fallback',
+						'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+						'walker' => new Drop_Multi_Nav_Walker()/*,
+						'with_search' => true*/
+					)
+				);			
+			}
+		?>
+    </div>
+</nav>
+
+<div id="nav-tabs" class="hidden-xs">
+	<div id="tabs-top-wrapper" class="tabs-wrapper">
+		<nav id="tabs-top" class="container">
+			<?php
+				$locations = get_nav_menu_locations();
+				$menu_at_primary_location = $locations['primary'];
+				$items = wp_get_nav_menu_items( $menu_at_primary_location );
+				if(empty($items)){
+					echo '<ul class="nav navbar-nav"><li><a href="'.home_url().'">Home</a></li></ul>';
+				} else {
+					$menu = wp_nav_menu( 
+						array(
+							'menu_class' => 'nav nav-tabs',
+							'theme_location' => 'primary', /* where in the theme it's assigned */
+							'container' => false, /* container class */
+							'fallback_cb' => 'hale_main_nav_fallback',
+							'items_wrap' =>	'<ul class="%2$s"><li><a href="'.home_url().'">Home</a></li>%3$s</ul>',
+							'walker' => new Top_Tabs_Nav_Walker()/*,
+							'with_search' => true*/
+						)
+					);	
+					?>
+		</nav>
+	</div>
+	<?php
+$menu_name = 'primary';
+$locations = get_nav_menu_locations();
+$menu_id = $locations[ $menu_name ] ;
+$menu_items = wp_get_nav_menu_items( $menu_at_primary_location );
+_wp_menu_item_classes_by_context($menu_items);
+//print_r($menu_items);
+$page = get_the_ID();
+$page_id = 0;
+$tabs = false;
+foreach($menu_items as $item){
+	if($item->object_id == $page){
+		$page_id = $item->ID;
+	}
+	if($item->menu_item_parent != 0 && $item->menu_item_parent == $page_id){
+		$tabs = true;
+		break;
+	}
+}
+foreach($menu_items as $item){
+	if($item->menu_item_parent == 0 && $item->current_item_ancestor){
+		$tabs = true;
+		break;
+	}
+}
+//$tabs = true;
+if($tabs){
+	?>
+	<div id="tabs-bottom-wrapper" class="tabs-wrapper">
+		<div id="tabs-bottom" class="container">
+			<nav class="navbar navbar-default" role="navigation">
+		
+			<?php
+					$menu = wp_nav_menu( 
+						array(
+							'menu_class' => 'nav navbar-nav',
+							'theme_location' => 'primary', /* where in the theme it's assigned */
+							'container' => false, /* container class */
+							'fallback_cb' => 'hale_main_nav_fallback',
+							'items_wrap' =>	'<ul class="%2$s">%3$s</ul>',
+							'walker' => new Tabs_Drop_Nav_Walker()/*,
+							'with_search' => true*/
+						)
+					);			
+				}
+			?>
+			</nav>
+		</div>
+	</div>
+    <?php } ?>
+</div>
+
+<!-- JavaScript jQuery code from Bootply.com editor  --> 
+
+<script type='text/javascript'>
+        
+            (function($){
+
+	$(document).ready(function(){
+
+		$('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
+
+			event.preventDefault(); 
+
+			event.stopPropagation(); 
+
+			$(this).parent().siblings().removeClass('open');
+
+			$(this).parent().toggleClass('open');
+
+		});
+
+	});
+
+})(jQuery);
+        
+        </script> 
diff --git a/inc/nav-walker.php b/inc/nav-walker.php
index 0851934..658d1f3 100644
--- a/inc/nav-walker.php
+++ b/inc/nav-walker.php
@@ -308,7 +308,7 @@ function display_element ($element, &$children_elements, $max_depth, $depth = 0,
 	}
 }
 // add hook
-add_filter( 'wp_nav_menu_objects', 'my_wp_nav_menu_objects_sub_menu', 10, 2 );
+add_filter( 'wp_nav_menu_objects', 'my_wp_nav_menu_objects_sub_menu', 0, 2 );
 
 // filter_hook function to react on sub_menu flag
 function my_wp_nav_menu_objects_sub_menu( $sorted_menu_items, $args ) {