From 45cadf09454eede07c4c75238231bed8967a6848 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 9 Oct 2013 16:41:24 +1100
Subject: [PATCH] Minor template updates

---
 classes/lnApp/Controller/TemplateDefault.php |  9 ++++++---
 views/theme/baseadmin/page.php               |  5 +++++
 views/theme/focusbusiness/pages/navbar.php   | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/classes/lnApp/Controller/TemplateDefault.php b/classes/lnApp/Controller/TemplateDefault.php
index ff9e899..186a954 100644
--- a/classes/lnApp/Controller/TemplateDefault.php
+++ b/classes/lnApp/Controller/TemplateDefault.php
@@ -85,7 +85,10 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa
 				if ($this->request->is_ajax())
 					throw HTTP_Exception::factory(403,_('You dont have enough permissions.'));
 				else
-					HTTP::redirect('login/noaccess');
+					if (! Kohana::$config->load('debug')->disabled_noaccess_redirect)
+						HTTP::redirect('login/noaccess');
+					else
+						throw HTTP_Exception::factory(501,'I would redirect you here - no ACCESS');
 
 			} else {
 				Session::instance()->set('afterlogin',Request::detect_uri());
@@ -150,8 +153,8 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa
 			$output = Style::factory()->render_all();
 			$output .= Script::factory()->render_all();
 
-			if (! isset($this->template->content) AND $this->response->body())
-				$output .= $this->response->body();
+			if (! isset($this->template->content))
+				$output .= $this->response->body() ? $this->response->body() : '';
 			else
 				$output .= $this->template->content;
 
diff --git a/views/theme/baseadmin/page.php b/views/theme/baseadmin/page.php
index f90ceaf..7ccb9aa 100644
--- a/views/theme/baseadmin/page.php
+++ b/views/theme/baseadmin/page.php
@@ -71,6 +71,11 @@
 							<li class="">
 								<a href="<?php echo URL::link('user','welcome',TRUE); ?>"><i class="icon-home"></i> <span>Home</span></a>
 							</li>
+							<?php if (($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
+							<li class="">
+								<a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="icon-tasks"></i> <span>Admin</span></a>
+							</li>
+							<?php endif ?>
 						</ul>
 					</div> <!-- /.subnav-collapse -->
 				</div> <!-- /container -->
diff --git a/views/theme/focusbusiness/pages/navbar.php b/views/theme/focusbusiness/pages/navbar.php
index e69de29..b7d7d46 100644
--- a/views/theme/focusbusiness/pages/navbar.php
+++ b/views/theme/focusbusiness/pages/navbar.php
@@ -0,0 +1,15 @@
+<ul id="main-nav">
+	<li class="active"><a href="<?php echo URL::site(''); ?>">Home</a></li>
+	<?php if ($x = Company::instance()->faq()) : ?>
+	<li><a href="<?php echo $x; ?>">Faq</a></li>
+	<?php endif ?>
+	<?php if (Auth::instance()->logged_in()) : ?>
+	<li><a href="<?php echo URL::site('login'); ?>">Customer Login</a></li>
+	<?php else : ?>
+	<li><a href="<?php echo URL::site('login'); ?>" data-toggle="modal" data-target="#modal-login">Customer Login</a></li>
+	<?php endif ?>
+</ul>
+
+<div class="modal hide fade" id="modal-login" role="dialog" aria-hidden="true">
+	<div class="modal-body"></div>
+</div>