Merge pull request 'i240_Rename-Today-with-a-Techie-folder' (#241) from i240_Rename-Today-with-a-Techie-folder into main

Reviewed-on: HPR/hpr_generator#241

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
 
@@ -121,8 +119,7 @@ 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
-media_baseurl: https://www.hackerpublicradio.org/eps/
+filename: eps/twt[id]/index.html
 
 [mumble-howto]
 navigation: navigation-about.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 />
-    <em>As an anti-spam measure you will get an error back but we do get your email.</em></li>
-    <li>Website: <a href="<!--% absolute_url(baseurl,'') %-->" ><!--% absolute_url(baseurl,'') %--></a></li>
-    <li>Maillist: <a href="<!--% absolute_url(baseurl,'/maillist') %-->">Mailing list</a></li>
+    <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 />
+    <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-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> 

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>

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-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

@@ -28,9 +28,9 @@
   <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"/> 
@@ -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>

templates/shared-episode-summary.tpl.html

@@ -35,7 +35,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 +57,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-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 %-->