From 3e5bc349e25cad9b63995c43f5344b420e35375d Mon Sep 17 00:00:00 2001
From: rgmears <robert@studiofive.ca>
Date: Sun, 26 Oct 2014 14:31:22 -0500
Subject: [PATCH] Update error.php

Changes start at line 154.
This gets the main menu displaying correctly but does not fix two other things:
sticky footer (I don't know why the CSS is not applied)
loading of a module within another module. (Tried loadmodule and loadposition to no avail; perhaps because I am using a custom html module for the footer ... the module class is not picked up either.)
As well, I have not figured out how to make the button work for displaying the menu in tablet view.

You can see my custom application here: http://silverplains.ca/floa.html
---
 error.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/error.php b/error.php
index 041897b..a4d1710 100644
--- a/error.php
+++ b/error.php
@@ -152,13 +152,19 @@
 </div>
 	<?php endif ?>
 
+	<div class="navbar navbar-inverse navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="brand" href="<?php echo $this->baseurl; ?>"><?php echo htmlspecialchars($app->getCfg('sitename')) ?></a>
+				<div class="nav-collapse collapse">
+					<?php echo $renderer->render('nav', $raw, null) ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
 <header id="header" class="clear clearfix">
 	<div class="gutter">
-
-		<h1 id="logo">
-			<a href="<?php echo $this->baseurl ?>/" title="<?php echo htmlspecialchars($app->getCfg('sitename')) ?>"><?php echo $this->baseurl ?></a>
-		</h1>
-
 		<?php echo $renderer->render('header', $jexhtml, null) ?>
 
 		<nav>
@@ -199,10 +205,6 @@
 
 	<?php echo $renderer->render('breadcrumbs', $raw, null) ?>
 
-	<nav id="nav" class="clear">
-		<?php echo $renderer->render('nav', $raw, null) ?>
-	</nav>
-
 	<div id="content-container" class="clear clearfix">
 		<?php if ($navBelowClass) : ?>
 		<div id="nav-below" class="clearfix">