From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 19 Aug 2015 18:59:48 +0000 (-0400)
Subject: Update the side menu so the uber menu will work.
X-Git-Tag: V1.0.0^2~111
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d1a8b4c1111ecb5cd5a42a044ee20d1c4659e685;p=WP-Themes%2FGovernmentEmmet.git

Update the side menu so the uber menu will work.
---

diff --git a/functions.php b/functions.php
index d397a97..6460e58 100644
--- a/functions.php
+++ b/functions.php
@@ -214,7 +214,6 @@ function glm_side_menu() {
             }
         }
         if (count($pageMenuId) > 1) {
-            //echo '<pre>'.print_r($pageMenuId, true).'</pre>';
             foreach ($pageMenuId as $men) {
                 if (isset($sideMenu[$men->ID]) && !empty($sideMenu[$men->ID])) {
                     $thisPageMenuId = $men->ID;
@@ -228,13 +227,22 @@ function glm_side_menu() {
         // does the current page (in the menu) have sub menu items?
         if (isset($sideMenu[$thisPageMenuId]) && !empty($sideMenu[$thisPageMenuId])) {
             $pageHead  = $allMenu[$thisPageMenuId];
-            $side_menu = $sideMenu[$thisPageMenuId];
+            // get the subs for $thisPageMenuId
+            $subs = $sideMenu[$thisPageMenuId];
+            // If the first element is title [Tabs] then this is a uber menu
+            // custom item and we need to get the subs under that menu item
+            // instead ($sideMenu[$subs[0]->ID])
+            if ($subs[0]->title == '[Tabs]') {
+                $subs = $sideMenu[$subs[0]->ID];
+            }
         } else if ($thisPageMenuParent)  {
             $pageHead  = $allMenu[$thisPageMenuParent];
-            $side_menu = $sideMenu[$thisPageMenuParent];
+            // get the subs for $thisPageMenuParent
+            $subs = $sideMenu[$thisPageMenuParent];
         } else {
             $pageHead  = $allMenu[0];
-            $side_menu = $sideMenu[0];
+            // get Main level
+            $subs = $sideMenu[0];
         }
     }
     echo '<h1><a href="'.$pageHead->url.'"';
@@ -243,7 +251,7 @@ function glm_side_menu() {
     }
     echo '>'.$pageHead->title.'</a></h1>';
     echo '<ul>';
-    foreach ($side_menu as $menu_item) {
+    foreach ($subs as $menu_item) {
         echo '<li><a href="'.$menu_item->url.'"';
         if ($menu_item->target) {
             echo ' target="'.$menu_item->target.'"';
diff --git a/page.php b/page.php
index d391af4..88de75d 100644
--- a/page.php
+++ b/page.php
@@ -1,7 +1,8 @@
 <?php get_header(); ?>
                 <main>
                     <div class="row" data-equalizer>
-                        <?php if (get_the_block( 'sidebar' ) != "" 
+                    <?php get_sidebar();?>
+                        <?php if (get_the_block( 'sidebar' ) != ""
                             && empty($ninja_forms_append_page_form_id)
                             && $name != "request-brochures"
                             && $name != "contact-us"
@@ -34,7 +35,7 @@
                         </div>
                         <?php if (get_the_block( 'sidebar' ) != ""
                                 && empty($ninja_forms_append_page_form_id)
-                                && $name != "request-brochures" 
+                                && $name != "request-brochures"
                                 && $name != "contact-us"
                                 && $name != "tips-hotline") {
                             get_template_part('parts/right-sidebar');
diff --git a/sidebar.php b/sidebar.php
index 83d2421..e79a16f 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -2,4 +2,4 @@
                             <div class="row collapse">
                                 <?php glm_side_menu(); ?>
                             </div>
-                        </div>
\ No newline at end of file
+                        </div>