5 files changed, 67 insertions, 44 deletions

diff --git a/templates/base.html b/templates/base.html
index 3fca9f1..0704388 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,24 +7,27 @@
     <meta name="robots" content="noindex" />
     <link rel="shortcut icon" href="/favicon.ico" />
     $for(author-meta)$
-    <meta name="author" content="$author-meta$" />
+        <meta name="author" content="$author-meta$" />
     $endfor$
     $if(date-meta)$
-    <meta name="dcterms.date" content="$date-meta$" />
+        <meta name="dcterms.date" content="$date-meta$" />
     $endif$
     $if(keywords)$
-    <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
+        <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
     $endif$
-    <title>$if(ishome)$$else$$title$ – $endif$$site.title$</title>
+    $if(feed.url.abs)$
+        <link href="$feed.url.abs$" type="application/atom+xml" rel="alternate" title="$if(is_home)$$else$$title$ – $endif$$site.title$" />
+    $endif$
+    <title>$if(is_home)$$else$$title$ – $endif$$site.title$</title>
     <link rel="stylesheet" href="/style.css" />
-    $if(section)$
-    <style>
-        .c-nav__item--$section$ {
-            border-color: var(--nav--item--active--fg);
-            color: var(--nav--item--active--fg);
-            font-weight: bold;
-        }
-    </style>
+    $if(section.id)$
+        <style>
+            .c-nav__item--$section.id$ {
+                border-color: var(--nav--item--active--fg);
+                color: var(--nav--item--active--fg);
+                font-weight: bold;
+            }
+        </style>
     $endif$
 </head>
 
@@ -33,14 +36,14 @@
         <div class="c-nav__items l-container">
             <a class="c-nav__logo" href="/" title="$site.title$">$site.logo$</a>
             $for(menus.main)$
-            <a class="c-nav__item c-nav__item--$it.id$" href="$it.url$">$it.label$</a>
+                <a class="c-nav__item c-nav__item--$it.id$" href="$it.url$">$it.label$</a>
             $endfor$
         </div>
     </nav>
         
     <main class="c-page s-page l-container l-container--content l-container--pad-v">
         <div class="c-page__content">
-            $if(ishome)$
+            $if(is_home)$
                 <header class="c-page-header u-hidden@sm-down" role="presentation">
 ${pageHeader()}
                 </header>
@@ -48,26 +51,26 @@ ${pageHeader()}
 
 $body$
 
-            $if(isblog)$
-            ${categoryRef()}
-            ${pagelistByYear()}
+            $if(section.is_blog)$
+                ${categories.blog:categoryRef()}
+                ${pagelistByYear()}
             $endif$
         </div>
     </main>
 
-    $if(ishome)$
-    <template id="header-sm">
+    $if(is_home)$
+        <template id="header-sm">
 ${pageHeaderSm()}
-    </template>
+        </template>
 
-    <script>
-        var headerEl = document.querySelector(".c-page-header");
-        var headerTemplateEl = document.getElementById("header-sm");
-        var headerSmEl = headerTemplateEl.content.cloneNode("true");
+        <script>
+            var headerEl = document.querySelector(".c-page-header");
+            var headerTemplateEl = document.getElementById("header-sm");
+            var headerSmEl = headerTemplateEl.content.cloneNode("true");
 
-        headerEl.classList.remove("u-hidden@sm-down");
-        headerEl.appendChild(headerSmEl);
-    </script>
+            headerEl.classList.remove("u-hidden@sm-down");
+            headerEl.appendChild(headerSmEl);
+        </script>
     $endif$
 </body>
 
diff --git a/templates/categoryRef.html b/templates/categoryRef.html
index 9a363cf..5715fa8 100644
--- a/templates/categoryRef.html
+++ b/templates/categoryRef.html
@@ -1,7 +1,7 @@
-$if(categories)$
-<ul class="c-hlist">
-    $for(categories)$
-    <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
-    $endfor$
-</ul>
+$if(it)$
+    <ul class="c-hlist">
+        $for(it/pairs)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value$</li>
+        $endfor$
+    </ul>
 $endif$
diff --git a/templates/feed.xml b/templates/feed.xml
new file mode 100644
index 0000000..68d2fc4
--- /dev/null
+++ b/templates/feed.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title>$if(is_home)$$else$$title$ – $endif$$site.title$</title>
+    <link href="$feed.url.full$" rel="self"/>
+    <link href="$url.full$"/>
+    <updated>$feed.last_update.rfc3339$</updated>
+    <id>$url.full$</id>
+
+    $for(pages)$
+        $for(it.all)$
+            $if(it.date.rfc3339)$
+                <entry>
+                    <id>$it.url.full$</id>
+                    <title type="html"><![CDATA[$it.title$]]></title>
+                    <link href="$it.url.full$"/>
+                    <published>$it.date.rfc3339$</published>
+                    <updated>$it.date.rfc3339$</updated>
+                </entry>
+            $endif$
+        $endfor$
+    $endfor$
+</feed>
diff --git a/templates/pageHeaderSm.html b/templates/pageHeaderSm.html
index 232b5b2..4db186c 100644
--- a/templates/pageHeaderSm.html
+++ b/templates/pageHeaderSm.html
@@ -3,7 +3,7 @@ $--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   '
 $-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
 $--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
 
-<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(ishome)$u-hidden@sm-up$endif$">
+<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(is_home)$u-hidden@sm-up$endif$">
 .|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
  |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
 '|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
diff --git a/templates/pagelistByYear.html b/templates/pagelistByYear.html
index b884d89..ff55f0f 100644
--- a/templates/pagelistByYear.html
+++ b/templates/pagelistByYear.html
@@ -1,13 +1,11 @@
 $for(pages)$
-$for(it.by_year)$
-$-- <hr class="c-spacer" />
-$-- <h2>$it.key$</h2>
-<ul>
-    $for(it.value)$
-    <li class="c-page__prefixed c-page__prefixed--ref">
-        <a href="$it.url_rel$">$it.category/uppercase$ $it.date$ - $it.title$</a>
-    </li>
+    $for(it.by_year)$
+        <ul>
+            $for(it.value)$
+                <li class="c-page__prefixed c-page__prefixed--ref">
+                    <a href="$it.url.rel$">$it.category/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
+                </li>
+            $endfor$
+        </ul>
     $endfor$
-</ul>
-$endfor$
 $endfor$