Mior reformatting of posts layout

7 files changed, 68 insertions, 25 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 90bb5b5..6b2c851 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,17 @@
 {{ define "main" }}
-<article class="post">
-    <h1 class="text-title">{{ .Params.caption | default .Title }}</h1>
-    {{ .Content }}
+<article class="post" role="document"{{ with .Params.lang}} lang="{{ . }}"{{ end }}>
+    <header>
+        <h1 class="text-title">
+            {{ .Params.caption | default .Title }}
+        </h1>
+    </header>
+
+    <p class="byline">
+        {{ partial "post-meta/date.html" . }}
+    </p>
+
+    <div class="post-body">
+        {{ .Content }}
+    </div>
 </article>
 {{ end }}
diff --git a/layouts/dramas/single.html b/layouts/dramas/single.html
index 865a07b..e47e531 100644
--- a/layouts/dramas/single.html
+++ b/layouts/dramas/single.html
@@ -1,7 +1,15 @@
 {{ define "main" }}
-<article class="drama">
-    <h1 class="text-title">{{ .Params.caption | default .Title }}</h1>
-    {{ with .Params.author }}<p class="byline">{{ i18n "by" . }}</p>{{ end }}
+<article class="drama" role="document"{{ with .Params.lang}} lang="{{ . }}"{{ end }}>
+    <header>
+        <h1 class="text-title">
+            {{ .Params.caption | default .Title }}
+        </h1>
+    </header>
+
+    <p class="byline">
+        {{ partial "post-meta/author.html" . }}
+    </p>
+
     {{ .Content }}
 </article>
 {{ end }}
diff --git a/layouts/narratives/single.html b/layouts/narratives/single.html
index e3dc1b9..c941bc2 100644
--- a/layouts/narratives/single.html
+++ b/layouts/narratives/single.html
@@ -1,7 +1,15 @@
 {{ define "main" }}
-<article class="narrative">
-    <h1 class="text-title">{{ .Params.caption | default .Title }}</h1>
-    {{ with .Params.author }}<p class="byline">{{ i18n "by" . }}</p>{{ end }}
+<article class="narrative" role="document"{{ with .Params.lang}} lang="{{ . }}"{{ end }}>
+    <header>
+        <h1 class="text-title">
+            {{ .Params.caption | default .Title }}
+        </h1>
+    </header>
+
+    <p class="byline">
+        {{ partial "post-meta/author.html" . }}
+    </p>
+
     {{ .Content }}
 </article>
 {{ end }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
index d31cbe7..fef0cf5 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -1,7 +1,11 @@
 {{ define "main" }}
-<article class="page" id="page-{{ .File.TranslationBaseName | lower }}">
-    <h1 class="page-title">{{ .Params.caption | default .Title }}</h1>
+<article class="page" role="document" id="page-{{ .File.TranslationBaseName | lower }}"{{ with .Params.lang}} lang="{{ . }}"{{ end }}>
+    <header>
+        <h1 class="page-title">
+            {{ .Params.caption | default .Title }}
+        </h1>
+    </header>
+
     {{ .Content }}
 </article>
 {{ end }}
-
diff --git a/layouts/partials/post-meta/author.html b/layouts/partials/post-meta/author.html
new file mode 100644
index 0000000..1b56004
--- /dev/null
+++ b/layouts/partials/post-meta/author.html
@@ -0,0 +1,3 @@
+{{ with .Params.author }}
+    <span class="author">{{ i18n "by" . }}</span>
+{{ end }}
diff --git a/layouts/partials/post-meta/date.html b/layouts/partials/post-meta/date.html
index 92401e7..04a814a 100644
--- a/layouts/partials/post-meta/date.html
+++ b/layouts/partials/post-meta/date.html
@@ -1,10 +1,11 @@
-{{- if not .Date.IsZero }}
-<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
-    {{- .Date | time.Format (site.Params.dateformat | default "January 02, 2006") -}}
-</time>
-{{- if ne .Date .Lastmod }}
-<time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">
-    ({{ i18n "updated_at" }} {{ .Lastmod | time.Format (site.Params.dateformat | default "January 02, 2006") -}})
-</time>
-{{- end -}}
-{{- end }}
+{{ if not .Date.IsZero }}
+    <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
+        {{ .Date | time.Format (site.Params.dateformat | default "January 02, 2006") }}
+    </time>
+
+    {{ if ne .Date .Lastmod }}
+        <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">
+            ({{ i18n "updated_at" }} {{ .Lastmod | time.Format (site.Params.dateformat | default "January 02, 2006") }})
+        </time>
+    {{ end }}
+{{ end }}
diff --git a/layouts/poems/single.html b/layouts/poems/single.html
index d61a185..58038d1 100644
--- a/layouts/poems/single.html
+++ b/layouts/poems/single.html
@@ -1,7 +1,15 @@
 {{ define "main" }}
-<article class="poem poetry">
-    <h1 class="text-title">{{ .Params.caption | default .Title }}</h1>
-    {{ with .Params.author }}<p class="byline">{{ i18n "by" . }}</p>{{ end }}
+<article class="poem poetry" role="document"{{ with .Params.lang}} lang="{{ . }}"{{ end }}>
+    <header>
+        <h1 class="text-title">
+            {{ .Params.caption | default .Title }}
+        </h1>
+    </header>
+
+    <p class="byline">
+        {{ partial "post-meta/author.html" . }}
+    </p>
+
     {{ .Content }}
 </article>
 {{ end }}