app/views: Misc changes. Include header for error pages.

5 files changed, 48 insertions, 42 deletions

diff --git a/app/views/partials/footer.php b/app/views/partials/footer.php
index e25fc85..04e9633 100644
--- a/app/views/partials/footer.php
+++ b/app/views/partials/footer.php
@@ -1,55 +1,57 @@
 <div class="hero-foot">
 
-  <footer class="footer footer__custom">
+<footer class="footer has-text-left">
 
-      <div class="columns">
+<div class="container">
+<div class="columns">
 
-          <div class="column footer__left">
+  <div class="column">
 
-            <div class="has-text-centered">
-              <div class="footer-left has-text-black is-size-7">
 
-                <p>Design inspired by <a class="has-text-black" href="https://github.com/solutionroute/hugo-smorg">Smorg</a></p>
-                <p>Built with <a class="has-text-black" href="https://secure.php.net/">PHP</a> | <a class="has-text-black" href="https://gohugo.io/">Hugo</a> | <a class="has-text-black" href="https://posativ.org/isso/">Isso</a></p>
-                <p>&copy; Thedro Neely</p></li>
+      <div class="footer__custom">
 
-              </div>
-            </div>
+        <p class="has-text-grey is-size-7">Design inspired by <a href="https://github.com/solutionroute/hugo-smorg">Smorg</a></p>
+        <p class="has-text-grey is-size-7">Built with <a href="https://secure.php.net/">PHP</a> | <a href="https://gohugo.io/">Hugo</a> | <a href="https://posativ.org/isso/">Isso</a></p>
+        <p class="has-text-grey is-size-7">&copy; Thedro Neely</p>
+        <hr>
 
-          </div>
+      </div>
 
-          <div class="column footer__middle">
 
-            <div class="has-text-centered">
-              <div class="footer-left is-size-7">
+  </div>
 
-                <p><a class="has-text-black" href="https://github.com/tdro">Github Profile</a></p>
-                <p><a class="has-text-black" href="https://gitlab.com/tdro">Gitlab Repository</a></p>
-                <p><a class="has-text-black" href="#">Contact Page</a></p>
+  <div class="column">
 
-              </div>
-            </div>
 
-          </div>
+      <div class="footer__custom">
 
-          <div class="column footer__right">
+        <p class="has-text-grey is-size-7" ><a href="https://github.com/tdro">Github Profile</a></p>
+        <p class="has-text-grey is-size-7" ><a href="https://gitlab.com/tdro">Gitlab Repository</a></p>
+        <p class="has-text-grey is-size-7" ><a href="/rss.xml">RSS Syndication</a></p>
+        <hr>
 
-          <div class="has-text-centered is-size-7">
-            <div>
+      </div>
 
-              <p class="img__margin"><a href="/pgp.asc"><img src="/images/pgp.png" height="111" width="111" alt="PGP Key"></a></p>
-              <p><a class="has-text-black" href="/pgp.asc">&mdash; PGP Public Key &mdash;</a></p>
 
-            </div>
-          </div>
+  </div>
 
-          </div>
+   <div class="column">
 
-      </div>
+    <div class="has-text-centered has-text-grey is-size-7">
+
+        <p><a href="/pgp.asc"><img src="/images/pgp.png" height="111" width="111" alt="PGP Key"></a></p>
+        <p><a href="/pgp.asc">&mdash; PGP Public Key &mdash;</a></p>
+
+    </div>
 
-  </footer>
+  </div>
 
 </div>
+</div>
+
+</footer>
+
+  </div>
 
 </section>
 
@@ -94,10 +96,8 @@ document.addEventListener('DOMContentLoaded', function () {
 
 <?php if (trim($_SERVER['REQUEST_URI'], '/') == 'contact') { ?>
 
-<script src="https://cdn.jsdelivr.net/npm/vue"></script>
-
 <!-- development version, includes helpful console warnings -->
-<!-- <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> -->
+<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
 
 <script>
     new Vue({
diff --git a/app/views/partials/header.error.php b/app/views/partials/header.error.php
new file mode 100644
index 0000000..243e78f
--- /dev/null
+++ b/app/views/partials/header.error.php
@@ -0,0 +1,12 @@
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/vendor/autoload.php'; ?>
+
+<?php $navigation = new Navigation; ?>
+
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/header.php'; ?>
+
+    <section class="section hero is-fullheight" itemscope itemtype="http://schema.org/HomePage">
+    <div class="hero-head">
+
+    <?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/navigator.php'; ?>
+
+    </div>
diff --git a/app/views/partials/header.php b/app/views/partials/header.php
index 2162868..b5e5dfe 100644
--- a/app/views/partials/header.php
+++ b/app/views/partials/header.php
@@ -2,14 +2,13 @@
 <html class="has-navbar-fixed-top" lang="en-us">
 <head>
 
-    <meta charset="utf-8">
-
-    <title><?php generateTitle(); ?>Portfolio - Thedro Neely</title>
+    <title><?php $navigation->generateTitle(); ?>Portfolio - Thedro Neely</title>
 
     <meta name="description" content="Thedro's Portfolio Website">
     <meta name="keywords" content="Thedro,Neely,Portfolio,Website">
     <meta name="author" content="Thedro Neely">
 
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="index,follow">
 
diff --git a/app/views/partials/header.posts.php b/app/views/partials/header.posts.php
index 87189bd..ea2dccb 100644
--- a/app/views/partials/header.posts.php
+++ b/app/views/partials/header.posts.php
@@ -1,10 +1,9 @@
 
-    <meta charset="utf-8">
-
     <meta name="description" content="Thedro's Portfolio Website Posts">
     <meta name="keywords" content="Thedro,Neely,Portfolio,Website,Posts">
     <meta name="author" content="Thedro Neely">
 
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="index,follow">
 
diff --git a/app/views/partials/navigator.php b/app/views/partials/navigator.php
index 96facde..50b3578 100644
--- a/app/views/partials/navigator.php
+++ b/app/views/partials/navigator.php
@@ -1,7 +1,3 @@
-<?php include $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/model/Navigation.php'; ?>
-
-<?php $navigation = new Navigation(); ?>
-
     <nav class="navbar navbar__custom is-fixed-top" aria-label="main navigation">
         <div class="container">
             <div class="navbar-brand">