From 203f9150e224629e9b07481eae470c0a36f8cdc4 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@flamingcow.tv>
Date: Sun, 14 Apr 2019 22:49:16 +0000
Subject: [PATCH] Simplify include structure

---
 include/article-footer.html |  1 -
 include/article-header.html | 11 -----------
 include/bottom.html         |  8 ++++++--
 include/page-footer.html    |  3 ---
 include/page-head.html      | 10 ----------
 include/page-header.html    |  3 ---
 include/page-html.html      |  2 --
 include/top.html            | 32 ++++++++++++++++++++++++++++----
 8 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 include/article-footer.html
 delete mode 100644 include/article-header.html
 delete mode 100644 include/page-footer.html
 delete mode 100644 include/page-head.html
 delete mode 100644 include/page-header.html
 delete mode 100644 include/page-html.html
diff --git a/include/article-footer.html b/include/article-footer.html
deleted file mode 100644
index e123ba7..0000000
--- a/include/article-footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<hr>
diff --git a/include/article-header.html b/include/article-header.html
deleted file mode 100644
index 6b41844..0000000
--- a/include/article-header.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--# if expr="$date" -->
-<aside>
-	<h4><!--# echo var="date" --></h4>
-</aside>
-<!--# endif -->
-
-<!--# if expr="$title" -->
-<h2><!--# echo var="title" --></h2>
-<!--# endif -->
-
-<hr>
diff --git a/include/bottom.html b/include/bottom.html
index f6187e2..f3b1830 100644
--- a/include/bottom.html
+++ b/include/bottom.html
@@ -1,10 +1,14 @@
-<!--# include file="article-footer.html" -->
+<hr>
 
 <!--# if expr="$title" -->
 </article>
 <!--# endif -->
 
 </main>
-<!--# include file="page-footer.html" -->
+
+<footer>
+	<h1>*</h1>
+</footer>
+
 </body>
 </html>
diff --git a/include/page-footer.html b/include/page-footer.html
deleted file mode 100644
index fb2a760..0000000
--- a/include/page-footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<footer>
-<h1>*</h1>
-</footer>
diff --git a/include/page-head.html b/include/page-head.html
deleted file mode 100644
index 9ab0609..0000000
--- a/include/page-head.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<head>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta charset="UTF-8">
-	<meta name="theme-color" content="#000000">
-	<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-	<style>
-	<!--# include file="style.css" -->
-	</style>
-	<title><!--# echo var="title" default="where the flamingcow roams" --></title>
-</head>
diff --git a/include/page-header.html b/include/page-header.html
deleted file mode 100644
index b831fc1..0000000
--- a/include/page-header.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<header>
-	<h1><a href="https://firestuff.org/">where the flamingcow roams</a></h1>
-</header>
diff --git a/include/page-html.html b/include/page-html.html
deleted file mode 100644
index ce8fe85..0000000
--- a/include/page-html.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
diff --git a/include/top.html b/include/top.html
index 66e8421..149b7f0 100644
--- a/include/top.html
+++ b/include/top.html
@@ -1,8 +1,22 @@
-<!--# include file="page-html.html" -->
-<!--# include file="page-head.html" -->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta charset="UTF-8">
+	<meta name="theme-color" content="#000000">
+	<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
+	<style>
+	<!--# include file="style.css" -->
+	</style>
+	<title><!--# echo var="title" default="where the flamingcow roams" --></title>
+</head>
 
 <body>
-<!--# include file="page-header.html" -->
+
+<header>
+	<h1><a href="https://firestuff.org/">where the flamingcow roams</a></h1>
+</header>
 
 <main>
 
@@ -10,4 +24,14 @@
 <article>
 <!--# endif -->
 
-<!--# include file="article-header.html" -->
+<!--# if expr="$date" -->
+<aside>
+	<h4><!--# echo var="date" --></h4>
+</aside>
+<!--# endif -->
+
+<!--# if expr="$title" -->
+<h2><!--# echo var="title" --></h2>
+<!--# endif -->
+
+<hr>
