Refactoring to fully take advantage of Make

3 files changed, 11 insertions, 18 deletions

diff --git a/templates/base.html b/templates/base.html
index cd1e869..a5d29b5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,14 +19,7 @@
         <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
     $endif$
 
-    $for(feeds)$
-        <link href="$it.url$" type="application/atom+xml" rel="alternate" title="$it.title$ – $site.title$" />
-    $endfor$
-    $if(feed)$
-        <link href="$feed.url.rel$" type="application/atom+xml" rel="alternate" title="$if(section.is_index)$$else$$title$ – $endif$$site.title$" />
-    $endif$
-
-    <title>$if(section.is_index)$$else$$title$ – $endif$$site.title$</title>
+    <title>$if(namespace.root.is_index)$$else$$title$ – $endif$$site.title$</title>
 
     <link rel="preload" href="/style.css" as="style" />
     <link rel="preload" href="/symbols.svg" as="image" type="image/svg+xml" />
@@ -46,7 +39,7 @@
                 </svg>
             </span>
         </a>
-        $if(section.is_index)$
+        $if(namespace.root.is_index)$
         $else$
             $for(menus.main.items)$
                 $if(it.active)$
@@ -61,7 +54,7 @@
     </nav>
         
     <main>
-        $if(section.is_index)$
+        $if(namespace.root.is_index)$
 ${layouts/index()}
         $elseif(layout.is_categorized_list)$
 ${layouts/categorized_list()}
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
index 6d4c776..45ac82e 100644
--- a/templates/layouts/index.html
+++ b/templates/layouts/index.html
@@ -59,13 +59,13 @@ $body$
                 </svg>
             </span>
             <span class="c-outer-button__content">
-                $subsections.projects.title$
+                $pages.by_id.projects.title$
             </span>
         </a>
     </header>
 
     <div class="l-container l-container--pad-x l-container--pad-y l-project-grid">
-        $for(subsections.projects.pages)$
+        $for(pages.by_id.projects.pages.all)$
             <a class="c-project" href="$it.url.rel$">
                 $if(it.preview)$
                     <img class="c-project__picture" src="$it.preview.rel$" />
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
index 2093f8c..f89a692 100644
--- a/templates/layouts/page.html
+++ b/templates/layouts/page.html
@@ -1,12 +1,12 @@
 <section class="l-section l-section--fullscreen l-section--no-head">
     <div class="l-container l-container--pad-x l-container--pad-y l-container--content s-colored-links s-headlines s-body">
-        <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
-
-        <div class="s-body__meta">
-            $if(category.show_date)$
+        $if(category.show_date)$
+            <div class="s-body__meta">
                 $date.long$
-            $endif$
-        </div>
+            </div>
+        $endif$
+
+        <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
 
 $body$
     </div>