From 5ebbfe681929e6ef8ed54e32c3df5bd42a746c41 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Wed, 15 May 2024 00:58:54 -0400
Subject: [PATCH] cleanup active class generation

---
 .zs/active      |  3 +--
 .zs/layout.html | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.zs/active b/.zs/active
index 47ea8dc..f9b012c 100755
--- a/.zs/active
+++ b/.zs/active
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 # sets the 'active' class on an item if the url matches the directory
-urlpath=$(dirname "$ZS_URL")
-test "$1" = $urlpath && printf "active" || true
+if [ "$(dirname "$ZS_URL")" = $1 ]; then printf ' class=active' ''; fi
diff --git a/.zs/layout.html b/.zs/layout.html
index 9d37b6b..7ab9660 100644
--- a/.zs/layout.html
+++ b/.zs/layout.html
@@ -1,15 +1,19 @@
 <link href=/style.css rel=stylesheet />
 
-<nav>
-  <a href=jonathan.is>jonathan.is</a>
-  <menu>
-    <li class="{{ active writing }}"><a href=/writing  >/writing</a>
-    <li class="{{ active speaking }}"><a href=/speaking >/speaking</a>
-    <li class="{{ active coding }}"><a href=/coding   >/coding</a>
-    <li class="{{ active making }}"><a href=/making   >/making</a>
-    <li class="{{ active working }}"><a href=/working  >/working</a>
-    <li class="{{ active living }}"><a href=/living   >/living</a>
-  </menu>
-</nav>
+<header>
+  <nav>
+    <a href=/>jonathan.is</a>
+    <menu>
+      <li {{ active writing }}><a href=/writing>/writing</a>
+      <li {{ active speaking }}><a href=/speaking>/speaking</a>
+      <li {{ active coding }}><a href=/coding>/coding</a>
+      <li {{ active making }}><a href=/making>/making</a>
+      <li {{ active working }}><a href=/working>/working</a>
+      <li {{ active living }}><a href=/living>/living</a>
+    </menu>
+  </nav>
+</header>
 
+<main>
 {{ content }}
+</main>