Fix 2nd edition template errors accidentally introduced by merge

blog/templates/edition-2/extra.html

@@ -1,6 +1,6 @@
 {% extends "edition-2/base.html" %}
 
-{% import "edition-2/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 

blog/templates/edition-2/macros.html

@@ -43,12 +43,3 @@
     </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 %}

blog/templates/edition-2/news-page.html

@@ -1,6 +1,6 @@
 {% extends "edition-2/base.html" %}
 
-{% import "edition-2/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -17,7 +17,7 @@
     <hr>
     <section>
         <h2 id="comments">Comments</h2>
-        {{ macros::utterances() }}
+        {{ snippets::giscus(search_term=page.title ~ " (News Post)") }}
     </section>
 
 {% endblock after_main %}

blog/templates/snippets.html

@@ -25,6 +25,7 @@
     <div class="giscus"></div>
 
     <script src="https://giscus.app/client.js"
+        data-repo="phil-opp/blog_os"
         data-repo-id="MDEwOlJlcG9zaXRvcnkzOTU3NTEwMQ=="
         data-category="Post Comments"
         data-category-id="MDE4OkRpc2N1c3Npb25DYXRlZ29yeTMzMDE4OTg1"
@@ -37,6 +38,9 @@
         data-reactions-enabled="1"
         data-emit-metadata="1"
         data-theme="preferred_color_scheme"
+        crossorigin="anonymous"
+        async>
+    </script>
 
     <p class="comment-directly-on-github">
         Instead of authenticating the <a href="https://giscus.app">giscus</a> application, you can also comment directly <a href="{{ discussion_url | safe }}"><em>on GitHub</em></a>.

blog/templates/status-update-page.html

@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% import "snippets.html" as snippets %}
+
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
 {% block main %}
@@ -27,6 +29,10 @@
             <a class="next" href="{{ page.later.path | safe }}">{{ page.later.title }} &raquo;</a>
         {% endif %}
     </div>
+    <hr>
+    <section>
+        <h2 id="comments">Comments</h2>
         {{ snippets::giscus(search_term=page.title) }}
+    </section>
 
 {% endblock after_main %}