Merge branch 'newsite' of repo.anhonesthost.net:HPR/hpr_generator into newsite

Move styles closer to new design displayed on hobbypublicradio.org.

GETTING_STARTED.md

@@ -111,7 +111,7 @@ file are found in the comments within the file.
 
 Any database supported by the Perl:DBI and Perl::DBD modules can be used with 
 the site-generator program. Currently the hpr_generator project works with 
-an SQLite database.
+a MySQL or SQLite database.
 
 Find the [DBI] section of the file. It should look like the following
 
@@ -146,6 +146,26 @@ The hpr.db section of the driver option `dbi:SQLite:hpr.db` is the path
 to the sqlite file. The default assumes the hpr.db file is located in the same
 directory as the site-generator. 
 
+### MySQL
+
+Remove the comment character from the start of the database, driver, 
+user, and password option lines:
+
+ ```
+# Configuration settings for MySQL
+database: mysql
+driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
+user: hpr-generator
+password: *********
+```
+
+This assumes that the MySQL database service is available at the localhost 
+hostname, that the database name (hpr_hpr) is the database created from 
+the hpr.sql dump file or manually created by you, that the user (hpr-generator) 
+was added by you and has read rights to the hpr_hpr database, and that the 
+password (replace ********* with the actual password) matches the password set 
+for the hpr-generator database user.
+
 ## Configuring the website for viewing locally
 
 For HTML links to work when viewing the files on your local machine using the 

README.md

@@ -15,6 +15,15 @@ Static web page generator for the Hacker Public Radio website.
 		2.  Run `./utils/update-hpr.sh`
 	* SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries. Must convert WITH
 	  clauses to sub-queries when using earlier versions of SQLite.
+* With MySQL
+	* Create database hpr_hpr in the MySQL server from HPR dump file.
+		- ``sudo mysql --host=localhost < hpr.sql``
+	* Create a user that will be used by the site-generator.
+		- Suggested username: hpr-generator
+		- ``CREATE USER 'hpr-generator'@'localhost' IDENTIFIED BY '<password>';``
+	* Limit the user's privileges to EXECUTE and SELECT
+		- ``GRANT SELECT ON hpr_hpr.* TO 'hpr-generator'@'localhost';``
+		- ``GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';``
 * Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
     * Getopt::Long
     * Pod::Usage
@@ -26,7 +35,7 @@ Static web page generator for the Hacker Public Radio website.
     * Template::Plugin::HTML::Strip
     * DBI
     * Tie::DBI
-    * DBD::SQLite
+    * DBD::SQLite or DBD::mysql
     * Date::Calc
     * Text::CSV_XS
     * HTML::Entities
@@ -67,6 +76,4 @@ and add the label "**Feature Request**".
 * gordons
 * Ken Fallon
 * norrist
-* Paul Jewell
-
 

public_html/css/hpr.css

@@ -13,22 +13,111 @@ https://creativecommons.org/publicdomain/
  *	- CSS-Tricks: Linearly Scale font-size with CSS clamp() Based on the Viewport
  *		-- https://css-tricks.com/linearly-scale-font-size-with-css-clamp-based-on-the-viewport/
 */
+@font-face {
+  font-family: "GNUTypewriter";
+  src:
+    local("GNUTypewriter"),
+    url("/css/gnutypewriter/gtw.woff") format("woff");
+}
+
+:root {
+	--background-primary: #dfdfdf;
+	--text-primary: #4d4d4d; /* HPR Grey */
+	--banner-text-primary: #000000;
+	--background-secondary: #4d4d4d;
+	--text-secondary: #dfdfdf;
+	--link-primary: #247ba0;
+	--link-primary-hover: #f8961e;
+	--link-secondary: #7fc5e2;
+	--link-secondary-hover: #f9c74f;
+	--font-family-hpr: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */;
+
+  /* screen breakpoints */
+	--for-phone-only: 599px;
+    --for-tablet-portrait-up: 600px;
+    --for-tablet-landscape-up: 900px;
+	--for-desktop-up: 1200px;
+    --for-big-desktop-up: 1800px; 
+
+
+}
 
 html {
 	margin: 0;
 	padding: 0;
-	display: block;
+	display: flex;
+	flex-direction: column;
 }
-
 body {
-	display: block;
+	display: flex;
-	background: #dfdfdf;
+	flex-direction: column;
+	justify-content: flex-start;
+	background-color: var(--background-primary);
+	color: var(--text-primary);
 	font-size: 1rem; /* fallback for browsers that don't support the clamp function) */
 	font-size: clamp(1rem, 15px + 0.3vw, 1.07rem);
+	font-family: var(--font-family-hpr);
 	margin: 0;
 	padding: 0;
 }
 
+body > nav {
+	background-color: var(--background-secondary);
+	color: var(--text-secondary);
+}
+body > nav a {
+	color: var(--link-secondary);
+}
+body > nav a:hover {
+	color: var(--link-secondary-hover);
+}
+body > nav ul {
+	background-color: inherit;
+	color: inherit;
+	margin: 0;
+	padding: 0.25rem;
+}
+body > nav ul li {
+	display: inline-block;
+	background-color: inherit;
+	color: inherit;
+	line-height: 1.5;
+	margin: 0;
+	padding: 0;
+	padding-right: clamp(0.5rem, -0.25rem + 3vw, 2.5rem);
+}
+body > header {
+	display: flex;
+	flex-direction: row;
+	flex-flow: wrap;
+	justify-content: space-between;
+	padding: 0.25rem;
+	background-image: url("/images/main-header-background.png");
+	color: var(--banner-text-primary);
+}
+body > header > * {
+	margin: 0;
+	padding: 0;
+	flex: 1 1 auto;
+}
+body > main {
+	padding: 0.25rem;
+}
+body > footer {
+	background-color: var(--background-secondary);
+	color: var(--text-secondary);
+	padding: 0.25rem;
+	text-align: center
+}
+body > footer hr:first-child {
+	display: none;
+	margin: 0;
+	padding: 0;
+}
+body > footer a {
+	color: var(--link-secondary);
+}
+
 div,
 h1,
 h2,
@@ -49,9 +138,9 @@ fieldset,
 input,
 textarea,
 blockquote {
-	font-family: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */
+	font-family: 	inherit;
-	color: #4D4D4D; /* HPR Grey */
+	color: inherit;
-	background: white;
+	background: inherit;
 }
 
 h1 {
@@ -60,7 +149,8 @@ h1 {
 }
 
 h2,
-article * h1 {
+article * h1,
+section > header:first-child {
 	font-size: 1.45rem;
 	margin: 1.25rem 0 0.75rem 0;
 }
@@ -92,10 +182,12 @@ li {
 
 a {
 	text-decoration: none;
+	color: var(--link-primary);
 }
 
 a:hover {
 	cursor: pointer;
+	color: var(--link-primary-hover);
 }
 
 hr {
@@ -124,395 +216,51 @@ p.meta span label {
 	font-weight: bold;
 }
 
-article>p,
+.lane {
-#maincontent>p {
+	display: flex;
-	line-height: 1.45;
+	flex-direction: row;
-}
+	flex-wrap: wrap;
 
-article#previous_five_weeks>* {
-	line-height: 1.35;
-	margin: 0;
-	padding: 0;
 }
-
+a.lane-button {
-article#previous_five_weeks>h3 {
+	display: flex;
-	margin: 1.5rem 0 0.5rem 0;
+	flex-direction: column;
-}
+	justify-content: center;
-
+	margin: 0.5rem;
-#container {
-	max-width: 58rem;
-	margin: 0.25rem;
-	padding: 0.75rem; /* fallback for browsers that don't support the clamp function) */
-	padding: clamp(0.75rem, -0.25rem + 3vw, 2.0rem);
-	overflow: hidden;
-	background: white;
-	border: thin solid #4D4D4D;
-}
-
-.shadow {
-	-moz-box-shadow:    2px 3px 6px 3px #675958;
-	-webkit-box-shadow: 2px 3px 6px 3px #675958;
-	box-shadow:         2px 3px 6px 3px #675958;
-}
-
-.thick_bar {
-	background-color: #4D4D4D;
-	color: white;
 	padding: 0.5rem;
-	margin: 1rem 0 1rem 0;
+	border-width: 5px;
+	border-color: var(--link-primary);
+	border-style: solid;
+	border-radius: 5px;
+
 }
 
-img#hprlogo {
+#tag_line,
-	max-width: 20vw;
+#title {
-	padding-right: clamp(0.75rem, -0.25rem + 3vw, 1.5rem);
+	text-transform: uppercase;
-	float: left;
-	margin-top: 1rem;
-	margin-bottom: clamp(0.75rem, -0.25rem + 2vw, 1.5rem);
 }
-
+#tag_line *,
-#hpr_banner {
+#title * {
-	/* display: inline-block; */
-	border: 0;
-	margin: 0 0 0rem 0;
-	padding: 0;
-}
-
-#hpr_banner p {
-	margin: 0 0 0.5rem 0;
-}
-
-#hpr_banner h1#sitename {
-	font-size: clamp(1.44rem, -1rem + 3vw, 2rem);
-	letter-spacing: 0.06rem;
 	margin: 0;
 	padding: 0;
 }
-
+#title h1 {
-#hpr_banner h2 {
+	font-size: 7.5rem;
-	font-size: clamp(0.74rem, -1rem + 2vw, 1rem);
+	letter-spacing: -0.65rem;
-	font-weight: 510;
+	line-height: 0.75;
-	margin: 0 0 1rem 0;
-	padding: 0;
 }
-
+#tag_line h3 {
-#hpr_banner h3 {
+	text-transform: capitalize;
-	font-size: 1rem;
-	font-weight: normal;
-	margin: 0 0 0.5rem 0;
-	padding: 0;
 }
-
+#site_url {
-header>hr {
+	font-family: "GNUTypewriter", monospace;
-	clear: both;
+	text-transform: none;
 }
-
+@media (min-width: 900px) {
-#accessible_menu {
+	#qr_code {
-	font-size: smaller;
+		text-align: center;
-}
-
-/* The main navigation menu */
-header>nav.menu {
-	display: block;
-	background-color: #4D4D4D; /* HPR Grey */
-	text-align: Left;
-	clear: both; /* Forces the menu to appear after the HPR Header block */
-	padding: 0;
-	margin: 0;
-}
-
-header>nav.menu ul {
-	margin: 0;
-	padding: 0.5rem;
-	background-color: inherit;
-	color: white;
-}
-
-header>nav.menu ul li {
-	display: inline-block;
-	background-color: inherit;
-	color: inherit;
-	line-height: 1.5;
-	margin: 0;
-	padding: 0;
-	padding-right: clamp(0.5rem, -0.25rem + 3vw, 2.5rem);
-}
-
-header>nav.menu ul li a {
-	color: white;
-	text-decoration: none;
-	display: block;
-	padding: 0.25rem 0;
-}
-
-header>nav.menu ul li a:hover {
-	border-bottom: thin solid white;
-	padding: 0.15rem 0;
-	-webkit-transition: 0.3s ease-in-out color;
-	-moz-transition: 0.3s ease-in-out color;
-	transition: 0.3s ease-in-out color;
-}
-
-header>nav.menu ul li a:visited {
-	color: #EDEDED;
-}
-
-a:active,
-header>nav.menu ul li a:active {
-	color: red;
-}
-
-pre {
-	/* Add background, border and scrollbar to <pre> */
-	background: #eee;
-	border: 1px solid #ddd;
-	overflow: auto;
-	clear: both;
-	padding: 0.5rem
-}
-
-code {
-	background: #eee;
-	border-radius: 0.2rem;
-	font-size: 0.95rem;
-}
-
-pre code {
-	padding-right: 0.5rem;
-	font-size: 0.85rem;
-	line-height: 1;
-}
-
-pre.comment {
-	white-space: pre-wrap;
-	line-height: 1.2rem;
-}
-
-table.hosts {
-	font-size: clamp(0.82rem, -0.25rem + 3vw, 1.0rem);
-	width: 100%;
-	background: white;
-	margin: 0 auto;
-	border-collapse: collapse;
-	display: inline-table;
-
-}
-
-table#t01,
-table.hosts {
-	display: block;
-	overflow-x: auto;
-}
-
-table#t01 tbody,
-table.hosts tbody {
-	display: table;
-}
-
-table#t01 tr:nth-child(even),
-table.hosts tr:nth-child(even) {
-	background-color: #cccccc;
-	border-bottom: thick solid white;
-}
-
-table#t01 tr:nth-child(odd),
-table.hosts tr:nth-child(odd) {
-	background-color: white;
-	border-bottom: thick solid white;
-}
-
-table.hosts tr td img {
-	vertical-align: middle;
-	max-height: 80px;
-}
-
-table.hosts th:first-child,
-table.hosts td:first-child {
-	min-width: 60px;
-	max-width: 80px;
-	text-align: left;
-	height: 62px;
-}
-
-table.hosts th:nth-child(2),
-table.hosts td:nth-child(2) {
-	text-align: left;
-	padding-left: clamp(0.15rem, -0.25rem + 3vw, 0.5rem);
-}
-
-table.hosts th:nth-child(3),
-table.hosts td:nth-child(3),
-table.hosts th:nth-child(4),
-table.hosts td:nth-child(4) {
-	width: 10%;
-	padding-right: clamp(0.10rem, -0.25rem + 3vw, 1rem);
-}
-
-body>div>footer {
-	margin-top: 2rem;
-}
-
-footer #more_info nav.column {
-	clear: both;
-	font-size: 0.9rem;
-	margin-left: 0.5rem;
-}
-
-footer #more_info nav.column ul li {
-	float: left;
-	margin-right: 1.5rem;
-	margin-bottom: 1rem;
-}
-
-footer #more_info nav.column h2 {
-	font-size: 1.35rem;
-	margin-top: 0.5rem;
-}
-
-footer h1.thick_bar {
-	clear: left;
-	font-size: 1.15rem;
-}
-
-footer #copyright {
-	font-size: smaller;
-	margin-left: 0.5rem;
-	margin-right: 0.5rem;
-}
-
-fieldset>table,
-fieldset>table thead,
-fieldset>table tbody,
-fieldset>table tr,
-fieldset>table th,
-fieldset>table td,
-fieldset>table td input,
-fieldset>table td textarea {
-	display: block;
-	font-size: 1rem;
-}
-
-fieldset>table {
-	width: calc(100vw + -16vw + -1rem);
-	max-width: 100%;
-}
-
-fieldset>table td input,
-fieldset>table td textarea {
-	width: calc(100vw + -16vw + -1.5rem);
-	max-width: 100%;
-	border: thin solid #DFDFDF;
-	margin-bottom: 0.5rem;
-	padding: 0.5rem;
-}
-
-fieldset>table td select {
-	margin-bottom: 0.5rem;
-	padding: 0.25rem;
-}
-
-fieldset>table td input[type="radio"] {
-	display: initial;
-	width: initial;
-	margin-bottom: 0.5rem;
-}
-
-fieldset>input {
-	background: #4D4D4D;
-	color: white;
-	font-weight: 600;
-	padding: 0.5rem;
-	border: thin solid #DFDFDF;
-	border-radius: 0.2rem;
-}
-
-@media only screen and (min-width: 58rem) {
-	#container {
-		margin: 0.5rem auto;
 	}
-
+	#qr_code > img {
-	.shadow {
+		max-height: 195px;
-		-moz-box-shadow:    1px 2px 5px 2px #675958;
-		-webkit-box-shadow: 1px 2px 5px 2px #675958;
-		box-shadow:         1px 2px 5px 2px #675958;
-	}
-
-	img#hprlogo {
-		margin-bottom: 1.5rem;
-	}
-
-	#hpr_banner {
-		float: left;
-	}
-
-	#hpr_banner h1#sitename {
-		font-size: 2rem;
-	}
-
-	#hpr_banner h2 {
-		font-size: 1rem;
-	}
-
-	header>hr {
-		clear: right;
-	}
-
-	table.hosts td:first-child {
-		height: 80px;
-	}
-
-	footer #more_info nav.column {
-		clear: none;
-		float: left;
-		width: 19.5%;
-		margin-left: 0;
-	}
-
-	footer #more_info nav.column:first-child {
-		margin-left: 0.5rem;
-	}
-
-	footer #more_info nav.column ul li {
-		float: none;
-		margin-bottom: 0.5rem;
-	}
-
-	fieldset>table,
-	fieldset>table thead,
-	fieldset>table tbody,
-	fieldset>table tr,
-	fieldset>table th,
-	fieldset>table td,
-	fieldset>table td input,
-	fieldset>table td textarea {
-		display: revert;
-		width: revert;
-	}
-
-	fieldset>table tr {
-		vertical-align: baseline;
-	}
-
-	fieldset>table tr:nth-child(3) {
-		vertical-align: top;
-	}
-
-	fieldset>table tr:nth-child(3) td:first-child {
-		padding-top: 0.5rem;
-	}
-
-	fieldset>table tr:nth-last-child(3) td:first-child {
-		padding-top: 1rem;
-	}
-
-	fieldset>table tr:nth-last-child(2) {
-		vertical-align: top;
-	}
-
-	fieldset>table tr:nth-last-child(2) td:first-child {
-		padding-top: 0.75rem;
-	}
-
-	fieldset>table td input[type="radio"] {
-		margin-top: 1.5rem;
 	}
 }

site-generator

@@ -56,9 +56,19 @@ Perl Template Toolkit.
         * SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries.
           Must convert WITH clauses to sub-queries when using earlier versions of SQLite.
 
+        With MySQL
+        * Create database hpr_hpr in the MySQL server from HPR dump file.
+                - sudo mysql --host=localhost < hpr.sql
+        * Create a user that will be used by the site-generator.
+                - Suggested username: hpr-generator
+                - CREATE USER 'hpr-generator'@'localhost' IDENTIFIED BY '<password>';
+        * Limit the user's privileges to EXECUTE and SELECT
+                - GRANT SELECT ON hpr_hpr.* TO 'hpr-generator'@'localhost';
+                - GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';
+
         Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
                 * Config::Std
-                * DBD::SQLite
+                * DBD::SQLite or DBD:mysql
                 * DBI
                 * Data::Dumper
                 * Date::Calc

site.cfg

@@ -26,10 +26,6 @@ media_baseurl: https://hub.hackerpublicradio.org/ccdn.php?filename=/eps/hpr$eps_
 generator_name: The HPR Robot
 generator_email: robot.nospam@nospam.hackerpublicradio.org
 
-# Is safe for work: 0 for true, 1 for false -- if true substitute 
-# variations of Hobby for Hacker
-is_sfw: 1 
-
 # Configure the navigation menu and the content templates for each page 
 # of the site:
 #

templates/content-about.tpl.html

@@ -23,7 +23,7 @@
   <p>What differentiates HPR from other podcasts is that the shows are crowd sourced from the community - 
     fellow listeners like <strong><a href="<!--% absolute_url(baseurl,'about.html#contact') %-->">you</a></strong>. 
     There is no restriction on how long the show can be, nor on the topic you can cover as long as they are not spam 
-    and <em>&quot;are of interest to <a href="http://en.wikipedia.org/wiki/Hacker_(hobbyist)" ><!--% make_sfw(is_sfw, "Hobbyists", "Hackers") %--></a>&quot;</em>. 
+    and <em>&quot;are of interest to <a href="http://en.wikipedia.org/wiki/Hacker_(hobbyist)" >Hackers</a>&quot;</em>. 
     If you want to see what topics have been covered so far just have a look at our 
     <a href="<!--% absolute_url(baseurl,'eps/index.html') %-->">Archive</a>. 
     We also allow for a <a href="<!--% absolute_url(baseurl,'series/index.html') %-->">series</a> of shows so that 
@@ -37,7 +37,7 @@
   Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License</a>.</p>
 
   <h2 id="history">History<a href="<!--% absolute_url(baseurl,'about.html#history') %-->">.</a></h2>
-  <p><!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. 
+  <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. 
     HPR has a long lineage going back to <a href="https://web.archive.org/web/20230323053905/http://www.oldskoolphreak.com/" >Radio FreeK America</a>, 
     <a href="https://web.archive.org/web/20220123174618/https://www.binrev.com/forums/" >Binary Revolution Radio</a> &amp; <a href="https://web.archive.org/web/20150208172826/http://www.nomicon.info/" >Infonomicon</a>, 
     and it is a rename of <a href="<!--% absolute_url(baseurl,'twat.html') %-->" >Today With a Techie</a> radio.
@@ -45,7 +45,7 @@
       Introduction to HPR</a>&quot; for more information.</p>
 
   <h2 id="free_culture">Free Culture<a href="<!--% absolute_url(baseurl,'about.html#free_culture') %-->">.</a></h2>
-  <p><!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio is dedicated to sharing knowledge. We do not accept donations so please consider supporting our patrons. 
+  <p>Hacker Public Radio is dedicated to sharing knowledge. We do not accept donations so please consider supporting our patrons. 
     If you listen to HPR, then we would love you to <a href="contribute.html">contribute</a> one show a year. 
     Our shows are by default released under a <a href="https://creativecommons.org/licenses/by-sa/4.0/"  >
     Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license. 
@@ -93,7 +93,7 @@
   <h1 id="contact">Primary Contact Points<a href="<!--% absolute_url(baseurl,'about.html#contact') %-->">.</a></h1>
 
   <ul>
-    <li>email: <strong>admin -at- <!--% make_sfw(is_sfw, "hobby", "hacker") %-->publicradio org</strong>, will put you in touch with the Janitors who are 
+    <li>email: <strong>admin -at- hackerpublicradio org</strong>, will put you in touch with the Janitors who are 
     the first point of contact for any issues related to the HPR community. 
     If you have any issue of concern please bring it to their attention first.
     <br />
@@ -103,7 +103,7 @@
     <li>Maillist: <a href="<!--% absolute_url(baseurl,'/maillist') %-->">Mailing list</a>. 
     While the Janitors are the first point of contact, the HPR project is 
     <a href="<!--% absolute_url(baseurl,'about.html#governance') %-->">governed</a> by the community.
-    Decisions about how <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio are made on the mailing list, and you can join it by going to :<br />
+    Decisions about how Hacker Public Radio are made on the mailing list, and you can join it by going to :<br />
     <a href="<!--% absolute_url(baseurl,'/maillist') %-->"><!--% absolute_url(baseurl,'/maillist') %--></a></li>
     <li>Mastodon: <a href="https://infosec.exchange/@hpr">https://infosec.exchange/@hpr</a> is the official HPR Mastodon instance
     and is actively monitored.</li>
@@ -142,7 +142,7 @@
   <h1 id="how_to_help">How to Help<a href="<!--% absolute_url(baseurl,'about.html#how_to_help') %-->">.</a></h1>
 
   <p>
-  <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio is a communty podcast where the shows are provided by the community, and is also
+  Hacker Public Radio is a communty podcast where the shows are provided by the community, and is also
   <a href="<!--% absolute_url(baseurl,'about.html#governance') %-->">governed</a> by the community, 
   and we rely on the <a href="<!--% absolute_url(baseurl,'about.html#patrons') %-->">support our Patrons</a> 
   to provide the hosting infrastructure.
@@ -240,7 +240,7 @@
   <a href="<!--% absolute_url(baseurl) %-->series/index.html">Series</a> page to see if you can add your knowledge to the pool.
   </p>
   <p>
-  If you are worried that your show may not be of interest to <!--% make_sfw(is_sfw, "Hobbyists", "Hackers") %--> then you can <a href="<!--% absolute_url(baseurl) %-->will-my-show-be-of-interest-to-hackers.html">click here</a> to check if it is.
+  If you are worried that your show may not be of interest to Hackers then you can <a href="<!--% absolute_url(baseurl) %-->will-my-show-be-of-interest-to-hackers.html">click here</a> to check if it is.
   </p>
   <p>
   If you can't think of anything to talk about then please just record a show telling us 
@@ -314,7 +314,7 @@
   
   <h2 id="motto">Our Mottos</h2>
   <blockquote>Any audio is better than no audio.</blockquote>
-  <blockquote>Any topic of intrest to <!--% make_sfw(is_sfw, "hobbyists", "hackers") %-->.</blockquote>
+  <blockquote>Any topic of intrest to hackers.</blockquote>
   <blockquote>It ain't a show unless it's on the server.</blockquote>
   <blockquote>If you tell us you are doing a show, then you owe us a show.</blockquote>
 
@@ -422,7 +422,7 @@
   <h2 id="no_shows_no_hpr">HPR will stop as a project if there are not enough shows
     <a href="<!--% absolute_url(baseurl,'about.html#no_shows_no_hpr') %-->">.</a></h2>
   <p>
-  <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio is dedicated to sharing knowledge.
+  Hacker Public Radio is dedicated to sharing knowledge.
   We release about 260 shows a year, which is probably more than all of the other FOSS podcasts put together.
   If you listen to HPR, then we would love you to 
   <a target="_blank" href="<!--% absolute_url(baseurl,'about.html#so_you_want_to_record_a_podcast') %-->">contribute</a> 
@@ -440,7 +440,7 @@
   </p>
   <h2 id="syndication">We do not syndicate non HPR Shows<a href="<!--% absolute_url(baseurl,'about.html#syndication') %-->">.</a></h2>
   <p>
-  HPR is founded on the principle of <!--% make_sfw(is_sfw, "Hobbyists", "Hackers") %--> sharing knowledge.
+  HPR is founded on the principle of Hackers sharing knowledge.
   For this reason we are only releasing material created exclusively for HPR.
   We will continue to promote new podcasts and other creative commons material, 
   but if you wish to have your show promoted, 
@@ -628,7 +628,7 @@
   Whichever option you have close to hand, try and set the recording to the best quality format 
   (<a href="https://en.wikipedia.org/wiki/WAV">WAV</a> or <a href="https://en.wikipedia.org/wiki/FLAC">FLAC</a>), 
   and set everything else to the highest setting. 
-  It's always the goal to get the best quality audio but here at <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio we value content over quality 
+  It's always the goal to get the best quality audio but here at Hacker Public Radio we value content over quality 
   and so long as it's audible we'll take it. 
   </p>
   <p>
@@ -690,7 +690,7 @@
   <p>
   If you would like to record with multiple participants then you can use <a href="https://www.mumble.com/">Mumble</a>. 
   Connect to <strong>chatter.skyehaven.net</strong> Port: <strong>64738 </strong>.<br />
-  Walk through the audio wizard and then pop into the <strong><!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio</strong> room. 
+  Walk through the audio wizard and then pop into the <strong>Hacker Public Radio</strong> room. 
   Once you are ready press the <strong>recording</strong> button, select <em>multichannel</em> and then <em>start</em>. 
   That will record multiple tracks, one for each participant which you can edit and then submit.
   <br />
@@ -715,7 +715,7 @@
   <h2 id="encoding">We mix down to Mono<a href="<!--% absolute_url(baseurl,'about.html#encoding') %-->">.</a></h2>
   <p>
   We will by default mix down your show to one channel mono and we will 
-  <a href="https://gitorious.org/hpr-scheduling-system/hpr-scheduling-system/source/2d526e000d31e79afa3d863ea8659503e2074267:transcoding/hprtranscode">transcode</a> to MP3, ogg and spx formats. If you want to control this in more detail then please email admin at <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio for more information.
+  <a href="https://gitorious.org/hpr-scheduling-system/hpr-scheduling-system/source/2d526e000d31e79afa3d863ea8659503e2074267:transcoding/hprtranscode">transcode</a> to MP3, ogg and spx formats. If you want to control this in more detail then please email admin at Hacker Public Radio for more information.
   </p>
   
   <h2 id="no_metadata">No need to add Metadata to the file<a href="<!--% absolute_url(baseurl,'about.html#no_metadata') %-->">.</a></h2>
@@ -948,13 +948,13 @@
   <hr />
   
   <h1 id="faq">Frequently Asked Questions</h1>
-  <h2 data-number="0.1" id="what-is-hacker-public-radio"><span class="header-section-number">0.1</span> What is <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio?</h2>
+  <h2 data-number="0.1" id="what-is-hacker-public-radio"><span class="header-section-number">0.1</span> What is Hacker Public Radio?</h2>
   <ul>
-  <li><p>Hacker<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio (HPR) is an Internet Radio show (podcast) that releases shows (episodes) 
+  <li><p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows (episodes) 
     every weekday Monday through Friday.</p></li>
   <li><p>What differentiates HPR from other podcasts is that the shows are crowd sourced from the community 
     - fellow listeners like you. There is no restriction on how long shows can be, nor on the topic you can cover, 
-    as long as they are not spam and "are of interest to <!--% make_sfw(is_sfw, "Hobbyists", "Hackers") %-->".</p>
+    as long as they are not spam and "are of interest to Hackers".</p>
   <p>If you want to see what topics have been covered so far just have a look at our 
     <a href="<!--% absolute_url(baseurl) %-->eps/index.html">Archive</a>. We also allow for shows to be grouped 
     into <a href="<!--% absolute_url(baseurl) %-->series/index.html">series</a> so that hosts can go into more detail on a topic.</p></li>
@@ -1007,7 +1007,7 @@
   which can be used for such shows.</p></li>
   </ul>
   <h2 data-number="0.4" id="what-defines-a-show-as-being-produced-for-hacker-public-radio"><span class="header-section-number">0.4</span> 
-  What defines a show as being "<em>Produced for <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio</em>"?</h2>
+  What defines a show as being "<em>Produced for Hacker Public Radio</em>"?</h2>
   <ul>
   <li>If you create material and post it first on HPR then it meets the requirements of "<em>being produced for HPR</em>". 
   That means once you upload it to the HPR server you can publish it anywhere else you like.</li>
@@ -1145,11 +1145,11 @@
   </ul>
   <h2 data-number="0.14" id="faq_wikipedia"><span class="header-section-number">0.14</span> Why has HPR not got a Wikipedia page?</h2>
   <p>
-  Once someone contributes to <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio, the Wikipedia rules prevent us from editing a page. 
+  Once someone contributes to Hacker Public Radio, the Wikipedia rules prevent us from editing a page. 
   You can of course create one prior to contributing a show, or ask for one to be created.
   </p>
   <p>
-  We do of course believe that <!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio should have a Wikipedia entry. 
+  We do of course believe that Hacker Public Radio should have a Wikipedia entry. 
   We are one of the longest running podcasts having started as Today with a Techie on 2005-09-19. 
   We also are unique in our community driven approach to producing shows. 
   And of course the fact that Wikipedia itself references us as a source 

templates/content-index.tpl.html

@@ -23,11 +23,6 @@
 <!--% END %-->
 <!--% after_html %-->
 <!--% END %-->
-<hr>
-  <article>
-    <header>
-        <h3>Welcome to HPR, the Community Podcast</h3>
-    </header>
 	<!--% days_till_next_episode = 0 %-->
 	<!--% USE DBI(constants.driver) %-->
 	<!--% USE date %-->
@@ -40,44 +35,99 @@
 	<!--% days_till_next_episode = calc.Delta_Days(now.0,now.1,now.2,slot_date.0,slot_date.1,slot_date.2) %-->
 
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
-	<p>We started producing shows as <a href="<!--% absolute_path(baseurl) %-->eps/index.html#twt_episodes"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. Our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topics</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)"><!--% make_sfw(is_sfw, "hobbyists", "hackers") %--></a>"</strong>. If you listen to HPR then please consider contributing one show a year. If you <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> your show now it could be <a href="<!--% hub_baseurl %-->calendar.php">released</a> in <strong><!--% days_till_next_episode %--></strong> days.</p>
+	<section id="welcome">
-  </article>
+		<header>Welcome</header>
-  <!--% display_call_for_shows() %-->
+		<p>Hacker Public Radio is a podcast that releases shows every weekday Monday to Friday. The shows are contributed by the public and can be on any topic that is of interest to hackers, makers, hobbyists, etc.</p>
-  <hr>
+		<div id="call_for_shows">
+			<!--% display_call_for_shows() %-->
+		</div>
+  </section>
+  <section id="podcast_lane">
+	  <header>Podcast</header>
+	  <div class="lane">
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->about.html#recording_a_podcast">
+		  <img src="<!--% absolute_path(baseurl) %-->" alt="Microphone icon">
+		  Record
+	  </a>
+	  <a class="lane-button" href="https://hub.hackerpublicradio.org/calendar.php">
+		  <img src="" alt="Calendar icon">
+		  Schedule
+	  </a>
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->syndication.html">
+		  <img src="<!--% absolute_path(baseurl) %-->" alt="RSS icon">
+		 Subscribe 
+	  </a>
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->eps/index.html">
+		  <img src="" alt="Speaker icon">
+		 Listen 
+	  </a>
+	</div>
+  </section>
+  <section id="project_lane">
+	  <header>Project</header>
+	  <div class="lane">
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->correspondents/index.html">
+		  <img src="<!--% absolute_path(baseurl) %-->" alt="Person icon">
+		 Host 
+	  </a>
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->series/index.html">
+		  <img src="" alt="Stack of Books icon">
+		 Series 
+	  </a>
+	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->about.html">
+		  <img src="<!--% absolute_path(baseurl) %-->" alt="Question Mark icon">
+		 About 
+	  </a>
+	</div>
+  </section>
+  <section id="latest_lane" class="lane">
   <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-<h1>Latest Shows</h1>
+  <section id="latest_shows">
+	<header>Latest Shows</header>
 <!--% host_cnt = 0 %-->
+	<ul>
 <!--% FOREACH latest_episodes IN DBI.query(query_latest_episodes)
 %-->
-<hr>
+		<li><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></li>
-<article>
-	<header>
-			<h1><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1>
-		<h3><!--% latest_episodes.summary%--></h3>
-		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
-	Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% day_and_date(latest_episodes.date) %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
-	<!--% display_tags(latest_episodes.tags) %-->
-	<span><!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--></span>
-	<span><label>Comments: </label><!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></span><br>
-<!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-		</p>
-	</header>
-		<p>See <a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">episode show notes</a> for more information.</p>
-</article>
 <!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->
-<article id="previous_five_weeks">
+	</ul>
-    <header>
+  </section>
-        <hr>
+  <section id="latest_comments">
-        <h1>Previous five weeks</h1>
+	<header>Latest Comments</header>
-    </header>
+	<ul>
-<!--% FOREACH last_5_weeks_episodes IN DBI.query(query_last_5_weeks_episodes)
+<!--% FOREACH item IN DBI.query('
+		WITH episode_comment_rank AS (
+		SELECT 
+			comments.eps_id
+		  ,	comments.id as comment_id
+		  , comments.comment_author_name
+		  , comments.comment_timestamp
+		  , comments.comment_title
+		  , RANK() OVER (PARTITION BY eps_id ORDER BY id ) AS comment_number
+		FROM comments 
+	)
+	SELECT 
+		  episode_comment_rank.*	  
+		, hosts.host
+		, eps.title AS episode_title
+		, eps.date AS episode_date
+	FROM episode_comment_rank 
+	INNER JOIN eps 
+	  ON episode_comment_rank.eps_id = eps.id 
+	INNER JOIN hosts 
+	  ON eps.hostid = hosts.hostid 
+	ORDER BY episode_comment_rank.comment_timestamp DESC 
+	LIMIT 10;
+	
+	')
 %-->
-	<!--% show_summary(last_5_weeks_episodes) %-->
+	<li>hpr<!--% item.eps_id %--> (<!--% item.episode_date %-->) "<!--% item.episode_title %-->" by <!--% item.host %-->
-	<p class="listen-in"><!--% display_listen_in(last_5_weeks_episodes.id) %--></p>
+	<ul>
+		<li><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comment_<!--% item.comment_id%-->">Comment <!--% item.comment_number %-->: <!--% item.comment_author_name %--> on <!--% item.comment_timestamp %-->: "<!--% item.comment_title %-->"</a>
+		</li>
+	</ul>
+	</li>
 <!--% END %-->
-</article>
+	</ul>
-<h1>Older Shows</h1>
+  </section>
-	<p>
-	Get a <a href="<!--% absolute_path(baseurl) %-->eps/index.html">full list</a> of all our shows.
-	</p>

templates/page.tpl.html

@@ -3,7 +3,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-	<title><!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio ~ The Technology Community Podcast</title>
+  <title>Hacker Public Radio ~ The Technology Community Podcast</title>
   <!--% IF baseurl %-->
   <base href="<!--% baseurl %-->">
   <!--% END %-->
@@ -11,7 +11,7 @@
   <meta http-equiv="X-Clacks-Overhead" content="GNU Terry Pratchett" />
   <meta http-equiv="last-modified" content="<!--% format_feed_date(date.now) %-->">
   <meta name="keywords" content="Technology, Tech News, Education, Training" />
-  <meta name="description" content="<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to <!--% make_sfw(is_sfw, "makers", "hackers") %--> and hobbyists." />
+  <meta name="description" content="Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists." />
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- Internal CSS -->
   <style type="text/css">
@@ -23,10 +23,10 @@
   }
   </style>
   <link rel="shortcut icon" href="<!--% absolute_url(baseurl) %-->hpr.ico" >
-  <link rel="alternate" type="application/rss+xml" title="<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio Opus RSS" href="<!--% absolute_path(baseurl) %-->hpr_opus_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Opus RSS" href="<!--% absolute_path(baseurl) %-->hpr_opus_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="<!--% make_sfw(is_sfw, "Hobby", "Hacker") %--> Public Radio Comments RSS" href="<!--% absolute_path(baseurl) %-->comments.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<!--% absolute_path(baseurl) %-->comments.rss" />
   <link rel="license" title="CC BY-SA 4.0"  href="https://creativecommons.org/licenses/by-sa/4.0/" />
   <link href="/css/hpr.css" rel="stylesheet" />
   <!--[if IE]>
@@ -36,113 +36,45 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.5, user-scalable=yes"/> 
 </head>
 
-<body id="give">
+<body>
-<div id="container" class="shadow">
+<nav class="menu" role="navigation">
+<!--% INCLUDE $navigation %-->
+</nav>
 <header>
-  <a href="<!--% absolute_path(baseurl) %-->"><img id="hprlogo" src="<!--% absolute_path(baseurl) %-->images/hpr_logo.png" alt="hprlogo"></a>
+  <div id="title">
-  <div id="hpr_banner">
+	  <h1>HPR</h1>
-    <p id="accessible_menu">
+      <h2 id="sitename">
-      <a href="<!--% absolute_path(baseurl) %-->sitemap.html">Site Map</a>
+        <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">H</a>acker
-      - <a href="#maincontent">skip to main content</a>
-      </p>
-      <h1 id="sitename">
-        <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">H</a><!--% make_sfw(is_sfw, "obby", "acker") %-->
         <a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">P</a>ublic
         <a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio
-      </h1>
+      </h2>
-    <h2>Your ideas, projects, opinions - podcasted.</h2>
+	  <h3 id="site_url">https://HackerPublicRadio.org</h3>
-    <h3>New episodes every weekday Monday through Friday.<br />
+  </div>
-    <em><small>This page was <a href="https://repo.anhonesthost.net/HPR/hpr_generator">generated</a> by <a href="mailto:<!--% generator_email %-->"><!--% generator_name %--></a> at <time dateTime="<!--% format_iso8601_date(date.now) %-->"><!--% format_feed_date(date.now) %--></time></small></em></h3>
+  <div id="tag_line">
-
+    <h1>The Community Podcast</h1>
+	<h2>Sharing your ideas, projects, opinions since 2005</h2>
+    <h3>New episodes every weekday
+  </div>
+    </h3>
+  </div>
+  <div id="qr_code">
+	  <img src="<!--% absolute_path(baseurl) %-->images/qr_code_logo.png" alt="QR code of HPR URL">
   </div>
-  <hr />
-  
-  <nav class="menu" role="navigation">
-<!--% INCLUDE $navigation %-->
-  </nav>
 </header>
-
+<main>
-<main id="maincontent">
 <!--% INCLUDE $content %-->
 </main>
-
+<footer>
-<footer id="footer_page">
+  <hr>
-  <h1 class="thick_bar">More Information...</h1>
-  <div id="more_info">
-    <nav class="column">
-      <h2>Ancestry</h2>
-      <ul>
-        <li><a href="http://audio.textfiles.com/shows/radiofreekamerica/">Radio Freek America</a></li>
-        <li><a href="http://audio.textfiles.com/shows/binrev/">BinRev Radio</a></li>
-        <li><a href="http://audio.textfiles.com/shows/infonomicon/">Infonomicon</a></li>
-        <li><a href="http://audio.textfiles.com/shows/twat/">Today With a Techie</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Social</h2>
-      <ul>
-        <li><a href="https://lists.hackerpublicradio.com/mailman/listinfo/hpr" >Mailing list</a></li>
-        <li><a rel="me" href="https://infosec.exchange/@hpr" >Mastodon</a></li>
-        <li><a href="https://matrix.to/#/#hpr:matrix.org" >Matrix</a></li>
-        <li><a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0" >Mumble</a></li>
-        <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" target="_blank">#oggcastplanet</a></li>
-        <li><a href="https://t.me/+6fEhQrf5IEc4ZGU8">Telegram</a></li>
-        <li><a href="https://twitter.com/HPR">Twitter.com</a></li>
-        <li><a href="https://www.facebook.com/HenryPartickReilly" target="_blank">Facebook</a></li>
-        <li><a href="https://www.linkedin.com/company/hackerpublicradio/" target="_blank">Linked-In</a></li>
-      </ul>
-    </nav>    
-    <nav class="column">
-      <h2>Unaffiliates</h2>
-      <ul>
-        <li><a href="https://archive.org/details/hackerpublicradio">Archive.org</a></li>
-        <li><a href="https://music.amazon.fr/podcasts/9d9e6211-ff78-4501-93b6-6a9e560c4dbd/hacker-public-radio">Amazon Music</a></li>
-        <li><a href="https://podcasts.google.com/feed/aHR0cDovL2hhY2tlcnB1YmxpY3JhZGlvLm9yZy9ocHJfcnNzLnBocA">Google Podcasts</a></li>
-        <li><a href="https://www.iheart.com/podcast/256-hacker-public-radio-30994513/" target="_blank">iHeart Radio</a></li>
-        <li><a href="https://podcasts.apple.com/us/podcast/hacker-public-radio/id281699640">iTunes</a></li>
-        <li><a href="https://www.listennotes.com/de/podcasts/hacker-public-radio-hacker-public-radio-mNH-jsI7LcJ/">Listen Notes</a></li>
-        <li><a href="https://www.mixcloud.com/hackerpublicradio/">MixCloud</a></li>
-        <li><a href="https://player.fm/series/hacker-public-radio">PlayerFM</a></li>
-        <li><a href="https://www.podchaser.com/podcasts/hacker-public-radio-76781">Podchaser</a></li>
-        <li><a href="https://nl.radio.net/podcast/hacker-public-radio">Radio.net</a></li>
-        <li><a href="https://open.spotify.com/show/7e2hYcnHj9vKgUzsIOf4r3">Spotify</a></li>
-        <li><a href="https://toppodcast.com/podcast_feeds/hacker-public-radio/">Top Podcasts</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Commons</h2>
-      <ul>
-        <li><a href="https://freeculturepodcasts.org/">Free Culture Podcasts</a></li>
-        <li><a href="https://archive.org/details/hackerpublicradio">archive.org</a></li>
-        <li><a href="https://repo.anhonesthost.net/HPR/">HPR Source Code</a></li>
-        <li><a href="https://cchits.net/">cchits.net</a></li>
-        <li><a href="https://freesound.org/">freesound.org</a></li>
-        <li><a href="https://librivox.org/">librivox.org</a></li>
-        <li><a href="https://openclipart.org/">openclipart.org</a></li>
-        <li><a href="https://openfontlibrary.org/">openfontlibrary.org</a></li>
-        <li><a href="https://www.openrouteservice.org/">openrouteservice.org/</a></li>
-        <li><a href="https://pixabay.com/">pixabay.com/</a></li>
-      </ul>
-    </nav>
-    <nav class="column">
-      <h2>Patrons</h2>
-      <ul>
-        <li><a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a></li>
-        <li><a href="https://archive.org/donate/">Archive.org</a></li>
-        <li><a href="https://rsync.net/">rsync.net</a></li>
-      </ul>
-    </nav>
-  </div><!-- more_info -->
-  <h1 class="thick_bar">Copyright Information</h1>  
   <div id="copyright">
-    <p>
+	  <span>Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
-    Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
+    Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license.</span>
-    Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license.</p>
+    <span>
-    <p>
     The <span property="dct:title">HPR Website Design</span> is released to the <a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/">Public Domain</a>.
-    </p>
+    </span>
-  </div><!-- copyright -->
+  </div>
-  <hr />
+ <div id="generated_by">This page was <a href="https://repo.anhonesthost.net/HPR/hpr_generator">generated</a> by <a href="mailto:<!--% generator_email %-->"><!--% generator_name %--></a> at <time dateTime="<!--% format_iso8601_date(date.now) %-->"><!--% format_feed_date(date.now) %--></time></em>
+ </div>
 </footer>
-</div>
+</body>
-<!-- shadow -->
+</html>

templates/shared-utils.tpl.html

@@ -130,8 +130,3 @@
     <!--% END %-->
     <a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.latest) %-->/index.html" rel="last">Latest &gt;&gt;</a></small>
 <!--% END %-->
-
-<!--% MACRO make_sfw(swf, sfw_text, nsfw_text) BLOCK %-->
-<!--% IF swf == 0 %--><!--% sfw_text %-->
-<!--% ELSE %--><!--% nsfw_text %-->
-<!--% END %--><!--% END %-->

utils/check-dependencies.sh

@@ -1,67 +1,73 @@
-#!/bin/bash -
+#!/bin/bash - 
 #===============================================================================
 #
 #          FILE: check-dependencies.sh
-#
+# 
-#         USAGE: ./check-dependencies.sh
+#         USAGE: ./check-dependencies.sh 
-#
+# 
-#   DESCRIPTION: Check that Perl module dependencies for the hpr_generator
+#   DESCRIPTION: Check that Perl module dependencies for the hpr_generator 
 #		  are installed.
-#
+# 
 #       OPTIONS: ---
 #  REQUIREMENTS: ---
 #          BUGS: ---
 #         NOTES: ---
 #        AUTHOR: Roan "Rho`n" Horning (roan.horning@gmail.com)
-#  ORGANIZATION:
+#  ORGANIZATION: 
 #       CREATED: 09/05/2024 09:55:00 PM
 #      REVISION:  ---
 #===============================================================================
 
-set -o nounset # Treat unset variables as an error
+set -o nounset                              # Treat unset variables as an error
 
 #---  FUNCTION  ----------------------------------------------------------------
-#          NAME: is_module_installed
+#          NAME: is_module_installed 
-#   DESCRIPTION: Tests if the supplied module is found on the system
+#   DESCRIPTION: Tests if the supplied module is found on the system 
 #    PARAMETERS: Name of the denpendent Perl module
 #       RETURNS: 0 if not found, 1 if found
 #-------------------------------------------------------------------------------
 function is_module_installed {
-  HR="----------------------"
+	HR="----------------------"
-  perl -e "use ${1} "
+	perl -e "use ${1} " 
-  if [ $? -ne 0 ]; then
+	if  [ $? -ne 0 ]
-    echo ${HR}
+	then
-  else
+		echo ${HR}
-    echo "Found module ${1}"
+	else
-    echo ${HR}
+		echo "Found module ${1}"
-  fi
+		echo ${HR}
+	fi
 }
 
-MODULES=(
+MODULES=( \
-  "Getopt::Long"
+	 "Getopt::Long" \
-  "Pod::Usage"
+	 "Pod::Usage" \
-  "Config::Std"
+	 "Config::Std" \
-  "Template"
+	 "Template" \
-  "Template::Plugin::File"
+	 "Template::Plugin::File" \
-  "Template::Plugin::DBI"
+	 "Template::Plugin::DBI" \
-  "Template::Plugin::HTML::Strip"
+	 "Template::Plugin::HTML::Strip" \
-  "DBI"
+	 "DBI" \
-  "Tie::DBI"
+	 "Tie::DBI" \
-  "DBD::SQLite"
+	 "DBD::SQLite" \
-  "Date::Calc"
+	 "DBD::mysql" \
-  "Text::CSV_XS"
+	 "Date::Calc" \
+	 "Text::CSV_XS" \
 )
 
 echo "The following modules must be installed for the site-generator to function: "
-for module in "${MODULES[@]}"; do
+for module in "${MODULES[@]}"
-  echo "* ${module}"
+do
+	echo "* ${module}"
 done
+echo "When MySQL is used, the DBD:mysql module is required (otherwise it is optional)"
+echo "When SQLite is used, then the DBD:SQLite module is required (otherwise it is optional)"
 
 echo "Scanning for modules ..."
 echo "----------------------"
 
-for module in "${MODULES[@]}"; do
+for module in "${MODULES[@]}"
-  is_module_installed "${module}"
+do
+	is_module_installed "${module}"
 done
 
 echo "Finished scanning."