From 74e56ceacc1bd3a3b967d40c91df88f3c6d7faf9 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 8 Oct 2015 22:27:09 +0200
Subject: [PATCH] make the page layout general enough to cover posts - also
 achieves more uniformity

---
 _config.yml        |  3 ++-
 _layouts/page.html |  9 +++++++++
 _layouts/post.html | 17 -----------------
 blog/archive.html  |  6 +++---
 4 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 _layouts/post.html

diff --git a/_config.yml b/_config.yml
index 37a8410..bf82a60 100644
--- a/_config.yml
+++ b/_config.yml
@@ -28,7 +28,8 @@ defaults:
         path: ""
         type: "posts"
     values:
-        layout: "post"
+        rss: true
+        pretitle: "Ralf's Ramblings"
 
 # Build settings
 markdown: kramdown
diff --git a/_layouts/page.html b/_layouts/page.html
index 9397774..6858d0a 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,6 +1,15 @@
 ---
 layout: default
 ---
+{% if page.pretitle %}
+<header id="-pretitle">
+  {% if page.date %}
+    <div class="side"><a href="{{ page.url }}">Permalink</a> • {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</div>
+  {% endif %}
+  <h1>{{ page.pretitle }}</h1>
+</header>
+{% endif %}
+
 <header id="-title">
   <h1>{{ page.title }}</h1>
 </header>
diff --git a/_layouts/post.html b/_layouts/post.html
deleted file mode 100644
index d6500b9..0000000
--- a/_layouts/post.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
-pretitle: "Ralf's Ramblings"
-rss: true
----
-<header id="-pretitle">
-  <div class="side"><a href="{{ page.url }}">Permalink</a> • {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</div>
-  <h1>{{ page.pretitle }}</h1>
-</header>
-
-<header id="-title">
-  <h1>{{ page.title }}</h1>
-</header>
-
-
-{{ content }}
-
diff --git a/blog/archive.html b/blog/archive.html
index 9f0119e..f6db232 100644
--- a/blog/archive.html
+++ b/blog/archive.html
@@ -1,12 +1,12 @@
 ---
-title: "Ralf's Ramblings: Archive"
-slug: Archive
+title: Archive
+pretitle: "Ralf's Ramblings"
 rss: true
 sort: 1
 hide: true
 ---
 
-<p>Here you can find all my blog posts.</p>
+<p>Here you can find direct links to all my blog posts.</p>
 
   <ul class="post-list">
     {% for post in site.posts %}
-- 
2.30.2