New menu

css/reset.css

@@ -83,7 +83,7 @@ a {
  */
 .wrap {
 	min-width: 280px;
-	max-width: 750px;
+	max-width: 900px;
 	width: 60%;
 
 	margin: 0 auto;

css/style.css

@@ -148,10 +148,10 @@ h2{
 
 /**
  *   Give some extra space to single-page wrappers
- */
 .content {
 	padding: 50px 0px;
 }
+ */
 	.content  ul, .content ol, .items li ul {
 		padding: 20px 30px;
 	}

functions.php

@@ -120,3 +120,46 @@ function article_img($slug){
 		echo '<img class="odd" width="300px" src="'.article_img_url($slug).'.'.$ext.'" />';
 	}
 }
+
+function print_item($item, $class){
+    echo '<li '.$class.'>';
+    echo '<a href="'.menu_url($item).'" title="'.menu_title($item).'">';
+    echo menu_name($item).' </a></li>';
+}
+
+function build_menu($parent, $tree){
+    foreach($tree[$parent] as $i => $item){
+        if(menu_active($item)){
+            $class='class="active"';
+            $expand="true";
+            $collapse="collapse in";
+        }else{
+            $class='';
+            $expand='false';
+            $collapse="collapse";
+        }
+        if(array_key_exists($item->id, $tree)){
+            echo '<li '.$class.' id="btn'.$item->id.'" data-toggle="collapse" data-target="#submenu'.$item->id.'" aria-expanded="'.$expand.'"><a href="#" >'.menu_name($item).'</a>';
+            echo '<ul class="nav navbar-nav '.$collapse.'" id="submenu'.$item->id.'" role="menu" aria-labelledby="btn'.$item->id.'" >';
+            build_menu($item->id, $tree);
+            echo '</ul>';
+            echo '</li>';
+        }else{
+            print_item($item, $class);
+        }
+    }
+}
+
+function menu_tree(){
+    $tree=array();
+
+    while(menu_items()){
+        $item=Registry::get('menu_item');
+        $parent=$item->parent;
+        if(!array_key_exists($parent, $tree)){
+            $tree[$parent] = array();
+        }
+        array_push($tree[$parent], $item);
+    }
+    return build_menu(0, $tree);
+}

header.php

@@ -67,15 +67,7 @@
 					<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				      <ul class="nav navbar-nav">
 
-  	   						<?php if(has_menu_items()):
-  	   							while(menu_items()): ?>
-  	   						<li <?php echo (menu_active() ? 'class="active"' : ''); ?>>
-  	   							<a href="<?php echo menu_url(); ?>" title="<?php echo menu_title(); ?>">
-  	   								<?php echo menu_name(); ?>
-  	   							</a>
-  	   						</li>
-  	   						<?php endwhile;
-  	   							endif; ?>
+                            <?php echo menu_tree();?>
 
                             <li>
 				                <form id="search" action="/search" method="post" class="navbar-form navbar-left">