From fa3dcbf5358c14fd8f8dcf5a39e43ae0062944ea Mon Sep 17 00:00:00 2001
From: budparr <budparr@gmail.com>
Date: Mon, 09 Apr 2018 14:04:19 +0000
Subject: [PATCH] Improve layout structure so users don't have to name posts "post"

---
 layouts/_default/single.html |   35 +++++++++++------
 /dev/null                    |   30 ---------------
 layouts/page/single.html     |   18 +++++++++
 3 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1c74584..bdfec7d 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,21 +1,30 @@
-{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
+{{ define "header" }}
+   {{/* We can override any block in the baseof file be defining it in the template */}}
+  {{ partial "page-header.html" . }}
+{{ end }}
+
 {{ define "main" }}
   <div class="flex-l mt2 mw8 center">
     <article class="center cf pv5 ph3 ph4-ns mw7">
-      <header>
-        <p class="f6 b helvetica tracked">
-          {{ humanize .Section | upper  }}
-        </p>
-        <h1 class="f1">
-          {{ .Title }}
-        </h1>
-      </header>
-      <div class="nested-copy-line-height lh-copy f4 nested-links nested-img mid-gray">
+      <p class="f6 b helvetica tracked">
+        {{/* Humanize removes hyphens and capitalizes the first word */}}
+        {{ humanize .Section | upper  }}
+      </p>
+      <h1 class="f1 athelas">
+        {{ .Title }}
+      </h1>
+        {{/* TODO: Add Hugo author  */}}
+        {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}}
+      <time class="f6 mv4 dib tracked" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
+        {{ .Date.Format "January 2, 2006" }}
+      </time>
+      <section class="nested-copy-line-height lh-copy serif f4 nested-links nested-img mid-gray">
         {{ .Content }}
-      </div>
+      </section>
+      {{ partial "tags.html" . }}
     </article>
-    <aside class="ph3 mt2 mt6-ns">
+    <div class="ph3 mt2 mt6-ns">
       {{ partial "menu-contextual.html" . }}
-    </aside>
+    </div>
   </div>
 {{ end }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
new file mode 100644
index 0000000..6a3df88
--- /dev/null
+++ b/layouts/page/single.html
@@ -0,0 +1,18 @@
+{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
+{{ define "main" }}
+  <div class="flex-l mt2 mw8 center">
+    <article class="center cf pv5 ph3 ph4-ns mw7">
+      <header>
+        <p class="f6 b helvetica tracked">this is the page temp
+          {{ humanize .Section | upper  }}
+        </p>
+        <h1 class="f1">
+          {{ .Title }}
+        </h1>
+      </header>
+      <div class="nested-copy-line-height lh-copy f4 nested-links nested-img mid-gray">
+        {{ .Content }}
+      </div>
+    </article>
+  </div>
+{{ end }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
deleted file mode 100644
index bdfec7d..0000000
--- a/layouts/post/single.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{{ define "header" }}
-   {{/* We can override any block in the baseof file be defining it in the template */}}
-  {{ partial "page-header.html" . }}
-{{ end }}
-
-{{ define "main" }}
-  <div class="flex-l mt2 mw8 center">
-    <article class="center cf pv5 ph3 ph4-ns mw7">
-      <p class="f6 b helvetica tracked">
-        {{/* Humanize removes hyphens and capitalizes the first word */}}
-        {{ humanize .Section | upper  }}
-      </p>
-      <h1 class="f1 athelas">
-        {{ .Title }}
-      </h1>
-        {{/* TODO: Add Hugo author  */}}
-        {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}}
-      <time class="f6 mv4 dib tracked" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
-        {{ .Date.Format "January 2, 2006" }}
-      </time>
-      <section class="nested-copy-line-height lh-copy serif f4 nested-links nested-img mid-gray">
-        {{ .Content }}
-      </section>
-      {{ partial "tags.html" . }}
-    </article>
-    <div class="ph3 mt2 mt6-ns">
-      {{ partial "menu-contextual.html" . }}
-    </div>
-  </div>
-{{ end }}

--
Gitblit v1.10.0