diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2014-10-15 10:45:58 +0100 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2014-10-15 18:40:45 +0100 |
| commit | 965c9e67ef6f79b9cf72a01da03222a66d632569 (patch) | |
| tree | 01de1b64ba61f01aa6f8c90c94392bc347ef8c7c /src | |
| parent | 7979369ccf314d72b83347e53ba6915f511c855e (diff) | |
| download | website-965c9e67ef6f79b9cf72a01da03222a66d632569.tar.xz | |
templates use header for h1, Entry renamed to Page
also merge build_about and build_index
Diffstat (limited to 'src')
| -rw-r--r-- | src/about.rst | 3 | ||||
| -rw-r--r-- | src/templates/journal.html | 5 | ||||
| -rw-r--r-- | src/templates/layout.html | 5 | ||||
| -rw-r--r-- | src/templates/page.html | 5 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/about.rst b/src/about.rst index c2d280e..07687e2 100644 --- a/src/about.rst +++ b/src/about.rst @@ -1,5 +1,6 @@ .. frontmatter - title: About me + title: ~/about + header: About me date: 2014-10-14 author: Johannes Löthberg diff --git a/src/templates/journal.html b/src/templates/journal.html index 0269d2e..9f301b1 100644 --- a/src/templates/journal.html +++ b/src/templates/journal.html @@ -1,11 +1,6 @@ {% extends 'layout.html' %} {% block content %} - <header> -{% include 'nav.html' %} - <h1>The lost journal</h1> - </header> - {% for entry in entries %} <article itemscope itemtype="http://schema.org/Article" class="entry" id="entry:{{ entry.id }}"> diff --git a/src/templates/layout.html b/src/templates/layout.html index 45ab99d..c91aa94 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -10,6 +10,11 @@ title="Johannes Löthberg <johannes@kyriasis.com>"> </head> <body itemscope itemtype="http://schema.org/WebPage"> +<header> +{% include 'nav.html' %} + <h1>{{ header }}</h1> +</header> + {% block content %}{% endblock %} <footer> <div id="foot-left"> diff --git a/src/templates/page.html b/src/templates/page.html index 9e0dddc..3c5d29a 100644 --- a/src/templates/page.html +++ b/src/templates/page.html @@ -1,11 +1,6 @@ {% extends 'layout.html' %} {% block content %} - <header> -{% include 'nav.html' %} - <h1>{{ page.title }}</h1> - </header> - <article id="{{ page.article_id }}" class="botborder" itemprop="mainContentOfPage"> {{ page.body }} |