From 5a22738e37dc25080ae58534301bfbfb4502c12e Mon Sep 17 00:00:00 2001
From: Danang Probo Sayekti <dan@danpros.com>
Date: Mon, 20 Jul 2015 21:44:34 +0700
Subject: [PATCH] Improve menu

Add bootstrap menu classes.
---
 system/admin/views/content-type.html.php |  2 +-
 system/includes/functions.php            | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/system/admin/views/content-type.html.php b/system/admin/views/content-type.html.php
index c905e1f..238232f 100644
--- a/system/admin/views/content-type.html.php
+++ b/system/admin/views/content-type.html.php
@@ -5,5 +5,5 @@
 <p><a href="<?php echo site_url();?>add/video">Video post</a><br>Creating blog post with featured video.</p>
 <p><a href="<?php echo site_url();?>add/audio">Audio post</a><br>Creating blog post with featured audio.</p>
 <p><a href="<?php echo site_url();?>add/link">Link post</a><br>Creating blog post with featured link.</p>
-<p><a href="<?php echo site_url();?>add/quote">Quote post</a><br>Creating blog post with fetaured quote.</p>
+<p><a href="<?php echo site_url();?>add/quote">Quote post</a><br>Creating blog post with featured quote.</p>
 <p><a href="<?php echo site_url();?>add/page">Static page</a><br>Creating static page.</p>
\ No newline at end of file
diff --git a/system/includes/functions.php b/system/includes/functions.php
index caa8058..db9e88f 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1179,7 +1179,7 @@ EOF;
 }
 
 // Menu
-function menu()
+function menu($custom = null)
 {
     $menu = config('blog.menu');
     $req = $_SERVER['REQUEST_URI'];
@@ -1188,7 +1188,7 @@ function menu()
 
         $links = explode('|', $menu);
 
-        echo '<ul class="nav">';
+        echo '<ul class="nav navbar-nav ' . $custom . '">';
 
         $i = 0;
         $len = count($links);
@@ -1237,7 +1237,7 @@ function menu()
 
         echo '</ul>';
     } else {
-        get_menu();
+        get_menu($custom);
     }
 }
 
@@ -1255,7 +1255,7 @@ function get_title_from_file($v)
 }
 
 // Auto generate menu from static page
-function get_menu()
+function get_menu($custom)
 {
     $posts = get_static_pages();
     $req = $_SERVER['REQUEST_URI'];
@@ -1264,7 +1264,7 @@ function get_menu()
 
         krsort($posts);
 
-        echo '<ul class="nav">';
+        echo '<ul class="nav navbar-nav ' . $custom . '">';
         if ($req == site_path() . '/') {
             echo '<li class="item first active"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
         } else {
@@ -1296,13 +1296,12 @@ function get_menu()
             } else {
                 $active = '';
             }
-            echo '<li class="' . $class . $active . '">';
-
-            $subPages = get_static_sub_pages(str_replace('.md', '', $base));
-            echo '<a href="' . $url . '">' . ucwords($title) . '</a>';
+			
+			$subPages = get_static_sub_pages(str_replace('.md', '', $base));
             if (!empty($subPages)) {
-                echo '<ul class="subnav">';
-
+			    echo '<li class="' . $class . $active .' dropdown">';
+				echo '<a class="dropdown-toggle" data-toggle="dropdown" href="' . $url . '">' . ucwords($title) . '<b class="caret"></b></a>';
+                echo '<ul class="subnav dropdown-menu" role="menu">';
                 $iSub = 0;
                 $countSub = count($subPages);
                 foreach ($subPages as $index => $sp) {
@@ -1324,13 +1323,16 @@ function get_menu()
                     $iSub++;
                 }
                 echo '</ul>';
-            }
+            } else {
+				echo '<li class="' . $class . $active .'">';
+				echo '<a href="' . $url . '">' . ucwords($title) . '</a>';
+			}
             echo '</li>';
         }
         echo '</ul>';
     } else {
 
-        echo '<ul class="nav">';
+        echo '<ul class="nav navbar-nav ' . $custom . '">';
         if ($req == site_path() . '/') {
             echo '<li class="item first active"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
         } else {