make the page layout general enough to cover posts - also achieves more uniformity

diff --git a/_config.yml b/_config.yml
index 37a841026200dda256d9a233f24e479a16497fb0..bf82a60d55ce3e9db0d784dc22f3602d092fd83f 100644 (file)
--- 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 93977743ca14e8d7c13bcbc226864c8429bbff42..6858d0ab31b761865ba2dea72256694b81bd27ed 100644 (file)
--- 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 (file)
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 9f0119eb38a2340aa920351b6d23817a3d1e0f14..f6db232e05d46a3d9ead9416d03d451afae4c34a 100644 (file)
--- 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 %}