got logo in tobar and float left

diff --git a/functions.php b/functions.php
index e24300a..46c1af6 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -96,7 +96,7 @@ function glm_page_menu($parent = 0, $class = '')
         'post_type'   => 'page',
         'parent'      => $parent,
         'number'      => '',
-        'exclude'     => $frontPageId,
+        'exclude'     => '',
         'post_status' => 'publish',
         'sort_order'  => 'asc',
         'sort_column' => 'menu_order'
@@ -106,9 +106,7 @@ function glm_page_menu($parent = 0, $class = '')
     }
     $pages = get_pages($args);
     echo '<ul'.(($class)?' class="'.$class.'"':'').'><!-- begin -->'."\n";
-    $mainPageCount = 1;
     foreach ($pages as $page) {
-        // echo '<pre>'.print_r($page,true).'</pre>';exit;
         $childs = get_pages('child_of=' . $page->ID);
         if (count($childs) > 0) {
             echo '<li class="has-dropdown">'."\n";
@@ -116,20 +114,13 @@ function glm_page_menu($parent = 0, $class = '')
             echo glm_page_menu($page->ID, 'sub-menu dropdown');
             echo '</li>'."\n";
         } else {
-            echo '<li><a href="'.get_permalink($page->ID).'">'.$page->post_title.'</a></li>'."\n";
-        }
-        if ($page->post_parent == 0) {
-            if ($mainPageCount == 0) {
-                echo '<li id="logo"><a href="';
-                echo get_bloginfo('url');
-                echo '"><img src="'.get_bloginfo('template_url').'/assets/michigan-scientific-logo.png"></a></li>'."\n";
-            }
-            if ($mainPageCount == 6) {
-                echo '<li id="search-icon"><a href="';
-                echo '#';
-                echo '"><img src="'.get_bloginfo('template_url').'/assets/Untitled-2.png"></a></li>'."\n";
+            echo '<li';
+            if ($page->ID == $frontPageId) {
+                echo ' id="logo"';
             }
-            ++$mainPageCount;
+            echo '><a href="'.get_permalink($page->ID).'">';
+            echo ($page->ID == $frontPageId) ? '<img src="'.get_bloginfo('template_url').'/assets/michigan-scientific-logo.png">': $page->post_title;
+            echo '</a></li>'."\n";
         }
     }
     echo '</ul><!-- end -->'."\n";

diff --git a/parts/top-bar.php b/parts/top-bar.php
index d154377..8e2bfb3 100644 (file)
--- a/parts/top-bar.php
+++ b/parts/top-bar.php
@@ -1,4 +1,4 @@
-<nav class="top-bar text-center show-for-large-up" data-topbar role="navigation">
+<nav class="top-bar show-for-large-up" data-topbar role="navigation">
     <section class="top-bar-section">
         <?php glm_page_menu(); ?>
     </section>