From e3240a57eef6bf0afa193ae83ecd8c5cf627c72f Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Wed, 26 May 2021 08:54:19 +0200
Subject: Category list improvements, generate ATOM feeds

---
 templates/base.html                     |  4 +++
 templates/feed.xml                      | 50 +++++++++++----------------------
 templates/feed_entry.xml                | 30 ++++++++++++++++++++
 templates/layouts/categorized_list.html | 46 +++++++++++++++---------------
 4 files changed, 74 insertions(+), 56 deletions(-)
 create mode 100644 templates/feed_entry.xml

(limited to 'templates')

diff --git a/templates/base.html b/templates/base.html
index 5dc57e2..6c0c4a9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,6 +19,10 @@
         <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
     $endif$
 
+    $if(feed)$
+        <link href="$feed.url.rel$" type="application/atom+xml" rel="alternate" title="$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$" />
+    $endif$
+
     <title>$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$</title>
 
     <link rel="preload" href="/style.css?$style_hash$" as="style" />
diff --git a/templates/feed.xml b/templates/feed.xml
index a968205..ad665d2 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title>$if(section.is_index)$$else$$title$ – $endif$$site.title$</title>
-    <link href="$url.full$" rel="self"/>
-    <link href="$page.url.full$"/>
-    <updated>$pages.last_update.rfc3339$</updated>
-    <id>$url.full$</id>
+    <title>$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$</title>
+    <link href="$url.abs$" rel="self"/>
+    <link href="$page.url.abs$"/>
+    <updated>$last_update.rfc3339$</updated>
+    <id>$url.abs$</id>
     $for(author)$
         <author>
             <name>$it.name$</name>
@@ -14,33 +14,15 @@
         </author>
     $endfor$
 
-    $for(pages.all_dated)$
-        <entry>
-            <id>$it.url.full$</id>
-            <title type="html"><![CDATA[$it.title$]]></title>
-            $if(it.author)$
-                $for(it.author)$
-                    <author>
-                        <name>$it.name$</name>
-                        $if(it.email)$
-                            <email>$it.email$</email>
-                        $endif$
-                    </author>
-                $endfor$
-            $else$
-                $for(author)$
-                    <author>
-                        <name>$author.name$</name>
-                        $if(author.email)$
-                            <email>$author.email$</email>
-                        $endif$
-                    </author>
-                $endfor$
-            $endif$
-            <link href="$it.url.full$"/>
-            <published>$it.date.rfc3339$</published>
-            <updated>$it.last_update.rfc3339$</updated>
-            <content type="html"><![CDATA[$it.content$]]></content>
-        </entry>
-    $endfor$
+    $if(layout.is_categorized_list)$
+        $for(pages.all)$
+            $for(it.pages.all)$
+                $it:feed_entry()$
+            $endfor$
+        $endfor$
+    $else$
+        $for(pages.all)$
+            $it:feed_entry()$
+        $endfor$
+    $endif$
 </feed>
diff --git a/templates/feed_entry.xml b/templates/feed_entry.xml
new file mode 100644
index 0000000..f4c5d47
--- /dev/null
+++ b/templates/feed_entry.xml
@@ -0,0 +1,30 @@
+<entry>
+    <id>$it.url.abs$</id>
+    <title>$it.title$</title>
+    <link rel="alternate" href="$it.url.abs$"/>
+    $if(it.author)$
+        $for(it.author)$
+            <author>
+                <name>$it.name$</name>
+                $if(it.email)$
+                    <email>$it.email$</email>
+                $endif$
+            </author>
+        $endfor$
+    $else$
+        $for(author)$
+            <author>
+                <name>$author.name$</name>
+                $if(author.email)$
+                    <email>$author.email$</email>
+                $endif$
+            </author>
+        $endfor$
+    $endif$
+    $if(it.date)$
+        <published>$it.date.rfc3339$</published>
+    $endif$
+    $if(it.last_update)$
+        <updated>$it.last_update.rfc3339$</updated>
+    $endif$
+</entry>
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html
index 8f39229..6e72194 100644
--- a/templates/layouts/categorized_list.html
+++ b/templates/layouts/categorized_list.html
@@ -8,28 +8,30 @@ $body$
 
         <div class="c-post-list">
             $for(pages.all)$
-                <h2 class="c-post-list__category-header">
-                    $it.title$
-                </h2>
-                <div class="c-post-list__category-content">
-                    $for(it.pages.all)$
-                        <a href="$it.url.rel$" class="c-post-list__post c-card">
-                            <div class="c-card__content">
-                                $it.title$
-                            </div>
-                            $if(pages.all.show_dates)$
-                                <time datetime="$it.date.yyyy_mm_dd$" class="c-card__content u-fs0">
-                                    <small class="u-dn@sm-hi">
-                                        $it.date.short$
-                                    </small>
-                                    <small class="u-dn@sm-lo">
-                                        $it.date.long$
-                                    </small>
-                                </time>
-                            $endif$
-                        </a>
-                    $endfor$
-                </div>
+                $if(it.pages)$
+                    <h2 class="c-post-list__category-header">
+                        $it.title$
+                    </h2>
+                    <div class="c-post-list__category-content">
+                        $for(it.pages.all)$
+                            <a href="$it.url.rel$" class="c-post-list__post c-card">
+                                <div class="c-card__content">
+                                    $it.title$
+                                </div>
+                                $if(pages.all.show_dates)$
+                                    <time datetime="$it.date.yyyy_mm_dd$" class="c-card__content u-fs0">
+                                        <small class="u-dn@sm-hi">
+                                            $it.date.short$
+                                        </small>
+                                        <small class="u-dn@sm-lo">
+                                            $it.date.long$
+                                        </small>
+                                    </time>
+                                $endif$
+                            </a>
+                        $endfor$
+                    </div>
+                $endif$
             $endfor$
         </div>
     </div>
-- 
cgit v1.2.3-70-g09d2