From d56f51a2d3236e262a58b3c9cdaeebb30d4ee7a1 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 3 Jan 2021 15:03:49 +0100
Subject: [PATCH] Move macros

Each edition now has their own macros, so create a macros.html for the third edition too. Since the utterances theme differs between editions, we need to move it from snippets.html to the edition-specific macros.html too.
---
 blog/templates/edition-2/extra.html     |  4 +-
 blog/templates/edition-2/macros.html    | 47 +++++---------------
 blog/templates/edition-2/news-page.html | 25 +++++++++++
 blog/templates/edition-2/page.html      |  2 +-
 blog/templates/edition-3/extra.html     |  4 +-
 blog/templates/edition-3/index.html     |  7 +--
 blog/templates/edition-3/macros.html    | 58 +++++++++++++++++++++++++
 blog/templates/edition-3/page.html      |  7 +--
 blog/templates/news-page.html           | 26 +----------
 blog/templates/snippets.html            | 10 -----
 10 files changed, 107 insertions(+), 83 deletions(-)
 create mode 100644 blog/templates/edition-2/news-page.html
 create mode 100644 blog/templates/edition-3/macros.html

diff --git a/blog/templates/edition-2/extra.html b/blog/templates/edition-2/extra.html
index 93c98f59..c098e58c 100644
--- a/blog/templates/edition-2/extra.html
+++ b/blog/templates/edition-2/extra.html
@@ -1,6 +1,6 @@
 {% extends "edition-2/base.html" %}
 
-{% import "snippets.html" as snippets %}
+{% import "edition-2/macros.html" as macros %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -17,6 +17,6 @@
     <hr>
     <section>
         <h2>Comments</h2>
-        {{ snippets::utterances() }}
+        {{ macros::utterances() }}
     </section>
 {% endblock after_main %}
diff --git a/blog/templates/edition-2/macros.html b/blog/templates/edition-2/macros.html
index 1faf1bcd..77ffac7b 100644
--- a/blog/templates/edition-2/macros.html
+++ b/blog/templates/edition-2/macros.html
@@ -26,43 +26,6 @@
     </div>
 {% endmacro post_link %}
 
-{% macro post_link_edition_3(page) %}
-    <div>
-        {% set translations = page.translations | filter(attribute="lang", value=lang) -%}
-        {%- if translations -%}
-            {%- set post = get_page(path = translations.0.path) -%}
-        {%- else -%}
-            {%- set post = page -%}
-            {%- set not_translated = true -%}
-        {%- endif -%}
-        <h3 class="post-list-title"><a href="{{ post.path | safe }}">{{ post.title }}</a></h3>
-        <span class="post-list-icon">
-            {%- if post.extra.icon -%}{{post.extra.icon | safe}}{%- endif -%}
-        </span>
-        <div class="post-summary">
-            {{ post.summary | safe }}
-            <a class="read-more" href="{{ post.path | safe }}"><em>read&nbsp;more&nbsp;»</em></a>
-
-            {%- if lang and not_translated and lang != config.default_language -%}
-            <aside class="no-translation">
-                (This post is not translated yet.)
-            </aside>
-            {%- endif -%}
-        </div>
-    </div>
-{% endmacro post_link %}
-
-
-{% macro utterances_edition_3() %}
-    <script src="https://utteranc.es/client.js"
-        data-repo="phil-opp/blog_os"
-        data-issue-term="url"
-        data-label="comments"
-        crossorigin="anonymous"
-        theme="preferred-color-scheme"
-        async>
-    </script>
-{% endmacro utterances_edition_3 %}
 {% macro toc(toc) %}
     <details id = "toc-inline">
         <summary><b>Table of Contents</b></summary>
@@ -79,3 +42,13 @@
         </ul>
     </details>
 {% endmacro toc %}
+
+{% macro utterances() %}
+    <script src="https://utteranc.es/client.js"
+        data-repo="phil-opp/blog_os"
+        data-issue-term="url"
+        data-label="comments"
+        crossorigin="anonymous"
+        async>
+    </script>
+{% endmacro utterances %}
diff --git a/blog/templates/edition-2/news-page.html b/blog/templates/edition-2/news-page.html
new file mode 100644
index 00000000..bf6f59b2
--- /dev/null
+++ b/blog/templates/edition-2/news-page.html
@@ -0,0 +1,25 @@
+{% extends "edition-2/base.html" %}
+
+{% import "edition-2/macros.html" as macros %}
+
+{% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
+
+{% block main %}
+    <h1>{{ page.title }}</h1>
+    <time datetime="{{ page.date | date(format="%Y-%m-%d") }}" class="post-date">
+        {{ page.date | date(format="%b %d, %Y") }}
+        {% if page.extra.updated %} (updated on {{ page.extra.updated | date(format="%b %d, %Y") }}) {% endif %}
+    </time>
+    {{ page.content | safe }}
+{% endblock main %}
+
+{% block after_main %}
+    <hr>
+    <section>
+        <h2 id="comments">Comments</h2>
+        {{ macros::utterances() }}
+    </section>
+
+{% endblock after_main %}
+
+
diff --git a/blog/templates/edition-2/page.html b/blog/templates/edition-2/page.html
index 13a70d79..7ccfa1f2 100644
--- a/blog/templates/edition-2/page.html
+++ b/blog/templates/edition-2/page.html
@@ -99,7 +99,7 @@
         </p>
         {% endif %}
 
-        {{ snippets::utterances() }}
+        {{ macros::utterances() }}
     </section>
 
     <aside class="page-aside-right">
diff --git a/blog/templates/edition-3/extra.html b/blog/templates/edition-3/extra.html
index 7692188a..849689b4 100644
--- a/blog/templates/edition-3/extra.html
+++ b/blog/templates/edition-3/extra.html
@@ -1,6 +1,6 @@
 {% extends "edition-3/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -17,6 +17,6 @@
     <hr>
     <section>
         <h2>Comments</h2>
-        {{ macros::utterances() }}
+        {{ snippets::utterances() }}
     </section>
 {% endblock after_main %}
diff --git a/blog/templates/edition-3/index.html b/blog/templates/edition-3/index.html
index f89e380f..7414c022 100644
--- a/blog/templates/edition-3/index.html
+++ b/blog/templates/edition-3/index.html
@@ -1,6 +1,7 @@
 {% extends "edition-3/foundation.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-3/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ config.title }}{% endblock title %}
 
@@ -48,7 +49,7 @@
         <ul>
     {%- endif -%}
 
-    <li>{{ macros::post_link_edition_3(page=post) }}</li>
+    <li>{{ macros::post_link(page=post) }}</li>
 {%- endfor -%}
 </ul></div>
 
@@ -91,7 +92,7 @@
 
 <div class="">
     <h2>Support Me</h2>
-    {% include "support.html" %}
+    {{ snippets::support() }}
 </div>
 {% endblock main %}
 
diff --git a/blog/templates/edition-3/macros.html b/blog/templates/edition-3/macros.html
new file mode 100644
index 00000000..291b6da7
--- /dev/null
+++ b/blog/templates/edition-3/macros.html
@@ -0,0 +1,58 @@
+{% macro latest_post(posts) %}
+    {% set post = posts|last %}
+    <strong><a href="{{ post.path | safe }}">{{ post.title }}</a></strong>
+{% endmacro latest_post %}
+
+{% macro post_link(page) %}
+    <div>
+        {% set translations = page.translations | filter(attribute="lang", value=lang) -%}
+        {%- if translations -%}
+            {%- set post = get_page(path = translations.0.path) -%}
+        {%- else -%}
+            {%- set post = page -%}
+            {%- set not_translated = true -%}
+        {%- endif -%}
+        <h3 class="post-list-title"><a href="{{ post.path | safe }}">{{ post.title }}</a></h3>
+        <span class="post-list-icon">
+            {%- if post.extra.icon -%}{{post.extra.icon | safe}}{%- endif -%}
+        </span>
+        <div class="post-summary">
+            {{ post.summary | safe }}
+            <a class="read-more" href="{{ post.path | safe }}"><em>read&nbsp;more&nbsp;»</em></a>
+
+            {%- if lang and not_translated and lang != config.default_language -%}
+            <aside class="no-translation">
+                (This post is not translated yet.)
+            </aside>
+            {%- endif -%}
+        </div>
+    </div>
+{% endmacro post_link %}
+
+{% macro toc(toc) %}
+    <details id = "toc-inline">
+        <summary><b>Table of Contents</b></summary>
+        <ul>
+            {% for h2 in toc %}<li>
+                <a href="#{{h2.id | safe}}">{{ h2.title | safe }}</a>
+                {% if h2.children %}<ul>
+                    {% for h3 in h2.children %}<li>
+                        <a href="#{{h3.id | safe}}">{{ h3.title | safe }}</a>
+                    </li>{% endfor %}
+                </ul>{% endif %}
+            </li>{% endfor %}
+            <li class="toc-comments-link"><a href="#comments">Comments</a></li>
+        </ul>
+    </details>
+{% endmacro toc %}
+
+{% macro utterances() %}
+    <script src="https://utteranc.es/client.js"
+        data-repo="phil-opp/blog_os"
+        data-issue-term="url"
+        data-label="comments"
+        crossorigin="anonymous"
+        theme="preferred-color-scheme"
+        async>
+    </script>
+{% endmacro utterances %}
diff --git a/blog/templates/edition-3/page.html b/blog/templates/edition-3/page.html
index 35cd91be..51089de0 100644
--- a/blog/templates/edition-3/page.html
+++ b/blog/templates/edition-3/page.html
@@ -1,6 +1,7 @@
 {% extends "edition-3/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-3/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 {% block header %}
@@ -80,7 +81,7 @@
 
     <div class="post-footer-support">
         <h2>Support Me</h2>
-        {% include "support.html" %}
+        {{ snippets::support() }}
     </div>
 
     <hr>
@@ -103,7 +104,7 @@
         </p>
         {% endif %}
 
-        {{ macros::utterances_edition_3() }}
+        {{ macros::utterances() }}
     </section>
 
     <aside class="page-aside-right">
diff --git a/blog/templates/news-page.html b/blog/templates/news-page.html
index 0de7b67c..0ac4eb28 100644
--- a/blog/templates/news-page.html
+++ b/blog/templates/news-page.html
@@ -1,25 +1 @@
-{% extends "base.html" %}
-
-{% import "snippets.html" as snippets %}
-
-{% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
-
-{% block main %}
-    <h1>{{ page.title }}</h1>
-    <time datetime="{{ page.date | date(format="%Y-%m-%d") }}" class="post-date">
-        {{ page.date | date(format="%b %d, %Y") }}
-        {% if page.extra.updated %} (updated on {{ page.extra.updated | date(format="%b %d, %Y") }}) {% endif %}
-    </time>
-    {{ page.content | safe }}
-{% endblock main %}
-
-{% block after_main %}
-    <hr>
-    <section>
-        <h2 id="comments">Comments</h2>
-        {{ snippets::utterances() }}
-    </section>
-
-{% endblock after_main %}
-
-
+{% extends "edition-2/news-page.html" %}
diff --git a/blog/templates/snippets.html b/blog/templates/snippets.html
index d3057a32..e39465d7 100644
--- a/blog/templates/snippets.html
+++ b/blog/templates/snippets.html
@@ -9,13 +9,3 @@
     Thank you!
 </p>
 {% endmacro support %}
-
-{% macro utterances() %}
-    <script src="https://utteranc.es/client.js"
-        data-repo="phil-opp/blog_os"
-        data-issue-term="url"
-        data-label="comments"
-        crossorigin="anonymous"
-        async>
-    </script>
-{% endmacro utterances %}
\ No newline at end of file