From d89404b8e1ead4a86d3e9e1eca94fae983df09f8 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 9 Oct 2015 20:11:11 +0200
Subject: [PATCH] start honoring baseurl again; crazy hackery to get
 page-dependent computed (pre)titles

---
 personal/_config.yml                    |  5 ++--
 personal/_includes/menu-level.html      |  2 +-
 personal/_includes/vars/blog-index.html |  1 +
 personal/_includes/vars/blog-page.html  |  1 +
 personal/_layouts/default.html          | 31 +++++++++++++++++++------
 personal/_layouts/page.html             | 17 --------------
 personal/_plugins/readmes.rb            |  2 +-
 personal/blog/archive.html              |  3 +--
 personal/blog/index.html                |  3 ++-
 9 files changed, 34 insertions(+), 31 deletions(-)
 create mode 100644 personal/_includes/vars/blog-index.html
 create mode 100644 personal/_includes/vars/blog-page.html
 delete mode 100644 personal/_layouts/page.html

diff --git a/personal/_config.yml b/personal/_config.yml
index bf82a60..e5d9a01 100644
--- a/personal/_config.yml
+++ b/personal/_config.yml
@@ -1,4 +1,5 @@
 # Site settings
+baseurl: ""
 url: "https://www.ralfj.de"
 permalink: "/blog/:year/:month/:day/:title.html"
 timezone: "Europe/Berlin"
@@ -23,13 +24,13 @@ defaults:
   - scope:
         path: "" # all files in the project
     values:
-        layout: "page"
+        layout: "default"
   - scope:
         path: ""
         type: "posts"
     values:
         rss: true
-        pretitle: "Ralf's Ramblings"
+        vars: "blog-page.html"
 
 # Build settings
 markdown: kramdown
diff --git a/personal/_includes/menu-level.html b/personal/_includes/menu-level.html
index 03cdc13..7e4e5ef 100644
--- a/personal/_includes/menu-level.html
+++ b/personal/_includes/menu-level.html
@@ -1,5 +1,5 @@
 <ul><!--{% for item in include.menu %}
-    --><li class="{{ item.class }}"><a class="{{ item.class }}" href="{% if page.absolute_urls %}{{ site.url }}{% endif %}{{ item.url }}">{{ item.title }}</a></li><!--
+    --><li class="{{ item.class }}"><a class="{{ item.class }}" href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a></li><!--
     {% if item.sub %}
         --><li class="sub">{% include menu-level.html menu=item.sub %}</li><!--
     {% endif %}
diff --git a/personal/_includes/vars/blog-index.html b/personal/_includes/vars/blog-index.html
new file mode 100644
index 0000000..e738b23
--- /dev/null
+++ b/personal/_includes/vars/blog-index.html
@@ -0,0 +1 @@
+{% assign title = site.blog.title %}
diff --git a/personal/_includes/vars/blog-page.html b/personal/_includes/vars/blog-page.html
new file mode 100644
index 0000000..a16df5a
--- /dev/null
+++ b/personal/_includes/vars/blog-page.html
@@ -0,0 +1 @@
+{% assign pretitle = site.blog.title %}
diff --git a/personal/_layouts/default.html b/personal/_layouts/default.html
index 5d27d6c..797739c 100644
--- a/personal/_layouts/default.html
+++ b/personal/_layouts/default.html
@@ -5,13 +5,16 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
 
-    <title>{% if page.pretitle %}{{ page.pretitle }} • {% endif %}{{ page.title }}</title>
-    {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
+    {% assign title = page.title %}
+    {% assign pretitle = page.pretitle %}
+    {% if page.vars %}{% include {{ page.vars | prepend: "vars/" }} %}{% endif %}
 
-    <link rel="stylesheet" href="{% if page.absolute_urls %}{{ site.url }}{% endif %}/style.css">
-    {% capture canonicalurl %}{{ page.url | replace:'index.html','' }}{% endcapture %}
-    <link rel="canonical" href="{{ canonicalurl | prepend: site.url }}">
-    {% if page.rss %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="/blog/feed.xml" />{% endif %}
+    <title>{% if pretitle %}{{ pretitle }} • {% endif %}{{ title }}</title>
+    {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | newline_to_br | replace:'<br />',' ' | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
+
+    <link rel="stylesheet" href="{{ site.baseurl }}/style.css">
+    <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url | replace:'index.html','' }}">
+    {% if page.rss %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="{{ site.baseurl }}/blog/feed.xml" />{% endif %}
   </head>
 
   <body><div id="-frame">
@@ -22,7 +25,21 @@
     </nav>
   
     <article id="-content">
-        {{ content }}
+      {% comment %} Unfortunately, the variables we set above are not preserved for sub-layouts. So, we have to have all the layout here. {% endcomment %}
+      {% if pretitle %}
+        <header class="pretitle">
+          {% if page.date %}
+            <div class="side"><a href="{{ site.baseurl }}{{ 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>{{ pretitle }}</h1>
+        </header>
+      {% endif %}
+
+      <header class="title">
+        <h1>{{ title }}</h1>
+      </header>
+
+      {{ content }}
     </article>
 
   </div></body>
diff --git a/personal/_layouts/page.html b/personal/_layouts/page.html
deleted file mode 100644
index 99737e0..0000000
--- a/personal/_layouts/page.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
----
-{% if page.pretitle %}
-<header class="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 class="title">
-  <h1>{{ page.title }}</h1>
-</header>
-
-{{ content }}
diff --git a/personal/_plugins/readmes.rb b/personal/_plugins/readmes.rb
index f702589..4360d76 100644
--- a/personal/_plugins/readmes.rb
+++ b/personal/_plugins/readmes.rb
@@ -12,7 +12,7 @@ module Jekyll
       
       content = File.read(src, self.merged_file_read_opts({})).each_line.to_a
 
-      self.data['layout'] = 'page'
+      self.data['layout'] = 'default'
       self.data['title'] = content[0].match(/^#* ?(.*)\n$/)[1]
       slug = self.data['title'].match(/^([^:]*):.*$/)
       if slug
diff --git a/personal/blog/archive.html b/personal/blog/archive.html
index f6db232..e867f3f 100644
--- a/personal/blog/archive.html
+++ b/personal/blog/archive.html
@@ -1,11 +1,10 @@
 ---
 title: Archive
-pretitle: "Ralf's Ramblings"
+vars: blog-page.html
 rss: true
 sort: 1
 hide: true
 ---
-
 <p>Here you can find direct links to all my blog posts.</p>
 
   <ul class="post-list">
diff --git a/personal/blog/index.html b/personal/blog/index.html
index 70032ce..99724ea 100644
--- a/personal/blog/index.html
+++ b/personal/blog/index.html
@@ -1,7 +1,8 @@
 ---
-title: "Ralf's Ramblings"
+vars: blog-index.html
 slug: Blog
 rss: true
+sort: 10
 ---
 
 {% assign num_posts = 5 %}
-- 
2.30.2