From b8cd2d937eb0e305509d1ffc70a52315320541c8 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Wed, 15 Oct 2014 18:39:56 +0100 Subject: refactor bupa slightly, add isso comments on separate entry pages --- src/journal/1-hello-world.rst | 2 +- src/templates/entry.html | 37 +++++++++++++++++++++++++++++++++++++ src/templates/journal.html | 1 + src/templates/layout.html | 6 ++++-- src/templates/nav.html | 6 +++--- 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 src/templates/entry.html (limited to 'src') diff --git a/src/journal/1-hello-world.rst b/src/journal/1-hello-world.rst index a7f77bc..b5827a4 100644 --- a/src/journal/1-hello-world.rst +++ b/src/journal/1-hello-world.rst @@ -2,7 +2,7 @@ title: Hello, World date: 2014-10-14 author: Johannes Löthberg - author_link: about.html + author_link: /~kyrias/about.html I should probably write an entry some time. I’ve been thinking about what to write about for a while but I can’t really think of anything that I’d want people to read. (Not that I expect anyone to actually read this, eh…) Could write about what I’m doing and how I’m poking and prodding at this site maybe? Or maybe something related to LDAP, or setting up OpenSMTPD and Dovecot, or maybe bind, or even Kerberos… All of them could be useful for future reference for myself in either case I guess. diff --git a/src/templates/entry.html b/src/templates/entry.html new file mode 100644 index 0000000..1988537 --- /dev/null +++ b/src/templates/entry.html @@ -0,0 +1,37 @@ +{% extends 'layout.html' %} + +{% block head %} + +{% endblock head %} + +{% block content %} +

+ +

+ Published on + + {{ entry.date.strftime('%Y-%m-%d') }} + + + + {% if entry.author_link %} + by {{ entry.author }} + {% else %} + by {{ entry.author }} + {% endif %} + +

+ + {{ entry.body }} +

+ + +

+ +{% endblock content %} diff --git a/src/templates/journal.html b/src/templates/journal.html index 9f301b1..a4bef7f 100644 --- a/src/templates/journal.html +++ b/src/templates/journal.html @@ -20,6 +20,7 @@ by {{ entry.author }} {% endif %} + | comments {{ entry.body }} diff --git a/src/templates/layout.html b/src/templates/layout.html index c91aa94..3c9db2f 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -3,11 +3,13 @@ {{ title }} - + + +{% block head %}{% endblock %}

@@ -34,7 +36,7 @@ -

diff --git a/src/templates/nav.html b/src/templates/nav.html index e40b4ed..fddd9bc 100644 --- a/src/templates/nav.html +++ b/src/templates/nav.html @@ -1,7 +1,7 @@ -- cgit v1.2.3-54-g00ecf

{{ entry.title }}