first article, safer pointers

4 files changed, 56 insertions, 3 deletions

diff --git a/zola/templates/base.html b/zola/templates/base.html
index 22a4728..d60212c 100644
--- a/zola/templates/base.html
+++ b/zola/templates/base.html
@@ -22,9 +22,9 @@
                                         <menu>
                                                 <li><a href="/">Home</a></li>
                                                 <li><a href="/articles">Articles</a></li>
+                                                <li><a href="/blog">Blog</a></li>
                                                 <li><a href="https://git.ndato.com/">Git</a></li>
                                                 <li><a href="/cv-dato.pdf">CV / Resume</a></li>
-                                                <li><a href="/contact">Contact</a></li>
                                         </menu>
                                 </nav>
                                 <header>Links</header>
diff --git a/zola/templates/section.html b/zola/templates/section.html
index 11e7e6a..71d3e06 100644
--- a/zola/templates/section.html
+++ b/zola/templates/section.html
@@ -4,7 +4,7 @@
 {% block header %}{{ section.title }}{% endblock %}
 {% block navigation %}
         {% for a in section.ancestors %}
-                {% set s = get_section(path=a) %}
+                {% set s = get_section(path=a) -%}
                 {% if loop.index != 1 %} &gt; {% endif %}<a href="{{ s.path | safe }}">{{ s.title }}</a>
         {% endfor %}
         &gt; <a href="{{ section.path | safe }}">{{ section.title }}</a>
@@ -16,7 +16,17 @@
         <p><a href="{{ page.path | safe}}">{{ page.title }}</a></p>
 </dt>
 <dd>
-        <p>{{ page.description }} <em><date datetime="{{ page.updated }}">{{ page.updated }}</date></em></p>
+        <p><em><date datetime="{{ page.date }}">{{ page.date }}</date></em>: {{ page.description }}</p>
+        <p>
+        {% for kind, values in page.taxonomies %}
+                {% set cat = get_taxonomy(kind=kind) -%}
+                <a href="{{ cat.permalink | safe }}">{{ kind }}</a>:
+                {% for v in values %}
+                        {% if loop.index != 1%}, {% endif %}<a href="{{ get_taxonomy_url(kind=kind, name=v) | safe }}">{{ v }}</a>
+                {% endfor %}
+                <br/>
+        {% endfor %}
+        </p>
 </dd>
 {% endfor %}
 </dl>
diff --git a/zola/templates/taxonomy_list.html b/zola/templates/taxonomy_list.html
new file mode 100644
index 0000000..4827853
--- /dev/null
+++ b/zola/templates/taxonomy_list.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block title %}{{ taxonomy.name }}{% endblock %}
+{% block header %}{{ taxonomy.name }}{% endblock %}
+{% block navigation %}<a href="/">Home</a> &gt; <a href="{{ current_path | safe }}">{{ taxonomy.name }}</a>{% endblock %}
+{% block content %}
+<dl title="List of {{ taxonomy.name }} entries">
+{% for term in terms %}
+<dt>
+        <p><a href="{{ term.path | safe}}">{{ term.name }}</a></p>
+</dt>
+{% endfor %}
+</dl>
+{% endblock %}
+
diff --git a/zola/templates/taxonomy_single.html b/zola/templates/taxonomy_single.html
new file mode 100644
index 0000000..d5641e5
--- /dev/null
+++ b/zola/templates/taxonomy_single.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block title %}{{ term.name }}{% endblock %}
+{% block header %}{{ term.name }}{% endblock %}
+{% block navigation %}<a href="/">Home</a> &gt; {{ taxonomy.name }} &gt; <a href="{{ current_path | safe }}">{{ term.name }}</a>{% endblock %}
+{% block content %}
+<dl title="List of {{ term.name }} entries">
+{% for page in term.pages %}
+<dt>
+        <p><a href="{{ page.path | safe}}">{{ page.title }}</a></p>
+</dt>
+<dd>
+        <p><em><date datetime="{{ page.date }}">{{ page.date }}</date></em>: {{ page.description }}</p>
+        <p>
+        {% for kind, values in page.taxonomies %}
+                {% set cat = get_taxonomy(kind=kind) -%}
+                <a href="{{ cat.permalink | safe }}">{{ kind }}</a>:
+                {% for v in values %}
+                        {% if loop.index != 1%}, {% endif %}<a href="{{ get_taxonomy_url(kind=kind, name=v) | safe }}">{{ v }}</a>
+                {% endfor %}
+                <br/>
+        {% endfor %}
+        </p>
+</dd>
+{% endfor %}
+</dl>
+{% endblock %}
+