From 90cb79d78a4d371c06c17d0b80046792def3c8d2 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 17 May 2017 22:44:15 +0200
Subject: [PATCH] Simplified setting the title tag, added author and date to
 posts, TODO make optional. Ordering of meta tags. Fixes for alternate outputs
 like RSS.

---
 layouts/_default/baseof.html  | 4 ++--
 layouts/_default/full.html    | 6 +++++-
 layouts/_default/list.html    | 2 --
 layouts/_default/single.html  | 2 --
 layouts/_default/summary.html | 4 ++++
 layouts/index.html            | 2 ++
 layouts/partials/meta.html    | 6 +-----
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a16d798..273e5c6 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -2,9 +2,9 @@
 <html lang="{{ .Site.Language.Lang }}">
 <head>
 <meta charset="utf-8">
-<title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+<title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
+{{ block "meta" . }}{{ end }}
 {{ partialCached "meta.html" . -}}
-{{ block "meta" . }}{{ end -}}
 </head>
 
 <body class="{{ if $.Param "sidebar" | default true }}one-sidebar sidebar-second{{ else }}no-sidebars{{ end }}">
diff --git a/layouts/_default/full.html b/layouts/_default/full.html
index 73e0bf7..44ce15f 100644
--- a/layouts/_default/full.html
+++ b/layouts/_default/full.html
@@ -1,6 +1,10 @@
 <article class="{{ with .Section }}section-{{ . | urlize }}{{ end }} full-view">
 <header>
-<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a><h2>
+<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
+<p class="submitted">
+{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
+<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
+</p>
 </header>
 <div>
 {{ .Content }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b93c408..33a1940 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,3 @@
-{{ define "title" }}{{ if not .IsHome }}{{ .Title }} - {{ .Site.Title }}{{ end }}{{ end }}
-
 {{ define "meta" }}
 {{ partial "section_meta.html" . -}}
 {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d39d0f5..7f7e839 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,3 @@
-{{ define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end }}
-
 {{ define "meta" }}
 {{ partial "single_meta.html" . -}}
 {{ end }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 06a0866..f95ed1f 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,6 +1,10 @@
 <article class="{{ with .Section }}section-{{ . | urlize }}{{ end }} list-view">
 <header>
 <h2><a href="{{ .RelPermalink }}">{{ .Title }}</a><h2>
+<p class="submitted">
+{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
+<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
+</p>
 </header>
 <div>
 {{ .Summary }}
diff --git a/layouts/index.html b/layouts/index.html
index 6adbdb2..ba5a581 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,3 +1,5 @@
+{{ define "title" }}{{ .Site.Title }}{{ end }}
+
 {{ define "meta" }}
 {{ partial "single_meta.html" . -}}
 {{ end }}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index d8802a5..a452a62 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -2,12 +2,8 @@
 <meta name="MobileOptimized" content="width">
 <meta name="HandheldFriendly" content="true">
 {{ .Hugo.Generator }}
+{{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <link rel="stylesheet" href="/css/styles.css{{ if $.Param "cacheBustCSS" }}?{{ readFile "/public/css/styles.css" | sha1 }}{{ end }}">
 <link rel="canonical" href="{{ .Permalink }}">
 <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon">
 <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-{{ range .AlternativeOutputFormats -}}
-<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
-{{ end -}}
-{{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end -}}
-