From 555866fda2516b1c7a5be71b65736c10c2f9d00f Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Wed, 31 Dec 2014 11:20:03 -0500
Subject: [PATCH] New Left Nav

Removed attributes from parent menu items.
Changed classes on children menu items.
Added new margin for .sub-menu
---
 inc/nav-walker.php | 722 ++++++++++++++++++++++-----------------------
 sass/nav.scss      |   4 +
 style.css          |   3 +
 3 files changed, 364 insertions(+), 365 deletions(-)

diff --git a/inc/nav-walker.php b/inc/nav-walker.php
index 605724b..9135f45 100644
--- a/inc/nav-walker.php
+++ b/inc/nav-walker.php
@@ -1,366 +1,358 @@
-<?php 
-/*Nav Menu Walker*/
-if(!class_exists('Bootstrap_Nav_Walker')) {
-	class Bootstrap_Nav_Walker extends Walker_Nav_Menu {     
-		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
-		/* 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; 
-			$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'; 
-				} 
-			} 
-	
-			/* 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') {
-				if ($item->hasChildren && $depth == 0) { 
-					$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 && $depth == 0) { 
-					$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)
-		{
-			$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); 
-		}         
-	}
-}
-/*Nav Menu Walker*/
-if(!class_exists('Secondary_Bootstrap_Nav_Walker')) {
-	class Secondary_Bootstrap_Nav_Walker extends Walker_Nav_Menu {     
-		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
-		/* 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=\"sub-menu dropdown-menu\" role=\"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)  
-		{
-			$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; 
-			$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'; 
-				} 
-			} 
-	
-			/* 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') {
-				if ($item->hasChildren && $depth == 0) { 
-					//$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
-					$item_output .= '<a'. $attributes .'>'; 
-				} 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 && $depth == 0) { 
-					$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)
-		{
-			$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_wp_nav_menu_objects_sub_menu', 10, 2 );
-
-// filter_hook function to react on sub_menu flag
-function my_wp_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($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 
+/*Nav Menu Walker*/
+if(!class_exists('Bootstrap_Nav_Walker')) {
+	class Bootstrap_Nav_Walker extends Walker_Nav_Menu {     
+		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
+		/* 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; 
+			$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'; 
+				} 
+			} 
+	
+			/* 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') {
+				if ($item->hasChildren && $depth == 0) { 
+					$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 && $depth == 0) { 
+					$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)
+		{
+			$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); 
+		}         
+	}
+}
+/*Nav Menu Walker*/
+if(!class_exists('Secondary_Bootstrap_Nav_Walker')) {
+	class Secondary_Bootstrap_Nav_Walker extends Walker_Nav_Menu {     
+		/*This was taken from 320press WP-Bootstrap theme. No licensing restriction given, and it said it was free. */
+		/* 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=\"nav nav-pills nav-stacked sub-menu\" role=\"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)  
+		{
+			$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; 
+			$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'; 
+				} 
+			} 
+	
+			/* 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') {
+				if ($item->hasChildren && $depth == 0) { 
+					//$item_output .= '<a'. $attributes .' class="dropdown-toggle" data-toggle="dropdown">'; 
+					$item_output .= '<a'. $attributes .'>'; 
+				} else { 
+					$item_output .= '<a'. $attributes .'>'; 
+				} 
+				$item_output .= apply_filters('the_title', $item->post_title, $item->ID);
+				$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 && $depth == 0) { 
+					$item_output .= '<a'. $attributes .' >'; 
+				} else { 
+					$item_output .= '<a'. $attributes .'>'; 
+				} 
+				//var_dump($item);
+				
+				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; 
+		
+				
+				$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)
+		{
+			$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_wp_nav_menu_objects_sub_menu', 10, 2 );
+
+// filter_hook function to react on sub_menu flag
+function my_wp_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($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/sass/nav.scss b/sass/nav.scss
index 854a558..4c9ac6f 100644
--- a/sass/nav.scss
+++ b/sass/nav.scss
@@ -42,6 +42,10 @@
 			}
 		}
 		
+		.sub-menu {
+			margin:2px 0 2px 1.5em;	
+		}
+		
 	}
 	
 	
diff --git a/style.css b/style.css
index 78b3f27..56dd459 100644
--- a/style.css
+++ b/style.css
@@ -6836,6 +6836,9 @@ button.close {
   background-color: #428bca;
   color: white;
 }
+#nav-secondary .nav.nav-pills.nav-stacked .sub-menu {
+  margin: 2px 0 2px 1.5em;
+}
 #nav-secondary > ul {
   margin: 0;
   padding: 0;