Made the nav bar part of the header.

tsetliff · tsetliff · commit 5c5c78be9322 · 2018-08-05T14:06:08.000-04:00
diff --git a/template/app/templates/header.php b/template/app/templates/header.php
@@ -9,4 +9,5 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link rel="stylesheet" href="/css/main.css">
 </head>
-<body>
+<body>
+<?php $this->insertTemplate('users/navBar.php'); ?>
diff --git a/template/app/templates/home.php b/template/app/templates/home.php
@@ -1,5 +1,4 @@
 <?php $this->insertTemplate('header.php'); ?>
-<?php $this->insertTemplate('users/navBar.php'); ?>
 <div class="container">
     <h1>Hello <?php echo(($name) ? $name : 'world'); ?>!</h1>
     <form action="" method="post">
diff --git a/template/app/templates/users/loginFailed.php b/template/app/templates/users/loginFailed.php
@@ -1,5 +1,4 @@
 <?php $this->insertTemplate('header.php'); ?>
-<?php $this->insertTemplate('users/navBar.php'); ?>
 Your login attempt failed with error: <?php echo $error ?> Please try again.<br>
 This is just a demo site, it doesn't even have password reset.
 <?php $this->insertTemplate('footer.php'); ?>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php $this->insertTemplate('header.php'); ?>`
`2`		`-<?php $this->insertTemplate('users/navBar.php'); ?>`
`3`	`2`	`<div class="container">`
`4`	`3`	`<h1>Hello <?php echo(($name) ? $name : 'world'); ?>!</h1>`
`5`	`4`	`<form action="" method="post">`