From 82e7ac75954c973a5c59a02684788c0fb26e14dd Mon Sep 17 00:00:00 2001
From: Martin Ashby <martin@ashbysoft.com>
Date: Sat, 21 Dec 2024 22:18:18 +0000
Subject: Bump zine 0.3.0 -> 0.8.0 Fix a lot of associated breakage Fix broken
 rss.xml file as highlighted to me by Matthijs van der Wild (thanks!)

---
 layouts/list.shtml           | 10 +++++-----
 layouts/rss.xml              | 14 +++++++-------
 layouts/single.shtml         |  8 ++++----
 layouts/templates/main.shtml |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'layouts')

diff --git a/layouts/list.shtml b/layouts/list.shtml
index 758dc09..f48e992 100644
--- a/layouts/list.shtml
+++ b/layouts/list.shtml
@@ -1,11 +1,11 @@
 <extend template="main.shtml">
 <div id="main">
-  <h1 var="$page.title"></h1>
-  <p var="$page.content"></p>
-  <ul loop="$page.subpages()">
+  <h1 :text="$page.title"></h1>
+  <p :html="$page.content()"></p>
+  <ul :loop="$page.subpages()">
     <li>
-      <span class="date" var="$loop.it.date.format('2006/01/02')"></span>
-      <a href="$loop.it.link()" var="$loop.it.title"></a>
+      <span class="date" :text="$loop.it.date.format('2006/01/02')"></span>
+      <a href="$loop.it.link()" :text="$loop.it.title"></a>
     </li>
   </ul>
 </div>
\ No newline at end of file
diff --git a/layouts/rss.xml b/layouts/rss.xml
index 1023a18..838c747 100644
--- a/layouts/rss.xml
+++ b/layouts/rss.xml
@@ -8,13 +8,13 @@
     <language>en-gb</language>
     <lastBuildDate>Sun, 03 Mar 2024 19:31:27 +0000</lastBuildDate>
     <atom:link href="https://mfashby.net/index.xml" rel="self" type="application/rss+xml"/>
-    <item inline-loop="$page.subpages()">
-      <title var="$loop.it.title"></title>
-      <link var="$loop.it.link()"></link>
-      <pubDate var="$loop.it.date.formatHTTP()"></pubDate>
-      <guid isPermaLink="true" var="$loop.it.link()"></guid>
-      <description var="$loop.it.description"></description>
-      <content:encoded var="$loop.it.content"></content:encoded> <!-- This doesn't work, an empty tag is emitted -->
+    <item :loop="$page.subpages()">
+      <title :text="$loop.it.title"></title>
+      <link :text="$loop.it.link()"></link>
+      <pubDate :text="$loop.it.date.formatHTTP()"></pubDate>
+      <guid isPermaLink="true" :text="$loop.it.link()"></guid>
+      <description :text="$loop.it.description"></description>
+      <!-- <content:encoded :html="$loop.it.content()"></content:encoded> It doesn't work -->
     </item>
   </channel>
 </rss>
\ No newline at end of file
diff --git a/layouts/single.shtml b/layouts/single.shtml
index d689187..6ace547 100644
--- a/layouts/single.shtml
+++ b/layouts/single.shtml
@@ -1,15 +1,15 @@
 <extend template="main.shtml">
 <div id="main">
   <div class="article-meta">
-    <h1><span class="title" var="$page.title"></span></h1>
+    <h1><span class="title" :text="$page.title"></span></h1>
   </div>
-  <main var="$page.content"></main>
+  <main :html="$page.content()"></main>
   <footer>
     <div class="article-meta">
       <span class="author">Author
-        <span var="$page.author"></span></span><br>
+        <span :text="$page.author"></span></span><br>
       <span>Updated
-        <span class="date" var="$page.date.format('2006/01/02')"></span></span><br>
+        <span class="date" :text="$page.date.format('2006/01/02')"></span></span><br>
     </div>
   </footer>
 </div>
\ No newline at end of file
diff --git a/layouts/templates/main.shtml b/layouts/templates/main.shtml
index 7af8a0c..8f7784e 100644
--- a/layouts/templates/main.shtml
+++ b/layouts/templates/main.shtml
@@ -5,9 +5,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="author" content="$page.author">
     <meta name="description" content="$page.description">
-    <title var="$page.title.suffix('|', $site.title)"></title>
-    <link rel="stylesheet" href="/css/style.css">
-    <link rel="stylesheet" href="/css/fonts.css">
+    <title :text="$page.title.suffix('|', $site.title)"></title>
+    <link rel="stylesheet" href="$site.asset('css/style.css').link()">
+    <link rel="stylesheet" href="$site.asset('css/fonts.css').link()">
     <link rel="alternate" type="application/rss+xml" title="RSS" href="/index.xml">
   </head>
   <body>
@@ -24,7 +24,7 @@
       <super>
     </div>
     <footer>
-      <div if="$page.custom.get('comments', false)">
+      <div :if="$page.custom.getOr('comments', false)">
         <h2>comments</h2>
         <div style="visibility: hidden" id="comments">comments go here</div>
         <div style="visibility: hidden" id="comment_form">comment form goes here</div>
-- 
cgit v1.2.3-ZIG