Merge pull request 'fix entity escape for xml data' (#252) from rho_n/hpr_generator_dev:i232_Comments-feed-not-producing-valid-xml into main

Reviewed-on: HPR/hpr_generator#252

public_html/css/hpr.css

@@ -4,275 +4,515 @@
 https://creativecommons.org/publicdomain/ 
  
 */
+/*
+ *	See the following for the modern CSS responsive design techniques used in this file:
+ *	- MDN web docs: Responsive design 
+ *		-- https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Responsive_Design
+ *	- Matthew James Tayler: Responsive Font Size (Optimal Text at Every Breakpoint) 
+ *		-- https://matthewjamestaylor.com/responsive-font-size
+ *	- 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/
+*/
 
-p.meta span label { font-weight: bold; }
+html {
-@media only screen and (min-width: 479px) { 
+	margin: 0;
-
+	padding: 0;
-body {background: #dfdfdf;}
+	display: block;
-div, h1, h2, h3, h4, h5, h6, p, ul, ol, li, dl, dt, dd, img, form, fieldset, input, textarea, blockquote {
-  font-family: Verdana, Arial, Helvetica, sans-serif;/* 1em/1.5 OpenDyslexic, */
-  color: #4D4D4D; /* HPR Grey */
-  background: white;
 }
 
+body {
+	display: block;
+	background: #dfdfdf;
+	font-size: 1rem; /* fallback for browsers that don't support the clamp function) */
+	font-size: clamp(1rem, 15px + 0.3vw, 1.07rem);
+	margin: 0;
+	padding: 0;
+}
 
-#container {
+div,
-	width: 100%;
+h1,
-	max-width: 58em;
+h2,
-	margin: auto;
+h3,
-	overflow: hidden;
+h4,
-	padding: .5em;
+h5,
-	border: thin solid;
+h6,
+p,
+ul,
+ol,
+li,
+dl,
+dt,
+dd,
+img,
+form,
+fieldset,
+input,
+textarea,
+blockquote {
+	font-family: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */
+	color: #4D4D4D; /* HPR Grey */
 	background: white;
 }
 
-.shadow {
+h1 {
-  -moz-box-shadow:    2px 3px 6px 3px #675958;
+	font-size: 1.5rem;
-  -webkit-box-shadow: 2px 3px 6px 3px #675958;
+	margin: 1.25rem 0 0.75rem 0;
-  box-shadow:         2px 3px 6px 3px #675958;}
-
-#hprlogo { 
-  display: block; 
-  position: relative; 
-  top: 0; 
-  left: 0; 
-  border: 0; 
-  margin: 0.75em;
-  float:left;
 }
 
-#hpr_banner { 
+h2,
-  display: block; 
+article * h1 {
-  position: relative;
+	font-size: 1.45rem;
-  border: 0; 
+	margin: 1.25rem 0 0.75rem 0;
-  margin: 0.75em;
-  float: left;
 }
 
-#hpr_banner h1 {margin: -.25em 0em -.5em 0em;}
+h3,
-#hpr_banner h2 {font-size: 100%; font-weight: lighter; }
+article * h2 {
-#hpr_banner h3 {font-size: 90%; font-weight: lighter; }
+	font-size: 1.25rem;
-
+	margin: 1.25rem 0 0.75rem 0;
-#accessible_menu {
-  font-size: small;
 }
 
-/* The main navigation menu */
+h4,
-.menu {
+article * h3 {
-  background: #4D4D4D; /* HPR Grey */
+	font-size: 1.15rem;
-  text-align: Left;
+	margin: 1.25rem 0 0.75rem 0;
-  clear:both; /* Forces the menu to appear after the HPR Header block */
-  padding: 0em 0em;
-  margin: 0em 0em;
 }
 
-.menu ul ul { /* Causes the sub menus not to be displayed, until hover shows them */
+img {
-  display: none;
+	max-width: 100%;
+	height: auto;
 }
 
-#main_menu li a {display: block;}
+ul {
-
+	padding-left: 1.15rem;
-.menu ul li { padding: .25em 0em;}
-
 }
 
-.menu ul { /* The menu bar background across screen */
+li {
-  background: #4D4D4D; /* HPR Grey */
+	line-height: 1.25;
-  color: white;
-  padding: 0 10px; /* Keeps sub menus to the left */
-  list-style: none;
-  position: relative;
-  margin: 0;
-  display: inline-table;
 }
 
-.menu ul:after { /* Forces the dropdown to be a block with non float */
+a {
-  content: ""; 
+	text-decoration: none;
-  clear: both; 
-  display: block;
 }
 
-.menu ul li {
+a:hover {
-  background: #4D4D4D; /* HPR Grey */
+	cursor: pointer;
-  color: white;
-  float: left;
-  padding: .5em 1em;
 }
 
-.menu ul li a {
-  background: #4D4D4D; /* HPR Grey */
-  color: white;
-  display: block; 
-  text-decoration: none;
-}
-    
-.menu ul ul {
-  background: #4D4D4D; /* HPR Grey */
-  color: white;
-  padding: 0;
-  position: absolute; 
-  top: 100%;
-}
-
-.menu ul ul li {
-  background: #4D4D4D; /* HPR Grey */
-  color: white;
-  float: none; 
-  position: relative;
-}
-    
-.menu ul ul ul {
-  position: absolute; 
-  left: 100%; 
-  top:0;
-}
-
-
 hr {
-  background: #4D4D4D;  /* HPR Grey */
+	background: #4D4D4D;
-  border: 0;
+	border: 0;
-  height: 0.25em;
+	height: 0.25em;
 }
 
-/* The multi colum footer layout */
+audio {
-
+	padding: .7em 0em .5em 0em;
-#footer_page {
+	clear: both;
-  width:100%;
+	position: relative;
+	z-index: auto;
 }
 
-.column {
+.audcredit {
-  width:12%;
+	font-size: 75%;
-  background-color: white;
+	margin-bottom: 1em;
-  color: #4D4D4D; /* HPR Grey */
-  float:left;
-  margin:0 10px;
-  display: block;
 }
 
-.column li {
+p.meta {
-  list-style:none;
+	line-height: 1.25;
-  padding: .25em 0em;
+}
-  font-size: 85%;
+
+p.meta span label {
+	font-weight: bold;
+}
+
+article>p,
+#maincontent>p {
+	line-height: 1.45;
+}
+
+article#previous_five_weeks>* {
+	line-height: 1.35;
+	margin: 0;
+	padding: 0;
+}
+
+article#previous_five_weeks>h3 {
+	margin: 1.5rem 0 0.5rem 0;
+}
+
+#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 {
-  width:100%;
+	background-color: #4D4D4D;
-  background-color: #4D4D4D; /* HPR Grey */
+	color: white;
-  color: white;
+	padding: 0.5rem;
-  float:left;   
+	margin: 1rem 0 1rem 0;
-  clear: both;
-  height:1.5em;
-  padding: .5em 0em .5em 0em;
-  font-size: 1em;
-  margin: 1em 0em 1em 0em;
 }
 
-#more_info {margin: auto;}
+img#hprlogo {
-nav.column { display: block; padding: 0em 1em 0em 1em;}
+	max-width: 20vw;
-#copyright {
+	padding-right: clamp(0.75rem, -0.25rem + 3vw, 1.5rem);
-  font-size: small;
+	float: left;
-  width:100%;
+	margin-top: 1rem;
-  float:left;   
+	margin-bottom: clamp(0.75rem, -0.25rem + 2vw, 1.5rem);
 }
 
-article, #copyright p {
+#hpr_banner {
-  padding: 0 10px;
+	/* display: inline-block; */
+	border: 0;
+	margin: 0 0 0rem 0;
+	padding: 0;
 }
 
-audio {padding: .7em 0em .5em 0em; clear: both; position: relative; z-index:auto;}
+#hpr_banner p {
-.audcredit { font-size: 75%;margin-bottom: 1em;}
+	margin: 0 0 0.5rem 0;
-h1.showtitle { font-size: 125%;}
-
-/* Full Index Page styling */
-#index_full h2.title {
-	font-weight: lighter;
-	margin-bottom: -.5em;
-	padding: .5em 0em 0em 0em; 
-	font-size: 110%;}
-
-#index_full p.meta {font-size: 85%;}
-
-#small {
-  font-size: small;
 }
 
-p.author { font-size: 85%;}
+#hpr_banner h1#sitename {
-p.shownotes { padding: .5em;}
+	font-size: clamp(1.44rem, -1rem + 3vw, 2rem);
-#maincontent footer p { /* font-size: 75%; */ margin-bottom: 1em;}
+	letter-spacing: 0.06rem;
-/* link styling */
+	margin: 0;
-a:link {text-decoration: none;}
+	padding: 0;
-
-table {
-    width:100%;
-}
-table, th, td {
-    border-collapse: collapse;
-    padding: 2px;
-    text-align: left;
-}
-table#t01, table#t01 th, table#t01 td {
-    border: 1px solid black;
-}
-table#t01 th, table#t01 td {
-    padding: 5px;
-    text-align: left;
-}
-table#t01 tr:nth-child(even) {
-    background-color: #eee;
-}
-table#t01 tr:nth-child(odd) {
-   background-color:#fff;
-}
-table#t01 th	{
-    background-color: #4D4D4D;
-    color: white;
 }
 
-pre { /* Add background, border and scrollbar to <pre> */
+#hpr_banner h2 {
-    background: #eee;
+	font-size: clamp(0.74rem, -1rem + 2vw, 1rem);
-    border: 1px solid #ddd;
+	font-weight: 510;
-    overflow: auto;
+	margin: 0 0 1rem 0;
-    clear: both;
+	padding: 0;
 }
 
-table.hosts {
+#hpr_banner h3 {
-	background: white
+	font-size: 1rem;
+	font-weight: normal;
+	margin: 0 0 0.5rem 0;
+	padding: 0;
+}
+
+header>hr {
+	clear: both;
+}
+
+#accessible_menu {
+	font-size: smaller;
+}
+
+/* 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;
 }
-table.hosts tr:nth-child(even) { background-color:#cccccc; }
-table.hosts tr:nth-child(odd) { background-color:white; }
-table.hosts tr td img { vertical-align:middle }
 
 pre.comment {
 	white-space: pre-wrap;
-	padding: 2px;
 	line-height: 1.2rem;
 }
 
-h3.title { margin: 1.25rem 0 0.75rem 0 }
+table.hosts {
-p.meta { margin: 0.25rem 0 }
+	font-size: clamp(0.82rem, -0.25rem + 3vw, 1.0rem);
-p.summary { margin: 0.25rem 0 }
+	width: 100%;
-p.listen-in { margin-top: 0 }
+	background: white;
+	margin: 0 auto;
+	border-collapse: collapse;
+	display: inline-table;
 
-@media only screen and (max-width: 680px) { 
-	#container {width: 95%;}
-	img#hprlogo {float: left; max-width: 85px; padding: .35em;}
-	.column {width: 15%;}
-	h1 {font-size: 140%;}
-	h2 {font-size: 120%;}
-	h3 {font-size: 100%;}
-	nav.column { display: block; padding: 0em .25em 0em .25em;}
-	#footer_page li {font-size: 85%; padding: .5em .25em .5em .25em;}
-	footer p {font-size: 75%;}
-	audio {float: none; }
 }
 
-@media only screen and (max-width: 479px) { 
+table#t01,
-	body {background: #ffffff; color: #4D4D4D; font-family: Verdana, Arial, Helvetica, sans-serif;/* 1em/1.5 OpenDyslexic, */}
+table.hosts {
-	li {font-size: 100%; padding: .75em 0em .75em 0em; margin-left: -.25em;}
+	display: block;
-	img#hprlogo {float: left; max-width: 65px; padding: .35em;}
+	overflow-x: auto;
-	.column {width: auto;}
+}
-	h1#sitename { clear: both;}
+
-	a:link {text-decoration: none;}
+table#t01 tbody,
-	audio {padding: .7em 0em .5em 0em; width: 95%; max-width: 300px;}
+table.hosts tbody {
-	.audcredit { font-size: 65%; margin-bottom: 1em;}
+	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;
+	}
+
+	.shadow {
+		-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.cfg

@@ -27,11 +27,9 @@ output_path: ./public_html
 [root_template]
 content: page.tpl.html
 #baseurl: OPTIONAL [i.e. file://<full path to local website directory>]
-#baseurl: file:///home/roan/Development/hpr/website/hpr_generator/public_html/
-baseurl: https://hackerpublicradio.org/
 http_baseurl: http://hackerpublicradio.org/
 hub_baseurl: https://hub.hackerpublicradio.org/
-media_baseurl: https://archive.org/download/hpr$eps_id/
+media_baseurl: https://hub.hackerpublicradio.org/ccdn.php?filename=/eps/hpr$eps_id/
 generator_name: The HPR Robot
 generator_email: robot.nospam@nospam.hackerpublicradio.org
 
@@ -97,6 +95,10 @@ content: content-episode.tpl.html
 multipage: true
 filename: eps/hpr[id]/index.html
 
+[download]
+navigation: navigation-get-shows.tpl.html
+content: content-download.tpl.html
+
 [syndication]
 navigation: navigation-get-shows.tpl.html
 content: content-syndication.tpl.html
@@ -117,13 +119,20 @@ content: content-tags.tpl.html
 navigation: navigation-get-shows.tpl.html
 content: content-twat_episode.tpl.html
 multipage: true
-filename: eps/twat[id]/index.html
+filename: eps/twt[id]/index.html
-media_baseurl: https://www.hackerpublicradio.org/eps/
 
 [mumble-howto]
 navigation: navigation-about.tpl.html
 content: content-mumble-howto.tpl.html
 
+[contact]
+navigation: navigation-about.tpl.html
+content: content-contact.tpl.html
+
+[promote]
+navigation: navigation-about.tpl.html
+content: content-promote.tpl.html 
+
 [comments_viewer]
 navigation: navigation-about.tpl.html
 content: content-comments_viewer.tpl.html

templates/content-about.tpl.html

@@ -66,8 +66,9 @@
   <p>See the section <a href="<!--% absolute_url(baseurl,'about.html#stuff_you_need_to_know') %-->" >stuff you need to know</a> for more information.</p>
   <h3 id="recent_policy_changes">Recent Policy Changes</h3>
   <ul>
+  <li><a href="https://lists.hackerpublicradio.com/pipermail/hpr/2024-October/004791.html">Clarification that contributions are CC BY-SA 4.0 unless otherwise stated</a></li>
   <li><a href="https://lists.hackerpublicradio.com/pipermail/hpr/2021-July/004191.html">HPR will move #oggcastplanet on libera, 
-  and we will also include links to the matrix, and <a href="https://botsin.space/@hpr">Mastodon</a> channel</a></li>
+  and we will also include links to the matrix</a>, and <a href="https://infosec.exchange/@hpr">Mastodon</a> channel</li>
   <li><a href="https://lists.hackerpublicradio.com/pipermail/hpr/2021-August/004200.html">Existing shows will be 
   flagged with the current version and new shows will default to "Attribution 4.0 International (CC BY 4.0)"</a></li>
   <li><a href="https://lists.hackerpublicradio.com/pipermail/hpr/2021-November/004328.html">The Intro Outro will be 
@@ -89,25 +90,36 @@
   
   <hr />
 
-  <h1 id="contact">Contact<a href="<!--% absolute_url(baseurl,'about.html#contact') %-->">.</a></h1>
+  <h1 id="contact">Primary Contact Points<a href="<!--% absolute_url(baseurl,'about.html#contact') %-->">.</a></h1>
 
-  <p>We are always looking for more hosts...</p>
   <ul>
-    <li>email: <strong>admin -at- hackerpublicradio org</strong><br />
+    <li>email: <strong>admin -at- hackerpublicradio org</strong>, will put you in touch with the Janitors who are 
-    <em>As an anti-spam measure you will get an error back but we do get your email.</em></li>
+    the first point of contact for any issues related to the HPR community. 
-    <li>Website: <a href="<!--% absolute_url(baseurl,'') %-->" ><!--% absolute_url(baseurl,'') %--></a></li>
+    If you have any issue of concern please bring it to their attention first.
-    <li>Maillist: <a href="<!--% absolute_url(baseurl,'/maillist') %-->">Mailing list</a></li>
+    <br />
+    <em>As an anti-spam measure you may get an error back but we do get your email.</em></li>
+    <li>Website: <a href="<!--% absolute_url(baseurl,'') %-->" ><!--% absolute_url(baseurl,'') %--></a>. 
+    There is a comment link on each show where you can provide your constructive feedback.</li>
+    <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 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>
+    <li>Matrix: <a href="https://matrix.to/#/#hpr:matrix.org" >https://matrix.to/#/#hpr:matrix.org</a> is the official HPR Matrix channel
+    and is actively monitored.</li>
+  </ul>
+  <h3 id="contact_secondary">Secondary Contact Points</h3>
+  <p>These platforms are monitored from time to time. Commenting here is less likely to get an immediate response.</p>
+  <ul>
+    <li><a href="https://t.me/+6fEhQrf5IEc4ZGU8">Telegram</a></li>
     <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" >#oggcastplanet</a></li>
     <li><a href="https://www.facebook.com/home.php?sk=group_130169220378872¬if_t=group_r2j" >Facebook</a></li>
     <li><a href="https://www.linkedin.com/company/hackerpublicradio/" >Linked-In</a></li>
     <li><a href="http://itunes.apple.com/us/podcast/hacker-public-radio/id281699640" >iTunes</a></li>
   </ul>
-  <h2>Mail List</h2>
+  
-  <p>
-  HPR is governed by the community, so decisions about how Hacker Public Radio should be run are made on the mailing list you can join it by going to :<br />
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="<!--% absolute_url(baseurl,'/maillist') %-->"><!--% absolute_url(baseurl,'/maillist') %--></a>
-  </p>
-
   <hr />
   
   <h1 id ="press" >In the Press<a href="<!--% absolute_url(baseurl,'about.html#press') %-->">.</a></h1>
@@ -276,7 +288,7 @@
   and we'll get in touch with you with all you need to know about getting your show published.<br />
   You can chat with other podcasters using IRC in the <strong>#oggcastplanet</strong> channel on the 
   <a href="https://web.libera.chat/gamja/?channels=oggcastplanet">libera.chat</a> network. 
-  Follow us on <a href="https://botsin.space/@hpr">Mastodon</a> (use the tag <strong>#hpr</strong>) 
+  Follow us on <a href="https://infosec.exchange/@hpr">Mastodon</a> (use the tag <strong>#hpr</strong>) 
   and on <a href="https://twitter.com/hpr">Twitter</a> (use the tag <strong>#hpr</strong>). 
   We have a <a href="https://www.facebook.com/HenryPartickReilly">Facebook</a> and 
   <a href="https://www.linkedin.com/groups?mostPopular=&amp;gid=3737302">LinkedIn</a> group, 
@@ -823,7 +835,7 @@
     <li id="Short_Summary"><strong>Summary:</strong> <em>Mandatory</em><br />
     This is a short 100 character summary of what your show is about. 
     Please fill this out as it is used once the show has gone off the main page, on the mobile site, 
-    on printed brochures, on text to speech announcements, on twitter, <a href="https://botsin.space/@hpr">Mastodon</a> etc.</li>
+    on printed brochures, on text to speech announcements, on twitter, <a href="https://infosec.exchange/@hpr">Mastodon</a> etc.</li>
     <li id="Theme"><strong>Theme:</strong> <em>Automatic</em><br />
     The Intro, and the Outro will be added automatically. Please do not add it.
     </li>
@@ -1148,7 +1160,7 @@
   <li>You can join the <strong>#oggcastplanet</strong> channel on IRC. 
   Visit the <a href="http://webchat.freenode.net/?channels=oggcastplanet">freenode.net</a> network to sign up.</li>
   <li>A number of HPR messages may be found on Twitter and 
-  <a href="https://botsin.space/@hpr">Mastodon</a>.</li>
+  <a href="https://infosec.exchange/@hpr">Mastodon</a>.</li>
   <li>There is a <a href="https://t.me/+6fEhQrf5IEc4ZGU8">chat group on Telegram</a></li>
   <li>An HPR tradition exists where we record a 26-hour show at the turn of the year celebrating the 
     arrival of the New Year around the world. We use Mumble to record the show and anyone can connect 

templates/content-contact.tpl.html

@@ -0,0 +1,21 @@
+<article>
+    <header>
+        <h1>Contact</h1>
+    </header>
+    <p>We are always looking for more hosts...</p>
+    <ul>
+      <li>email: <strong>admin -at- hackerpublicradio org</strong><br />
+      <em>As an anti-spam measure you will get an error back but we do get your email.</em></li>
+      <li>Website: <a href="http://www.hackerpublicradio.org" target="_blank">www.hackerpublicradio.org</a></li>
+      <li>Mailist: <a href="http://www.hackerpublicradio.org/maillist" target="_blank">Maillist</a></li>
+      <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" target="_blank">#oggcastplanet</a></li>
+      <li><a href="https://www.facebook.com/home.php?sk=group_130169220378872¬if_t=group_r2j" target="_blank">Facebook</a></li>
+      <li><a href="https://www.linkedin.com/company/hackerpublicradio/" target="_blank">Linked-In</a></li>
+      <li><a href="http://itunes.apple.com/us/podcast/hacker-public-radio/id281699640" target="_blank">iTunes</a></li>
+    </ul>
+    <h2>Mail List</h2>
+    <p>
+    HPR is governed by the community, so decisions about how Hacker Public Radio should be run are made on the mailing list you can join it by going to :<br />
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.hackerpublicradio.org/maillist">http://www.hackerpublicradio.org/maillist</a>
+    </p>
+</article>

templates/content-correspondents.tpl.html

@@ -18,7 +18,7 @@
 		on h.hostid = e.hostid
 		order by h.host'
 	) %-->
-	<tr height="80">
+	<tr>
 	<td><!--% get_avatar(host.hostid, host.host, host_cnt > 8) %--></td>
 
 		<td><strong><!--% host.host %--></strong><br>

templates/content-download.tpl.html

@@ -0,0 +1,56 @@
+<article>
+	<header>
+        <h1>Download Archive</h1>
+        <p>Please be aware that our Archive exceeds <strong>62Gb</strong> <em>(Ogg: 21Gb, Spx: 16Gb, mp3: 25Gb)</em>. We are happy for you to download them, but please make sure that you are not going to incur additional bandwidth charges on your side.</p>
+        <p>We will be happy to post you DVD's of the episodes anywhere in the world if bandwidth is an issue.</p>
+    </header>
+        <h2>Full Episode Guide</h2>
+        <p>
+        The <a href="./eps/index.html">compete episode guide</a> is available to you, and it lists all the shows on one page going right back to the very first episode.
+        </p>
+        <h2>Command line download</h2>
+        <p>
+        You can download the audio of the episodes directly from the command line using the following commands:
+        </p>
+        <ul>
+          <li>ogg:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[0001-3657].ogg' -o "hpr#1.ogg"</span></li>
+          <li>spx:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[0001-3657].spx' -o "hpr#1.spx"</span></li>
+          <li>mp3:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[0001-3657].mp3' -o "hpr#1.mp3"</span></li>
+        </li>
+        </ul>
+        <h2>Full RSS feed, BitTorrent and Magnet links</h2>
+        <p>The full rss feed is updated daily and contains the complete show note with links to supporting articles. The torrent/magnet also contains this information and is a snaphot of the archive taken between 2007 and November 2013. </p>
+        <ul>
+          <li><span style="font-family:monospace;">ogg: <a href="hpr_total_ogg_rss.php">rss</a>, <a href="https://www.talkgeektome.us/torrents/HPR-Ogg-2007-Nov2013.torrent">torrent</a>, <a href="magnet:?xt=urn:btih:390C66903BBB2B6A067C438C70B2E90988AA8207&dn=HPR-Ogg-2007-Nov2013&tr=http%3A%2F%2Ftracker.info-underground.net%3A16880%2Fannounce">magnet</a></span></li>
+          <li><span style="font-family:monospace;">spx: <a href="hpr_total_spx_rss.php">rss</a>, <a href="https://www.talkgeektome.us/torrents/HPR-Mp3-2007-Nov2013.torrent">torrent</a>, <a href="magnet:?xt=urn:btih:E2573BEF0209B8C2E3C7908BAF220EC34D4A5B8E&dn=HPR-Speex-2007-Nov2013&tr=http%3A%2F%2Ftracker.info-underground.net%3A16880%2Fannounce">magnet</a></span></li>
+          <li><span style="font-family:monospace;">mp3: <a href="hpr_total_rss.php">rss</a>, <a href="https://www.talkgeektome.us/torrents/HPR-Mp3-2007-Nov2013.torrent">torrent</a>, <a href="magnet:?xt=urn:btih:6E9492AD78BCCA2B8D6A42C9C0BCAB0E6FA778F8&dn=HPR-Mp3-2007-Nov2013&tr=http%3A%2F%2Ftracker.info-underground.net%3A16880%2Fannounce">magnet</a></span></li>
+        </ul>
+        <h3>Direct download of the remaining shows</h3>
+        <p>
+        You can download the remaining episodes since the torrent was created directly from the command line using the following commands:
+        </p>
+        <ul>
+          <li>ogg:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[1391-3657].ogg' -o "hpr#1.ogg"</span>
+          </li>
+        </li>
+        </ul>
+        <ul>
+          <li>spx:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[1391-3657].spx' -o "hpr#1.spx"</span>
+          </li>
+        </li>
+        </ul>
+        <ul>
+          <li>mp3:<br />
+          <span style="font-family:monospace;">curl 'https://www.hackerpublicradio.org/eps/hpr[1391-3657].mp3' -o "hpr#1.mp3"</span>
+          </li>
+        </li>
+        </ul>
+      <footer>
+      <p>Big to DeepGeek and the team for providing the BitTorrent service.</p>
+      </footer>
+</article>

templates/content-episode.tpl.html

@@ -17,11 +17,10 @@
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
-Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
+Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% day_and_date(episode.date) %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %-->
 
 <label>Comments: </label><!--% display_comments_tally(episode.id, episode.eps_tally) %--> <br>
-The show is available on the Internet Archive at: <a href="https://archive.org/details/hpr<!--% zero_pad_left(episode.id) %-->">https://archive.org/details/hpr<!--% zero_pad_left(episode.id) %--></a>
 <!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
@@ -29,7 +28,6 @@ The show is available on the Internet Archive at: <a href="https://archive.org/d
 	</header>
 	<div><!--% episode.notes %--></div>
 <footer>
-<!--% show_transcript(episode, "hpr", baseurl, media_baseurl) %-->
 <p>
 <!--% episode_navigation %-->
 </p>

templates/content-episodes.tpl.html

@@ -13,7 +13,7 @@
 	<!--% show_summary(episodes) %-->
 	<p class="listen-in"><!--% display_listen_in(episodes.id) %--></p>
 <!--% END %-->
-<h2 id="twat_episodes">Today With a Techie Archived Shows</h2>
+<h2 id="twt_episodes">Today With a Techie Archived Shows</h2>
 	<p>
 		<!-- Creative Commons License -->
 		<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="https://creativecommons.org/images/public/somerights20.png" width="88" height="31" /></a><br>The following work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/">Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License</a>.</p>

templates/content-index.tpl.html

@@ -40,7 +40,7 @@
 	<!--% 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#twat_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)">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>
+	<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)">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>
   </article>
   <!--% display_call_for_shows() %-->
   <hr>
@@ -55,7 +55,7 @@
 			<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 <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
+	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>
@@ -63,13 +63,10 @@
 		</p>
 	</header>
 		<!--% tidy_notes(latest_episodes.notes) %-->
-	<footer>
-	<!--% show_transcript(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-	</footer>
 </article>
 <!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->
-<article>
+<article id="previous_five_weeks">
     <header>
         <hr>
         <h1>Previous five weeks</h1>

templates/content-promote.tpl.html

@@ -0,0 +1,22 @@
+<article>
+    <header>
+        <h1>Please promote HPR</h1>
+    </header>
+<p>Feel free to use the promotional material to spread the word in your podcasts, or have them played on to other shows.</p>
+<h2>General HPR promotion</h2>
+<ul>
+<li><a href="./media/promos/HPRpromoKlaatu.ogg">Klaatu explains HPR Daily podcast by the www.hackerpublicradio.org Community for the www.hackerpublicradio.org Community</a></li>
+<!--<li><a href="../media/promos/HPRpromoNewsCast.ogg">A News Caster tells us about HPR</a></li> 
+<li><a href="../media/promos/HPRpromoSkirlet.ogg">Skirlet tells us we need to listen to HPR</a></li>-->
+</ul>
+
+<h2>Requests for contributions</h2>
+<p>
+<ul>
+<li><a href="./media/promos/Jude-aka-Mrs_Peter64_HPR-needs-shows.flac">Jude Mrs. Peter64 HPR needs shows</a></li>
+<li><a href="./media/promos/hpr-contributor-promo-sax.ogg">slick0 basenet theme</a></li>
+<li><a href="./media/promos/hpr-contributor-promo-basenettheme.ogg">slick0 sax roll</a></li>
+</ul>
+</p>
+
+</article>

templates/content-sitemap.tpl.html

@@ -5,7 +5,7 @@
     <li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a> ← The HPR Homepage</li>
     <li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a> ← The RSS Syndication Feeds</li>
     <ul>
-		<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Full Episode Guide</a> ← Complete list of all the Shows.</li>
+		<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a> ← Complete list of all the Shows.</li>
       <li><a href="<!--% absolute_path(baseurl) %-->series/index.html">In-Depth Series</a> ← Overview of the In-Depth Series.</li>
       <li><a href="<!--% absolute_url(baseurl) %-->about.html#download">Download Options</a> ← How to download the entire archive.</li>
     </ul>

templates/content-syndication.tpl.html

@@ -20,9 +20,9 @@
   Every month, the HPR Janitors put down their mops had have a chat about all the shows, and what else has been going on in the HPR community. This is a regular show scheduled for the first Monday of the month. 
   </p>
   <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=47">ogg</a> Larger file size higher quality feed.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_opus_rss.php?series=47">opus</a>.</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=47">mp3</a> Larger file size regular quality feed in a common format.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=47">ogg</a>.</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=47">spx</a> Small file size lower quality feed. <br/>Ideal for dial-up/mobile connections.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=47">mp3</a>.</li>
   </ul>
   <p>
   We also maintain an <a href="https://archive.org/details/hackerpublicradio?and[]=subject%3A%22Community+News%22">Archive.org</a> page where you can get the shows in even more formats.
@@ -37,9 +37,9 @@
   Use these feeds to keep up to date with the latest HPR Episodes.
   </p>
   <ul>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_ogg_rss.php">ogg</a> Larger file size higher quality feed.</li>
+    <li><a href="<!--% absolute_url(baseurl) %-->hpr_opus_rss.php">opus</a>.</li>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_rss.php">mp3</a> Larger file size regular quality feed in a common format.</li>
+    <li><a href="<!--% absolute_url(baseurl) %-->hpr_ogg_rss.php">ogg</a>.</li>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_spx_rss.php">spx</a> Small file size lower quality feed. <br/>Ideal for dial-up/mobile connections.</li>
+    <li><a href="<!--% absolute_url(baseurl) %-->hpr_rss.php">mp3</a>.</li>
   </ul>
   <p>
   We also maintain an <a href="https://archive.org/details/hackerpublicradio">Archive.org</a> page where you can get the shows in even more formats. For more recent shows we are now including the original upload as delivered.
@@ -53,9 +53,9 @@
     Use this feed to get the archived episodes. The feed themselves run over 15Mb in size and so use them to download the archived episodes and when you are up to date switch back to the Two Week Feeds listed above.
   </p>
   <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_ogg_rss.php">ogg feed</a> Warning over 50G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_opus_rss.php">opus feed</a> Warning over 62G</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_spx_rss.php">spx feed</a> Warning over 22G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_ogg_rss.php">ogg feed</a> Warning over 71G</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_rss.php">mp3 feed</a> Warning over 36G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_rss.php">mp3 feed</a> Warning over 70G</li>
   </ul>
 </article>
 <article>
@@ -112,8 +112,8 @@
 <article>
   <header>
   <h1>Download Archive</h1>
-  <p>Please be aware that our Archive exceeds <strong>62Gb</strong> <em>(Ogg: 21Gb, Spx: 16Gb, mp3: 25Gb)</em>. We are happy for you to download them, but please make sure that you are not going to incur additional bandwidth charges on your side.</p>
+  <p>Please be aware that our Archive exceeds <strong>200Gb</strong></em>. We are happy for you to download them, but please make sure that you are not going to incur additional bandwidth charges on your side.</p>
-  <p>We will be happy to post you DVD's of the episodes anywhere in the world if bandwidth is an issue.</p>
+  <p>We will be happy to physically send episodes anywhere in the world if bandwidth is an issue.</p>
   </header>
   <h2>Full Episode Guide</h2>
   <p>

templates/content-twat_episode.tpl.html

@@ -45,7 +45,7 @@
 %-->
 <!--% episode_result = query_episodes.execute(id, id, id, id, id) %-->
 <!--% FOREACH episode IN episode_result %-->
-<!--% episode_navigation = step_navigation(baseurl,episode,"twat") %-->
+<!--% episode_navigation = step_navigation(baseurl,episode,"twt") %-->
 <article>
 	<header>
 		<h1><!--% episode.id %--> :: <!--% episode.title %--></h1>
@@ -53,7 +53,7 @@
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
-Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
+Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% day_and_date(episode.date) %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
 <!--% listen_now(episode, "twat", baseurl, media_baseurl) %-->
 <!--% display_listen_in(episode.id, "twat") %-->  

templates/page.tpl.html

@@ -23,14 +23,14 @@
   }
   </style>
   <link rel="shortcut icon" href="<!--% absolute_url(baseurl) %-->hpr.ico" >
+  <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="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 Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx_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="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="<!--% absolute_path(baseurl) %-->css/hpr.css" rel="stylesheet" />
+  <link href="/css/hpr.css" rel="stylesheet" />
   <!--[if IE]>
-  <link rel="stylesheet" href="<!--% absolute_path(baseurl) %-->css/hpr.css" media="screen" type="text/css" />
+  <link rel="stylesheet" href="/css/hpr.css" media="screen" type="text/css" />
   <script src="/JavaScript/html5.js"></script>
   <![endif]-->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.5, user-scalable=yes"/> 
@@ -67,7 +67,7 @@
 </main>
 
 <footer id="footer_page">
-  <h1 class="thick_bar"><span style="padding-left: 1em;">More Information...</span></h1>
+  <h1 class="thick_bar">More Information...</h1>
   <div id="more_info">
     <nav class="column">
       <h2>Ancestry</h2>
@@ -82,7 +82,7 @@
       <h2>Social</h2>
       <ul>
         <li><a href="<!--% absolute_url(baseurl,'/maillist') %-->" >Mailing list</a></li>
-        <li><a href="https://botsin.space/@hpr" >Mastodon</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>
@@ -114,7 +114,7 @@
       <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/explore/repos" >HPR Source Code</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>
@@ -133,7 +133,7 @@
       </ul>
     </nav>
   </div><!-- more_info -->
-  <h1 class="thick_bar"><span style="padding-left: 1em;">Copyright Information</span></h1>  
+  <h1 class="thick_bar">Copyright Information</h1>  
   <div id="copyright">
     <p>
     Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
@@ -141,7 +141,6 @@
     <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>
-    <hr />
   </div><!-- copyright -->
   <hr />
 </footer>

templates/rss-comments.tpl.xml

@@ -3,9 +3,10 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% USE date %-->
+<!--% USE HTML.Strip emit_spaces = 0 %-->
 <channel>
   <title>Hacker Public Radio ~ Comment Feed</title>
-  <link><!--% baseurl %-->about.html</link>
+  <link><!--% absolute_url(http_baseurl) %-->about.html</link>
   <description>Comments Feed: 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.</description>
   <language>en-us</language>
   <copyright>Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License</copyright>
@@ -15,14 +16,14 @@
   <docs>https://www.rssboard.org/rss-specification</docs>
   <ttl>600</ttl>
   <image>
-    <url><!--% baseurl %-->images/hpr_feed_small.png</url>
+    <url><!--% absolute_url(http_baseurl) %-->images/hpr_feed_small.png</url>
     <title>Hacker Public Radio ~ Comment Feed</title>
-    <link><!--% baseurl %-->about.html</link>
+    <link><!--% absolute_url(http_baseurl) %-->about.html</link>
     <description>The Hacker Public Radio Old Microphone Logo</description>
     <height>164</height>
     <width>144</width>
   </image>
-  <atom:link href="<!--% baseurl %-->comments.rss" rel="self" type="application/rss+xml" />  
+  <atom:link href="<!--% absolute_url(http_baseurl) %-->comments.rss" rel="self" type="application/rss+xml" />  
   <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
   <!--% FOREACH response IN DBI.query('SELECT max( comment_timestamp) AS latest_update FROM comments') %-->
   
@@ -49,15 +50,15 @@
   %-->
 
   <item>
-    <title><!--% item.comment_author_name %--> says: <!--% item.comment_title %--></title>
+    <title><!--% item.comment_author_name | html_strip | xml_entity %--> says: <!--% item.comment_title | html_strip | xml_entity %--></title>
-    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name %-->)</author>
+    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name | html_strip | xml_entity %-->)</author>
-    <link><!--% baseurl %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comments</link>
+    <link><!--% absolute_url(http_baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comments</link>
     <description><![CDATA[<strong>
-    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title %--></em> by <a href="<!--% baseurl %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) %--><br />
+    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title | html_strip | xml_entity %--></em> by <a href="<!--% absolute_url(http_baseurl) %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) | html_strip | xml_entity %--><br />
 <!--% display_episode_duration(item.episode_duration) %--><!--% display_listen_in(item.eps_id) %--><br /><!--% item.comment_text FILTER html_line_break %-->
 ]]></description>
     <pubDate><!--% format_feed_date(item.comment_timestamp) %--></pubDate>
-    <guid isPermaLink="false"><!--% baseurl %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comment_<!--% item.id %--></guid>
+    <guid isPermaLink="false"><!--% absolute_url(http_baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comment_<!--% item.id %--></guid>
   </item>
   <!--% END %-->
 </channel>

templates/shared-episode-summary.tpl.html

@@ -1,4 +1,5 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS 'shared-show-transcript.tpl.html' %-->
 
 <!--% MACRO rss_show_series(series, series_id)  IF series != "general" %-->
 from the series <em><a href="<!--% baseurl %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></em></a>.
@@ -24,10 +25,10 @@ from the series <em><a href="<!--% baseurl %-->series/<!--% zero_pad_left(series
  Listen in 
 <!--% IF episode_type == 'hpr' %-->
 <a href="<!--% media_path(eps_id, episode_type, 'ogg', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">ogg</a>,
-<a href="<!--% media_path(eps_id, episode_type, 'spx', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">spx</a>,
+<a href="<!--% media_path(eps_id, episode_type, 'opus', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">opus</a>,
 or 
 <!--% END %-->
-<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">mp3</a> format.
+<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">mp3</a> format. 
 <!--% END %-->
 
 <!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->
@@ -35,7 +36,7 @@ or
 <!--% END %-->
 
 <!--% MACRO show_meta(show, hide_tags) BLOCK %-->
-	<span><label>Released:</label> <!--% show.date %-->.</span> 
+<span><label>Released:</label> <!--% day_and_date(show.date) %-->.</span> 
 	<span><label>Duration:</label> <!--% display_episode_duration(show.duration) %-->.</span> 
 	<span><label>Flag:</label> <!--% display_explicit(show.explicit) %-->.</span> 
 	<span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
@@ -57,7 +58,7 @@ or
 
 <!--% MACRO twat_show_summary(show, hide_host) BLOCK %-->
 
-	<h3 class="title"><a href="<!--% absolute_path(baseurl) %-->eps/twat<!--% zero_pad_left(show.id) %-->/index.html">Today with a Techie Ep.<!--% show.id %--> :: <!--% show.title %--></a> <!--% IF hide_host == "" %--> 
+	<h3 class="title"><a href="<!--% absolute_path(baseurl) %-->eps/twt<!--% zero_pad_left(show.id) %-->/index.html">Today with a Techie Ep.<!--% show.id %--> :: <!--% show.title %--></a> <!--% IF hide_host == "" %--> 
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>

templates/shared-listen-now.tpl.html

@@ -1,4 +1,5 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
+<!--% PROCESS 'shared-show-transcript.tpl.html' %-->
 
 <!--% MACRO listen_now(episode, episode_type, baseurl, media_baseurl, hide_duration) BLOCK %-->
 <p><!--% display_listen_in(episode.id, episode_type) %--> Play now:<br>	
@@ -7,6 +8,7 @@
 		<source src="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->" type="audio/mpeg" >
 	</audio>
 	<!--% IF !hide_duration %--><br>
-	Duration: <!--% display_episode_duration(episode.duration) %--><!--% END %--></p>
+	Duration: <!--% display_episode_duration(episode.duration) %--><!--% END %-->
+	<!--% IF episode_type == "hpr" %--><br><!--% show_transcript(episode, episode_type, baseurl, media_baseurl) %--><!--% END %--></p>
 <!--% END %-->
 

templates/shared-show-transcript.tpl.html

@@ -1,14 +1,5 @@
 <!--% MACRO show_transcript(episode, episode_type, baseurl, media_baseurl) BLOCK %-->
-<h2>Show Transcript</h2>
+Download the <a href="<!--% media_path(episode.id, episode_type, 'txt', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(episode.id) %-->">transcription</a></li> and  
-<p>Automatically generated using <a href="https://github.com/openai/whisper">whisper</a>
+	<a href="<!--% media_path(episode.id, episode_type, 'srt', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(episode.id) %-->">subtitles</a>.
-<pre><code>whisper --model tiny --language en hpr<!--% zero_pad_left(episode.id) %-->.wav</code></pre></p>
-<p>
-You can save these subtitle files to the same location as the HPR Episode, and they will automatically show in players like <a href="https://mpv.io/">mpv</a>, <a href="https://www.videolan.org/vlc/">vlc</a>. Some players allow you to specify the subtitle file location.
-</p>
-<ul>
-	<li>Text: <a href="<!--% media_path(episode.id, episode_type, 'txt', baseurl, media_baseurl) %-->">hpr<!--% zero_pad_left(episode.id) %-->.txt</a></li> 
-	<li><a href="https://en.wikipedia.org/wiki/WebVTT">WebVTT</a>: <a href="<!--% media_path(episode.id, episode_type, 'vtt', baseurl, media_baseurl) %-->">hpr<!--% zero_pad_left(episode.id) %-->.vtt</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/SubRip">SubRip</a>: <a href="<!--% media_path(episode.id, episode_type, 'srt', baseurl, media_baseurl) %-->">hpr<!--% zero_pad_left(episode.id) %-->.srt</a></li>
-</ul>
 <!--% END %-->
 

templates/shared-utils.tpl.html

@@ -49,6 +49,15 @@
 <!--% iso8601_date.format(date_to_format) %-->
 <!--% END %-->
 
+<!--% MACRO day_from_date(eps_date) BLOCK %-->
+<!--% USE eps_day = date(format => '%A', locale => 'en_US', gmt => 1)  %-->
+<!--% eps_day.format("$eps_date 0:0:0") %-->
+<!--% END %-->
+
+<!--% MACRO day_and_date(eps_date) BLOCK %-->
+<!--% day_from_date(eps_date) %-->, <!--% eps_date %-->
+<!--% END %-->
+
 <!--% MACRO tag_to_id(tag, is_index) BLOCK %-->
 <!--% tag = tag.replace('\s+','_') %-->
 <!--% IF is_index %-->
@@ -85,6 +94,7 @@
 
 <!--% MACRO media_path(episode_id, episode_type, media_type, baseurl, media_baseurl) BLOCK %-->
         <!--% IF episode_type == "twat" %-->
+                <!--% episode_type = "twt" %-->
                 <!--% padding = 3 %-->
                 <!--% media_folder = "eps/"; padding = 3 %-->
         <!--% ELSE %-->
@@ -98,7 +108,7 @@
                         <!--% media_baseurl = "${media_baseurl}hpr\$eps_id/" %-->
                 <!--% END %-->
                 <!--% media_folder = "" %-->
-                <!--% media_baseurl = media_baseurl.replace('\$eps_id', zero_pad_left(episode_id)) %-->
+                <!--% media_baseurl = media_baseurl.replace('hpr\$eps_id', episode_type _ zero_pad_left(episode_id, padding)) %-->
         <!--% END %-->
         <!--% media_basepath(baseurl, media_baseurl) %--><!--% media_folder %--><!--% episode_type %--><!--% zero_pad_left(episode_id, padding) %-->.<!--% media_type %-->
 <!--% END %-->