Improved general structure, resolve category name in metadata filter, added hideable nav items, added header for page layout

7 files changed, 63 insertions, 52 deletions

diff --git a/templates/base.html b/templates/base.html
index b4a2953..da3dec9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,33 +45,14 @@
     <main class="c-page s-page l-container l-container--content l-container--pad-v">
         <div class="c-page__content">
             $if(section.is_index)$
-                <header class="c-page-header u-hidden@sm-down" role="presentation">
-${partials/pageHeader()}
-                </header>
-
-${page()}
-            $elseif(pages)$
-${list()}
+${layouts/index()}
+            $elseif(layout.is_dated_list)$
+${layouts/dated_list()}
             $else$
-${page()}
+${layouts/page()}
             $endif$
         </div>
     </main>
-
-    $if(section.is_index)$
-        <template id="header-sm">
-${partials/pageHeaderSm()}
-        </template>
-
-        <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>
-    $endif$
 </body>
 
 </html>
diff --git a/templates/list.html b/templates/layouts/dated_list.html
index d74681c..0a279f0 100644
--- a/templates/list.html
+++ b/templates/layouts/dated_list.html
@@ -1,3 +1,5 @@
+<h1 class="c-page__prefixed c-page__prefixed--h1">$title$</h1>
+
 $body$
 
 $if(categories)$
@@ -12,7 +14,7 @@ $for(pages.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>
+                <a href="$it.url.rel$">$it.category.id/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
             </li>
         $endfor$
     </ul>
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
new file mode 100644
index 0000000..144d1ed
--- /dev/null
+++ b/templates/layouts/index.html
@@ -0,0 +1,44 @@
+<header class="c-hero u-hidden@sm-down" role="presentation">
+    $-- ' |      '     '             '     '            '   | |    |           '     '
+    $--   |      '     '             '       //\_       '   | ' .  |           '     '
+    $--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
+    $--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
+    $-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
+    $--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
+    $-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
+    $-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+        
+    <pre class="c-hero__pre c-page__prefixed c-page__prefixed--pre u-mt0 u-hidden@sm-down">
+' |      '     '             '     '            '   | |    |           '     '  
+  |      '     '             '       <strong>//\_</strong>       '   | ' .  |           '     '  
+ .|      '      <strong>____,...,______..,_~``  -`..,</strong>   '   |    ' |           '     '  
+  |       <strong>_,~´"'  ,               .    ,~--´</strong>    '  _|  | . |~~.__      '     '  
+| |    <strong>,-"    _.-|~/  |..,____,) ,/,,"'</strong>         '_( | '    |)    )     '     '  
+ '|    <strong>\__,~"´   /:) /       |:\ \</strong>            ,~(    ) . | |  )   `,   '   _,--.
+   \   .   :    <strong>(:/\_-,      \:.\_-,</strong>    .  \ .\      .  :   \  .   ) . ' ,/     </pre>
+
+</header>
+
+$body$
+
+<template id="header-sm">
+    $-- .|                     //\__      '  .'      |  . |           ' . ' 
+    $--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
+    $-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
+    $--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
+
+    <pre class="c-hero__pre c-page__prefixed c-page__prefixed--pre u-mt0 $if(section.is_index)$u-hidden@sm-up$endif$">
+.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
+ |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
+'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
+ |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>
+</template>
+
+<script>
+    var headerEl = document.querySelector(".c-hero");
+    var headerTemplateEl = document.getElementById("header-sm");
+    var headerSmEl = headerTemplateEl.content.cloneNode("true");
+
+    headerEl.classList.remove("u-hidden@sm-down");
+    headerEl.appendChild(headerSmEl);
+</script>
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
new file mode 100644
index 0000000..332a846
--- /dev/null
+++ b/templates/layouts/page.html
@@ -0,0 +1,12 @@
+<header class="c-page__header">
+    <h1 class="c-page__prefixed c-page__prefixed--h1 c-page__header__title">$title$</h1>
+    $if(date)$
+        <h2 class="c-page__header__meta">$date.yyyy_mm_dd$$if(category)$ in $category.name$$endif$</h2>
+    $elseif(category)$
+        <h2 class="c-page__header__meta">in $category.name$</h2>
+    $endif$
+</header>
+
+<section>
+$body$
+</section>
diff --git a/templates/page.html b/templates/page.html
deleted file mode 100644
index 36d66c2..0000000
--- a/templates/page.html
+++ /dev/null
@@ -1 +0,0 @@
-$body$
diff --git a/templates/partials/pageHeader.html b/templates/partials/pageHeader.html
deleted file mode 100644
index 95e55f7..0000000
--- a/templates/partials/pageHeader.html
+++ /dev/null
@@ -1,17 +0,0 @@
-$-- ' |      '     '             '     '            '   | |    |           '     '
-$--   |      '     '             '       //\_       '   | ' .  |           '     '
-$--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
-$--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
-$-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
-$--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
-$-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
-$-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-
-<pre class="c-page-header__pre c-page__prefixed c-page__prefixed--pre u-mt0 u-hidden@sm-down">
-' |      '     '             '     '            '   | |    |           '     '  
-  |      '     '             '       <strong>//\_</strong>       '   | ' .  |           '     '  
- .|      '      <strong>____,...,______..,_~``  -`..,</strong>   '   |    ' |           '     '  
-  |       <strong>_,~´"'  ,               .    ,~--´</strong>    '  _|  | . |~~.__      '     '  
-| |    <strong>,-"    _.-|~/  |..,____,) ,/,,"'</strong>         '_( | '    |)    )     '     '  
- '|    <strong>\__,~"´   /:) /       |:\ \</strong>            ,~(    ) . | |  )   `,   '   _,--.
-   \   .   :    <strong>(:/\_-,      \:.\_-,</strong>    .  \ .\      .  :   \  .   ) . ' ,/     </pre>
diff --git a/templates/partials/pageHeaderSm.html b/templates/partials/pageHeaderSm.html
deleted file mode 100644
index 92359fa..0000000
--- a/templates/partials/pageHeaderSm.html
+++ /dev/null
@@ -1,10 +0,0 @@
-$-- .|                     //\__      '  .'      |  . |           ' . ' 
-$--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
-$-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
-$--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
-
-<pre class="c-page-header__pre c-page__prefixed c-page__prefixed--pre u-mt0 $if(section.is_index)$u-hidden@sm-up$endif$">
-.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
- |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
-'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
- |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>