Merge pull request 'Add missing small HPR logo file for RSS feeds' (#326) from i323_HPR-podcast-feeds-missing-microphone-logo into main

Reviewed-on: #326

_sql/sqlite/Rename_twt_table.sql

@@ -0,0 +1 @@
+ALTER TABLE twat_eps RENAME TO twt_eps;

templates/content-correspondent.tpl.html

@@ -31,7 +31,8 @@
 					<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
 					<p><a href="<!--% absolute_url(baseurl,'//correspondents') %-->/<!--% zero_pad_left(this_host.hostid) %-->/playlist.m3u8">Download the M3U playlist</a>.</p>
 				</div>
-				<div class="lane stack">
+			</div>
+			<div id="episodes" class="lane stack">
 				<!--% FOREACH hpr_show IN hpr_shows; %-->
 				<article>
 					<!--% show_summary(hpr_show, 'hide_host') %-->

templates/content-correspondents.tpl.html

@@ -18,7 +18,7 @@
 		from hosts as h 
 		inner join (select hostid, max(date) as date from eps group by hostid) as e 
 		on h.hostid = e.hostid
-		order by h.host'
+		order by h.host COLLATE NOCASE asc'
 	) %-->
 	<tr class="lane">
 	<td><!--% get_avatar(host.hostid, host.host, host_cnt > 8) %--></td>

templates/content-episode.tpl.html

@@ -61,11 +61,11 @@ Subscribe to the comments <a href="<!--% absolute_path(baseurl) %-->comments.rss
         <h2>Leave Comment</h2>
         <p>
         <strong>Note to Verbose Commenters</strong><br />
-        If you can't fit everything you want to say in the comment below then you really should <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a response show instead.
+        If you can't fit everything you want to say in the comment below then you really should <a href="<!--% absolute_url(baseurl) %-->../../about.html#so_you_want_to_record_a_podcast">record</a> a response show instead.
         </p>
         <p>
         <strong>Note to Spammers</strong><br />
-		All comments are moderated. All links are checked by humans. We strip out all html. Feel free to <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a show about yourself, or your industry, or any other topic we may find interesting. <em>We also check shows for spam :)</em>.
+		All comments are moderated. All links are checked by humans. We strip out all html. Feel free to <a href="<!--% absolute_url(baseurl) %-->../../about.html#so_you_want_to_record_a_podcast">record</a> a show about yourself, or your industry, or any other topic we may find interesting. <em>We also check shows for spam :)</em>.
         </p>
         <form method="POST" action="<!--% hub_baseurl %-->comment_confirm.php">
         <fieldset>

templates/content-episodes.tpl.html

@@ -29,7 +29,7 @@
         hosts.hostid, 
         hosts.host, hosts.email, hosts.local_image, 
 		miniseries.name AS series, miniseries.id AS seriesid
-    FROM twat_eps as eps
+    FROM twt_eps as eps
 	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
 	ORDER BY eps.id DESC

templates/content-index-announcement.tpl.html

@@ -1 +1,19 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
+<div class="lane stack">
+	<article>
+		<header>
+			<h2 class="title"><a href="/eps/hpr3246/index.html">The Fourteenth Annual 26 Hour New Year's Eve Show</a> 	</h2>
+		</header>
+		<h3>Welcome every <a href="https://www.timeanddate.com/counters/multicountdown.html">TimeZone</a>!</h3>
+		<p>
+		<em>If you keep talking, we'll keep recording.</em>
+		</p>
+		<p>For those who don't know, on New Year's Eve 2025-12-31 10:00 UTC (5:00 AM EST), we will have a recording going on the HPR Mumble server for anyone to come on and say "Happy New Year" and talk about whatever they want. 
+		We will leave the recording going until at least 2026-01-01 12:00 UTC (7:00 AM EST), and keep recording until the conversation stops.</p>
+		<p>
+		So please stop in. Say "Hi" and maybe join in the conversation with other HPR listeners and contributors. It's always a good time!!<br>
+		<a href="https://hackerpublicradio.org/eps/hpr3246/index.html">More Information…</a>
+		</p>
+
+	</article>
+</div>

templates/content-index.tpl.html

@@ -3,7 +3,6 @@
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
 <!--% PROCESS 'shared-show-transcript.tpl.html' %-->
 <!--% PROCESS 'shared-call_for_shows.tpl.html' %-->
-<!--% INCLUDE 'content-index-announcement.tpl.html' %-->
 <!--% PROCESS "queries-index.tpl.html" %-->
 <!--% MACRO tidy_notes(all_lines) BLOCK %-->
 <!--% lines = all_lines %-->
@@ -37,6 +36,7 @@
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
 	<section id="welcome">
 		<p>Hacker Public Radio is a technology focused podcast that releases shows every weekday Monday to Friday. Our shows are produced by listeners like you and can be on any topic that is of interest to hackers, makers, hobbyists, etc. We are a welcoming community that offers positive feedback and encourages respectful debate.</p>
+<!--% INCLUDE 'content-index-announcement.tpl.html' %-->
 		<div id="call_for_shows">
 			<!--% display_call_for_shows() %-->
 		</div>
@@ -104,6 +104,7 @@
 <!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->
 	</dl>
+	<p><a href="<!--% absolute_path(baseurl) %-->eps/index.html">More Episodes…</a></p>
   </section>
   <section id="latest_comments">
 	<header><h2>Latest Comments</h2></header>
@@ -138,5 +139,6 @@
 	<dd>on hpr<!--% item.eps_id %--> (<!--% item.episode_date %-->) "<!--% item.episode_title %-->" by <!--% item.host %--></dd>
 <!--% END %-->
 	</dl>
+	<p><a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">More Comments…</a></p>
   </section>
   </section>

templates/content-twt_episode.tpl.html

@@ -6,23 +6,23 @@
 <!--% query_episodes = DBI.prepare('
 		WITH episode_maxmin AS (
 					SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
-					FROM twat_eps AS eps
+					FROM twt_eps AS eps
 		),
 		episode_date AS (
 			SELECT eps.date 
-			FROM twat_eps AS eps
+			FROM twt_eps AS eps
 			WHERE eps.id = ?
 		),
 		episode_previous AS (
 			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM twat_eps AS eps
+			FROM twt_eps AS eps
 			INNER JOIN episode_date
 			ON eps.date < episode_date.date
 			WHERE eps.id > 1
 		),
 		episode_next AS (
 			SELECT MIN(id) AS \'next\', ? AS \'id\'
-			FROM twat_eps AS eps
+			FROM twt_eps AS eps
 			INNER JOIN episode_date
 				ON eps.date > episode_date.date
 		)
@@ -34,7 +34,7 @@
 			   hosts.hostid, hosts.host,
 			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
 			   miniseries.description AS \'series_description\'
-		FROM twat_eps AS eps
+		FROM twt_eps AS eps
 		INNER JOIN hosts ON eps.hostid = hosts.hostid
 		INNER JOIN miniseries ON eps.series = miniseries.id
 		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id

templates/ids-twt_episode.tpl.html

@@ -1,6 +1,6 @@
 <!--% USE DBI(constants.driver) %-->
 <!--% FOREACH episode IN DBI.query(
-	'select eps.id from twat_eps AS eps'
+	'select eps.id from twt_eps AS eps'
 ) %-->
 ,<!--% episode.id %-->
 <!--% END %-->

templates/queries-correspondent.tpl.html

@@ -33,7 +33,7 @@
 %-->
 <!--% query_twt_show_count = '
 		SELECT COUNT(id) as Tally
-		FROM twat_eps AS eps
+		FROM twt_eps AS eps
 		WHERE eps.hostid = ?
 		'
 %-->
@@ -48,7 +48,7 @@
 			hosts.hostid,
 			hosts.host, hosts.email, hosts.profile,
 			miniseries.name AS series, miniseries.id AS seriesid
-		FROM twat_eps AS eps
+		FROM twt_eps AS eps
 		INNER JOIN hosts ON eps.hostid = hosts.hostid
 		INNER JOIN miniseries ON eps.series = miniseries.id
 		WHERE hosts.hostid = ?

templates/queries-tags.tpl.html

@@ -1 +1 @@
-<!--% query_tags = 'SELECT id, tags FROM eps' %-->
+<!--% query_tags = 'SELECT id, tags FROM eps WHERE eps.date <= date(\'now\')' %-->