added href to top links, added side menu to top links

diff --git a/header.php b/header.php
index de04d17..81d2b11 100644 (file)
--- a/header.php
+++ b/header.php
@@ -21,10 +21,10 @@
                         <div class="large-8 columns">
                             <ul>
                                 <li><a href="<?php bloginfo('url')?>">Home</a></li>
-                                <li><a>Meetings & Events</a></li>
-                                <li><a>Sports Planning</a></li>
-                                <li><a>Travel Partners</a></li>
-                                <li><a>Media</a></li>
+                                <li><a href="<?php echo get_permalink(3200);?>">Meetings & Events</a></li>
+                                <li><a  href="<?php echo get_permalink(3201);?>"> Sports Planning</a></li>
+                                <li><a  href="<?php echo get_permalink(3202);?>">Travel Partners</a></li>
+                                <li><a  href="<?php echo get_permalink(3203);?>">Media</a></li>
                                 <li><a href="<?php echo get_permalink(2839); ?>">Blog</a></li>
                                 <li id="searchIcon"><a><img src="<?php bloginfo('template_url'); ?>/assets/search-icon.jpg"></a></li>
                                 <li><?php get_template_part("parts/search"); ?></li>

diff --git a/js/app.js b/js/app.js
index df0a835..0f00f38 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -48,12 +48,12 @@ $(document).ready(function () {
     $("#block-4").wrap('<div id="med-block" class="row collapse">');
     $("#small-blocks, #med-block").wrapAll('<div class="small-12 large-6 columns">');
     
-    $("#menu-side").children("h1").replaceWith(function () {
-        return $('<h2/>', {
-            html: $(this).html()
-        });
-    });
-    $("#menu-side").children("ul").addClass("sidebar");
+//    $("#menu-side").children("h1").replaceWith(function () {
+//        return $('<h2/>', {
+//            html: $(this).html()
+//        });
+//    });
+//    $("#menu-side").children("ul").addClass("sidebar");
     
     // remove drop down arrow icons from sub menu items
     $("#menu-menu-1").find(".dropdown").children("li").removeClass("has-dropdown");

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 3ea64ea..96f7203 100644 (file)
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -39,12 +39,12 @@ $(document).ready(function () {
     $("#block-4").wrap('<div id="med-block" class="row collapse">');
     $("#small-blocks, #med-block").wrapAll('<div class="small-12 large-6 columns">');
     
-    $("#menu-side").children("h1").replaceWith(function () {
-        return $('<h2/>', {
-            html: $(this).html()
-        });
-    });
-    $("#menu-side").children("ul").addClass("sidebar");
+//    $("#menu-side").children("h1").replaceWith(function () {
+//        return $('<h2/>', {
+//            html: $(this).html()
+//        });
+//    });
+//    $("#menu-side").children("ul").addClass("sidebar");
     
     // remove drop down arrow icons from sub menu items
     $("#menu-menu-1").find(".dropdown").children("li").removeClass("has-dropdown");

diff --git a/landing-page.php b/landing-page.php
index 778176c..d5c2056 100644 (file)
--- a/landing-page.php
+++ b/landing-page.php
@@ -29,7 +29,7 @@ Template Name: Landing Page
                  <?php foreach($images as $image){
                     $imageSrc =  $image['full'];
                   }?>
-                     <li class="small-text-center medium-text-left landing-item"><a href="<?php echo get_permalink($child->ID); ?>"><img src="<?php echo $imageSrc; ?>"><h5><?php echo $child->post_title ?></h5></a></li>
+                     <li class="small-text-center medium-text-left landing-item"><a href="<?php echo get_permalink($child->ID); ?>"><img src="<?php echo $imageSrc; ?>" alt="featured-image"><h5><?php echo $child->post_title ?></h5></a></li>
                      <?php $imageSrc = null; ?>
                <?php } ?>
 <!--

diff --git a/lib/navigation.php b/lib/navigation.php
index 764b1cf..69d49c1 100644 (file)
--- a/lib/navigation.php
+++ b/lib/navigation.php
@@ -163,6 +163,7 @@ function glm_get_menu_options()
     }
     return $menu_options;
 }
+
 //function glm_side_menu() {
 //    global $post;
 //    $parents = get_post_ancestors($post->ID);
@@ -180,7 +181,8 @@ function glm_get_menu_options()
 //}
 function glm_side_menu($mobile = false) {
         global $post;
-   
+        if( !is_page(array(3200, 3201,3202,3203))){
+           
             $sideMenu = $allMenu = $pageMenuId = array();
         if (($locations = get_nav_menu_locations()) && isset($locations['top-bar'])) {
             $menu       = wp_get_nav_menu_object($locations['top-bar']);
@@ -236,12 +238,12 @@ function glm_side_menu($mobile = false) {
         }
         echo '>'.$pageHead->title.'</a><ul>';
     } else {
-        echo '<h1><a href="'.$pageHead->url.'"';
+        echo '<h2><a href="'.$pageHead->url.'"';
         if ($pageHead->target) {
             echo ' target="'.$pageHead->target.'"';
         }
-        echo '>'.$pageHead->title.'</a></h1>';
-        echo '<ul>';
+        echo '>'.$pageHead->title.'</a></h2>';
+        echo '<ul class="sidebar">';
     }
     foreach ($subs as $menu_item) {
         echo '<li><a href="'.$menu_item->url.'"';
@@ -254,5 +256,22 @@ function glm_side_menu($mobile = false) {
         echo '</ul>';
     }
     echo '</ul>';
+} else {
+    global $post;
+    $parents = get_post_ancestors($post->ID);
+    $id = ($parents) ? $parents[count($parents)-1]: $post->ID;
+    $parent = get_page( $id );
+    if ($id == 0) {
+        $ID = $post->ID;
+    } else {
+        $ID = $parent->ID;
+    }
+    echo '<h2>'.get_the_title($ID).'</h2>';
+    echo '<ul class="sidebar"><!-- begin -->'."\n";
+    echo wp_list_pages( 'child_of='.$ID.'&title_li=&depth=1&echo=0');
+    echo '</ul><!-- end -->'."\n";       
+        }
 }
+           
+