From 1a857cbafd109a6377bacb55830281bb7d0aaae1 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Fri, 5 Aug 2022 19:38:37 -0400
Subject: [PATCH] Add absolute_url macro to navigation links

---
 templates/navigation-about.tpl.html      | 15 ++++++++-------
 templates/navigation-contribute.tpl.html | 13 +++++++------
 templates/navigation-get-shows.tpl.html  | 13 +++++++------
 templates/navigation-give-shows.tpl.html | 17 +++++++++--------
 templates/navigation-main.tpl.html       | 15 ++++++++-------
 5 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/templates/navigation-about.tpl.html b/templates/navigation-about.tpl.html
index 50478fc..f93c4c4 100644
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@@ -1,9 +1,10 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="index.html"><strong>Home</a></li>
-			<li><a href="about.html">About »</strong></a></li>
-			<li><a href="correspondents/index.html">Hosts</a></li>
-			<li><a href="contact.html">Contact</a></li>
-			<li><a href="promote.html">Promote HPR</a></li>
-			<li><a href="/comments_viewer.php">Show Comments</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About »</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contact.html">Contact</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->promote.html">Promote HPR</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->comments_viewer.php">Show Comments</a></li>
 		</ul>
diff --git a/templates/navigation-contribute.tpl.html b/templates/navigation-contribute.tpl.html
index dbb75d7..63c6edf 100644
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,8 +1,9 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.html"><strong>Home</a></li>
-			<li><a href="/help_out.html">Contribute »</strong></a></li>
-			<li><a href="/contribute.html">Submit Show</a></li>
-			<li><a href="/report_missing_tags.html">Fix Tags</a></li>
-			<li><a href="/requested_topics.html">Topics</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute »</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->report_missing_tags.html">Fix Tags</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a></li>
 		</ul>
diff --git a/templates/navigation-get-shows.tpl.html b/templates/navigation-get-shows.tpl.html
index b99283a..02eae9b 100644
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@@ -1,8 +1,9 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.html"><strong>Home</strong></a></li>
-			<li><a href="/syndication.html"><strong>Get Shows »</strong></a></li>
-			<li><a href="/index_full.html">Full Episode Guide</a></li>
-			<li><a href="/series/index.html">In-Depth Series</a></li>
-			<li><a href="/download.php">Download Options</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html"><strong>Get Shows »</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index_full.html">Full Episode Guide</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->series/index.html">In-Depth Series</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->download.php">Download Options</a></li>
 		</ul>
diff --git a/templates/navigation-give-shows.tpl.html b/templates/navigation-give-shows.tpl.html
index 71cc8ca..7494373 100644
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,10 +1,11 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.html"><strong>Home</a></li>
-			<li><a href="/contribute.html">Give Shows »</strong></a>
-			<li><a href="/stuff_you_need_to_know.html">Info</a></li>
-			<li><a href="/theme.html">Theme</a></li>
-			<li><a href="/requested_topics.html">Topics</a></li>
-			<li><a href="/recording.html">Recording</a></li>
-			<li><a href="/request_a_slot.php">Scheduling</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows »</strong></a>
+			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->theme.html">Theme</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->recording.html">Recording</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->request_a_slot.php">Scheduling</a></li>
 		</ul>
diff --git a/templates/navigation-main.tpl.html b/templates/navigation-main.tpl.html
index 4a307fe..34d8193 100644
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -1,10 +1,11 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>	
 			<li><a href="calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="index.html"><strong>Home »</strong></a></li>
-			<li><a href="syndication.html">Get Shows</a></li>
-			<li><a href="contribute.html">Give Shows</a></li>
-			<li><a href="help_out.html">Contribute</a></li>
-			<li><a href="tags.html">Tags</a></li>
-			<li><a href="about.html">About</a></li>
-			<li><a href="search.html">Search</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home »</strong></a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->tags.html">Tags</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a></li>
 		</ul>