From ece733c04fb0823dd5843a3e31bf384a2895e2bf Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Mon, 29 Jun 2015 15:10:34 -0400 Subject: [PATCH] Nav updates --- header.php | 2 +- inc/nav-drop-multi.php | 203 ++++++++++++++++++------------------ inc/nav-tabs.php | 231 ++++++++++++++++++++--------------------- inc/site-title.php | 2 +- inc/submenu-check.php | 6 +- 5 files changed, 223 insertions(+), 221 deletions(-) diff --git a/header.php b/header.php index f4295d0..7b4e102 100644 --- a/header.php +++ b/header.php @@ -5,7 +5,7 @@ * Displays all of the section and everything up till
* */ -include 'inc/vars.php'; + include 'inc/vars.php'; ?> > diff --git a/inc/nav-drop-multi.php b/inc/nav-drop-multi.php index 30205fe..dcf32f7 100644 --- a/inc/nav-drop-multi.php +++ b/inc/nav-drop-multi.php @@ -1,101 +1,102 @@ - - - - - - - - - + + + + + + + + + + diff --git a/inc/nav-tabs.php b/inc/nav-tabs.php index af8b704..92b8379 100644 --- a/inc/nav-tabs.php +++ b/inc/nav-tabs.php @@ -1,116 +1,115 @@ - - - - - - - - - + + + + + + + + + diff --git a/inc/site-title.php b/inc/site-title.php index 4cd9756..a47f589 100644 --- a/inc/site-title.php +++ b/inc/site-title.php @@ -6,4 +6,4 @@ echo '

'.$secondary.'

'; } ?> -

+

\ No newline at end of file diff --git a/inc/submenu-check.php b/inc/submenu-check.php index 42c4d68..61275a4 100644 --- a/inc/submenu-check.php +++ b/inc/submenu-check.php @@ -1,4 +1,6 @@ menu_item_parent; $stack[] = $menu_item->ID; $menu_items[$key]->level = $level; - if($menu_item->menu_item_parent == $current_id && $level > 2 || $menu_item->ID == $current_id && $level > 2){ + + if($menu_item->menu_item_parent == $current_id && $level > 2 || $menu_item->ID == $current_id && $level > 2 && $navoption1 == 'drop'){ $has_sub_menu = true; } } @@ -28,7 +31,6 @@ } if($has_sub_menu){ ?> -