Some internal reorg

views/theme/bootstrap/navbar.php

@@ -1,10 +1,18 @@
-<?php foreach (URL::navbar() as $type => $details) :
-	if ($x = Menu::items($type)) : ?>
-		<ul class="nav navbar-nav navbar-right">
-			<li class="dropdown">
-				<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa <?php echo Arr::get($details,'icon','fa-asterisk'); ?>"></i> <?php echo Arr::get($details,'name','?'); ?> <b class="caret"></b></a>
-				<?php echo Menu::ul($type,$x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
-			</li>
-		</ul>
-	<?php endif;
-endforeach ?>
+<ul id="main-nav">
+	<li class="active"><a href="<?php echo URL::site(''); ?>">Home</a></li>
+
+	<?php if (class_exists('Company') AND $x=Company::instance()->faq()) : ?>
+	<li><a href="<?php echo $x; ?>">Faq</a></li>
+	<?php endif ?>
+
+	<?php if (class_exists('Auth') AND Auth::instance()->logged_in()) : ?>
+	<li><a href="<?php echo URL::site('login'); ?>">Login</a></li>
+	<?php else : ?>
+	<li><a href="<?php echo URL::site('login'); ?>" data-toggle="modal" data-target="#modal-login">Login</a></li>
+	<li><a href="<?php echo URL::site('login/register'); ?>">Register</a></li>
+	<?php endif ?>
+</ul>
+
+<div class="modal hide fade" id="modal-login" role="dialog" aria-hidden="true">
+	<div class="modal-body"></div>
+</div>