From 11de9b4c07d3f64860a06b8d45cdca718c03808c Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Fri, 9 Jun 2017 13:39:39 +0200
Subject: [PATCH] Update templates for new page sections

---
 blog/templates/index.html   | 35 +++++++++++++++++++++--------------
 blog/templates/macros.html  |  4 ----
 blog/templates/section.html |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/blog/templates/index.html b/blog/templates/index.html
index c09910f0..9007f96b 100644
--- a/blog/templates/index.html
+++ b/blog/templates/index.html
@@ -5,6 +5,7 @@
 {% block title %}{{ config.title }}{% endblock title %}
 
 {% block main %}
+{% set posts = sections.posts %}
 <div class="front-page-introduction">
     <p>
         This blog series creates a small operating system in the
@@ -13,39 +14,45 @@
         <a href="https://github.com/phil-opp/blog_os">Github repository</a>.
     </p>
     <p>Latest post:
-        <strong>{{ macros::latest_post_link(page=pages|reverse|last) }}</strong>
+        {% set latest_post = posts.pages|reverse|last %}
+        <strong><a href="{{ latest_post.path }}">{{ latest_post.title }}</a></strong>
     </p>
 </div>
 
 <div id="bare-bones" class="post-category bare-bones">Bare Bones</div>
 <div class="posts bare-bones">
-    {{ macros::post_link(page=pages.9) }}
-    {{ macros::post_link(page=pages.8) }}
-    {{ macros::post_link(page=pages.7) }}
-    {{ macros::post_link(page=pages.6) }}
+    {{ macros::post_link(page=posts.pages.9) }}
+    {{ macros::post_link(page=posts.pages.8) }}
+    {{ macros::post_link(page=posts.pages.7) }}
+    {{ macros::post_link(page=posts.pages.6) }}
 </div>
 
 <div id="memory-management" class="post-category memory-management">Memory Management</div>
 <div class="posts memory-management">
-    {{ macros::post_link(page=pages.5) }}
-    {{ macros::post_link(page=pages.4) }}
-    {{ macros::post_link(page=pages.3) }}
-    {{ macros::post_link(page=pages.2) }}
+    {{ macros::post_link(page=posts.pages.5) }}
+    {{ macros::post_link(page=posts.pages.4) }}
+    {{ macros::post_link(page=posts.pages.3) }}
+    {{ macros::post_link(page=posts.pages.2) }}
 </div>
 
 <div id="interrupts" class="post-category exceptions">Exceptions</div>
 <div class="posts exceptions">
-    {{ macros::post_link(page=pages.1) }}
-    {{ macros::post_link(page=pages.0) }}
+    {{ macros::post_link(page=posts.pages.1) }}
+    {{ macros::post_link(page=posts.pages.0) }}
 </div>
 
 <hr>
-<h1>Additional Resources</h1>
-
+{% set extra = sections.extra %}
+<h1>{{ extra.title }}</h1>
 <ul>
+    {% for subsection in extra.subsections|reverse %}
+        <li><a href="{{ subsection.path }}">{{ subsection.title }}</a></li>
+    {% endfor %}
+    {% for page in extra.pages|reverse %}
+        <li><a href="{{ page.path }}">{{ page.title }}</a></li>
+    {% endfor %}
 </ul>
 
-<hr>
 <aside id="recent-updates">
     <h1>Recent Updates</h1>
     TODO
diff --git a/blog/templates/macros.html b/blog/templates/macros.html
index cc953a62..7952f13f 100644
--- a/blog/templates/macros.html
+++ b/blog/templates/macros.html
@@ -4,7 +4,3 @@
         {{ page.summary | safe }}
     </article>
 {% endmacro post_link %}
-
-{% macro latest_post_link(page) %}
-    <a href="{{ page.path }}">{{ page.title }}</a>
-{% endmacro latest_post_link %}
diff --git a/blog/templates/section.html b/blog/templates/section.html
index 3b879148..455ab7e0 100644
--- a/blog/templates/section.html
+++ b/blog/templates/section.html
@@ -11,7 +11,7 @@
 {% block introduction %}{% endblock introduction %}
 
 <div class="posts neutral">
-    {% for page in section.pages %}
+    {% for page in section.pages|reverse %}
         {{ macros::post_link(page=page) }}
     {% endfor %}
 </div>