Revert to old category metadata collection, add support for authors

3 files changed, 33 insertions, 6 deletions

diff --git a/templates/base.html b/templates/base.html
index 9574d08..4b8ea1e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex" />
     <link rel="shortcut icon" href="/favicon.ico" />
-    $for(author-meta)$
-        <meta name="author" content="$author-meta$" />
+    $for(author)$
+        <meta name="author" content="$it.name$$if(it.email)$ <$it.email$>$endif$" />
     $endfor$
     $if(date-meta)$
         <meta name="dcterms.date" content="$date-meta$" />
@@ -53,7 +53,7 @@ $body$
 
             $if(section.is_blog)$
                 $if(pages.not_empty)$
-                    ${categories.blog:categoryRef()}
+                    ${categoryRef()}
                     ${pagelistByYear()}
                 $endif$
             $endif$
diff --git a/templates/categoryRef.html b/templates/categoryRef.html
index 5715fa8..58dc5fe 100644
--- a/templates/categoryRef.html
+++ b/templates/categoryRef.html
@@ -1,7 +1,7 @@
-$if(it)$
+$if(categories)$
     <ul class="c-hlist">
-        $for(it/pairs)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
+        $for(categories)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
         $endfor$
     </ul>
 $endif$
diff --git a/templates/feed.xml b/templates/feed.xml
index 68d2fc4..f1439eb 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -5,6 +5,14 @@
     <link href="$url.full$"/>
     <updated>$feed.last_update.rfc3339$</updated>
     <id>$url.full$</id>
+    $for(author)$
+        <author>
+            <name>$it.name$</name>
+            $if(it.email)$
+                <email>$it.email$</email>
+            $endif$
+        </author>
+    $endfor$
 
     $for(pages)$
         $for(it.all)$
@@ -12,6 +20,25 @@
                 <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.date.rfc3339$</updated>