Getting uniform look across pages, hugo be weird

5 files changed, 95 insertions, 43 deletions

diff --git a/layouts/404.html b/layouts/404.html
index 5268d0c..96e8505 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,9 +1,24 @@
 {{ partial "header.html" . }}
-<div class="content">
-	<h2>404 Resource Not Found</h2>
-	<p>
-	The thing you are looking for can not be found.
-	<a href="{{ "/" | relURL }}">Home</a>
-	</p>
-</div>
+<main>
+	<header class="header-inline">
+		<div class="heading">
+			<div class="info">
+				<div class="content">
+					{{ if (gt .Params.date 0) }} {{ .Date.Format "January 2, 2006" }} {{ end }} {{ if (gt .Params.author 0) }} by {{ with .Params.author }} {{ . }} {{ end }} {{ end }}
+				</div>
+			</div>
+			<div class="content">
+				<h1>{{ .Title | markdownify }}</h1>
+			</div>
+		</div>
+	</header>
+	<div class="content">
+		<p>
+		The thing you are looking for can not be found.
+		</p>
+		<p>
+		<a href="{{ "/" | relURL }}">Home</a>
+		</p>
+	</div>
+</main>
 {{ partial "footer.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ffe85da..249ea3d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,14 +1,25 @@
 {{ partial "header.html" . }}
-<div class="content">
-	{{ if not .IsHome }}
-	<h1>{{ .Title | markdownify }}</h1>
-	{{ end }}
-	<ul>
-		{{ range (where .Data.Pages "Section" "!=" "") }}
-		<li>{{ .Date.Format "January 2, 2006" }}
-			<a href="{{ .URL }}">{{ .Title | markdownify }}</a>
-		</li>
-		{{ end }}
-	</ul>
-</div>
+<main>
+	<header class="header-inline">
+		<div class="heading">
+			<div class="info">
+				<div class="content">
+					{{ if (gt .Params.date 0) }} {{ .Date.Format "January 2, 2006" }} {{ end }} {{ if (gt .Params.author 0) }} by {{ with .Params.author }} {{ . }} {{ end }} {{ end }}
+				</div>
+			</div>
+			<div class="content">
+				<h1>{{ .Title | markdownify }}</h1>
+			</div>
+		</div>
+	</header>
+	<div class="content">
+		<ul>
+			{{ range (where .Data.Pages "Section" "!=" "") }}
+			<li>{{ .Date.Format "Jan 2nd, 2006" }}
+				<a href="{{ .URL }}">{{ .Title | markdownify }}</a>
+			</li>
+			{{ end }}
+		</ul>
+	</div>
+</main>
 {{ partial "footer.html" . }}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index f907888..a8eedea 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -12,7 +12,7 @@
     {{ with .OutputFormats.Get "RSS" }}
         {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end }}
-    {{ range .Pages }}
+    {{ range where .Site.RegularPages "Section" "posts" }}
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 20347df..3455ec5 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,15 +1,26 @@
 {{ partial "header.html" . }}
-<div class="content">
-	{{ if not .IsHome }}
-	<h1>{{ .Title | markdownify }}</h1>
-	{{ end }}
-	<ul>
-		{{ range $key, $value := .Data.Terms }}
-		<li>
-			<a href="{{ (print "/" $.Data.Plural "/" $key | urlize) | relURL }}">{{ $key }}</a>
-			({{ len $value }})
-		</li>
-		{{ end }}
-	</ul>
-</div>
+<main>
+	<header class="header-inline">
+		<div class="heading">
+			<div class="info">
+				<div class="content">
+					{{ if (gt .Params.date 0) }} {{ .Date.Format "January 2, 2006" }} {{ end }} {{ if (gt .Params.author 0) }} by {{ with .Params.author }} {{ . }} {{ end }} {{ end }}
+				</div>
+			</div>
+			<div class="content">
+				<h1>{{ .Title | markdownify }}</h1>
+			</div>
+		</div>
+	</header>
+	<div class="content">
+		<ul>
+			{{ range $key, $value := .Data.Terms }}
+			<li>
+				<a href="{{ (print "/" $.Data.Plural "/" $key | urlize) | relURL }}">{{ $key }}</a>
+				({{ len $value }})
+			</li>
+			{{ end }}
+		</ul>
+	</div>
+</main>
 {{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
index 624f3a0..e0c9263 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,13 +1,28 @@
 {{ partial "header.html" . }}
-<div class="content">
-	{{ .Content }}
+<main>
+	<header class="header-inline">
+		<div class="heading">
+			<div class="info">
+				<div class="content">
+					{{ if (gt .Params.date 0) }} {{ .Date.Format "January 2, 2006" }} {{ end }} {{ if (gt .Params.author 0) }} by {{ with .Params.author }} {{ . }} {{ end }} {{ end }}
+				</div>
+			</div>
+			<div class="content">
+				<h1>{{ .Title | markdownify }}</h1>
+			</div>
+		</div>
+	</header>
 
-	<ul>
-		{{ range .Site.RegularPages }}
-		<li>{{ .Date.Format "January 2, 2006" }}
-			<a href="{{ .URL }}">{{ .Title | markdownify }}</a>
-		</li>
-		{{ end }}
-	</ul>
-</div>
+	<div class="content">
+		{{ .Content }}
+
+		<ul>
+			{{ range where .Site.RegularPages "Section" "posts" }}
+			<li>{{ .Date.Format "January 2, 2006" }}
+				<a href="{{ .URL }}">{{ .Title | markdownify }}</a>
+			</li>
+			{{ end }}
+		</ul>
+	</div>
+</main>
 {{ partial "footer.html" . }}