Fix layout of episode nav links on small displays

Reduce horizontal padding on small displays to prevent
navigation from overflowing width of screen.

_sql/sqlite/Rename_twt_table.sql

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

public_html/css/hpr.css

@@ -403,9 +403,6 @@ article > p,
 	font-size: var(--default-header-4-font-size);
 	margin-left: 22px;
 }
-.lane.stack > article > footer {
-	margin-bottom: 1rem;
-}
 a.lane-button {
 	display: flex;
 	flex-direction: column;
@@ -736,13 +733,10 @@ fieldset > table td input[type="radio"] {
 	padding: 0;
 }
 .series-description {
-	margin: 0 0 1rem 0;
+	margin: 0;
 	padding: 0;
 	font-style: italic;
 }
-.series-desciption > *:last-child {
-	margin-bottom: 0;
-}
 .sr-only {
 	position: absolute;
 	width: 1px;
@@ -758,12 +752,9 @@ fieldset > table td input[type="radio"] {
 }
 #show_notes pre
 {
-    overflow: auto;
-}
-#show_notes code {
-	display: inline-block;
     background-color: var(--show-notes-pre-background);
     border: 1px solid #ddd;
+    overflow: scroll;
 	padding: 0.1em 0;
 } 
 nav.episodes {

site.cfg

@@ -130,10 +130,6 @@ content: content-promote.tpl.html
 navigation: navigation-about.tpl.html
 content: content-comments_viewer.tpl.html
 
-[new_year]
-navigation: navigation-about.tpl.html
-content: content-new_year.tpl.html
-
 [hpr_ogg]
 root_template: rss.tpl.xml
 content: rss-hpr.tpl.xml
@@ -175,15 +171,3 @@ media_file_extension: spx
 [comments]
 root_template: rss-comments.tpl.xml
 filename: comments.rss
-
-[correspondent_m3u]
-root_template: m3u.tpl.m3u8
-content: m3u-correspondent.tpl.m3u8
-filename: correspondents/[id]/playlist.m3u8
-multipage: true
-
-[series_episodes_m3u]
-root_template: m3u.tpl.m3u8
-content: m3u-series_episodes.tpl.m3u8
-filename: series/[id].m3u8
-multipage: true

templates/content-correspondent.tpl.html

@@ -29,10 +29,9 @@
 					<p><label>email:</label> <u><!--% this_host.email %--></u></p>
 					<div><label>profile:</label> <!--% this_host.profile %--></div>
 					<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>
-			<div id="episodes" class="lane stack">
+			<div 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 COLLATE NOCASE asc'
+		order by h.host'
 	) %-->
 	<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 twt_eps as eps
+    FROM twat_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,4 +1 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% IF date.format(date.now, '%m') == 12 || date.format(date.now, '%j') == 1 %-->
-	<!--% PROCESS 'content-new_year_show_announcement.tpl.html' %-->
-<!--% END %-->

templates/content-index.tpl.html

@@ -3,6 +3,7 @@
 <!--% 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 %-->
@@ -36,7 +37,6 @@
 	<!--% 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>
-<!--% PROCESS 'content-index-announcement.tpl.html' %-->
 		<div id="call_for_shows">
 			<!--% display_call_for_shows() %-->
 		</div>
@@ -104,7 +104,6 @@
 <!--% 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>
@@ -139,6 +138,5 @@
 	<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-new_year.tpl.html

@@ -1,64 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-
-<h1><u>The <!--% get_new_year_show_ordinal_year %--> Annual 26 Hour New Year's Eve Show</u></h1>
-<h2>Welcome every <a href="https://www.timeanddate.com/counters/multicountdown.html">TimeZone</a>!</h2>
-<p>
-<em>If you keep talking, we'll keep recording.</em>
-</p>
-<p>For those who don't know, on New Year's Eve <!--% get_new_year_show_start() %-->, 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 <!--% get_new_year_show_end() %-->, 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 />
-</p>
-
-<h2>History</h2>
-
-<p>Suggested by <a href="https://hackerpublicradio.org/correspondents/0128.html">pokey</a> in 2011.
-As podcasting tends to be a one way conversation, he thought it would be nice to get all the FLOSS, Linux, Free Culture, podcasters and Listeners in one place to get together and chat in person.
-Initially it was planned to be just a few hours, but we kept missing members from other parts of the world. 
-The show was extended to welcome ever time zone to the New Year, which actually turns out to be <a href="https://en.wikipedia.org/wiki/List_of_UTC_offsets">38 Timezones</a>, over 26 Hours.</p>
-
-<p>So we will record for at least 26 Hours, but will keep the recording going for an "After Show".
-Some years the after show has been even longer than the show itself.
-While this is on the HPR Site, it is entirely a community initiative which is supported heavily by the fine folks over at the <a href="https://linuxlugcast.com/">LinuxLugCast</a>, with the Mumble Server been provided by <a href="https://hackerpublicradio.org/correspondents/0228.html">Delwin</a>.</p>
-
-<h2>Ground Rules</h2>
-<h3>Use Push to Talk, and a Headset</h3>
-
-<p>With so many people on the chat, you must use push to talk. 
-You also need to use a Headset so the audio of the room is not fed back. 
-If there is a problem with your setup, then please drop and listen to the stream. 
-Trying to correct poor audio in post is a lot of work, that someone else will have to do.</p>
-
-<h3>Be Polite</h3>
-
-<p>When you enter the room please do not interrupt ongoing conversations. 
-Wait for a pause in the conversation and say Hi.
-It's quite common for people you might not know to join as they wish to speak with other people in the room. 
-They may have been waiting all year for the chance to meet, so please give people the space to have these conversations.</p>
-
-<h3>Do not announce the Time Zones</h3>
-
-<p>As there are so <a moz-do-not-send="true" href="https://en.wikipedia.org/wiki/Time_zone">many Time Zones</a> there is no need to interrupt the conversation to announce every one. 
-If you are joining from a time zone that is currently switching to the New Year, then please wait for a pause and wish people Happy New Year.</p>
-
-<h3>Don't Fill Dead Air</h3>
-
-<p>This is a relaxed meet-up, and not a traditional "Radio Broadcast". 
-If there are no conversations going on at a given time, don't feel the need to "fill dead air". 
-Before the recording is posted as a podcast the <a href="https://manual.audacityteam.org/man/truncate_silence.html">silences will be truncated</a>.</p>
-
-<h3>Do not monopolise the conversation</h3>
-
-<p>Please be mindful that you (or your beverage of choice) may be speaking too much ;-).</p>
-
-<h3>You are a Guest</h3>
-
-<p>Be respectful, and remember that attendance on the New Year Show does not <a href="https://hub.hackerpublicradio.org/calendar.php">constitute a show</a>.</p>
-
-<h3>CC-BY-SA</h3>
-
-<p>The recording will be released as a podcast on HPR 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. 
-The recordings will be released mid year, when there is a lull in submissions.</p>
-
-

templates/content-new_year_show_announcement.tpl.html

@@ -1,22 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<div class="lane stack">
-	<article>
-		<header>
-			<h2 class="title"><a href="<!--% absolute_path(baseurl) %-->new_year.html">The <!--% get_new_year_show_ordinal_year %--> 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 <!--% get_new_year_show_start() %-->, 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 <!--% get_new_year_show_end() %-->, 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>
-		<audio controls preload="none">
-			<source src="<!--% absolute_path(baseurl) %-->promos/hpr-nye-promo.ogg" type="audio/ogg">
-		</audio>
-		</p>
-		<p><a href="<!--% absolute_path(baseurl) %-->new_year.html">More information…</a></p>
-
-	</article>
-</div>

templates/content-series.tpl.html

@@ -13,7 +13,6 @@
 		<li>Date of earliest show: <!--% series.earliest_show %--></li>
 		<li>Date of latest show: <!--% series.latest_show %--></li>
 		<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->">mp3</a></li>
-		<li><a href="<!--% absolute_url(baseurl,'//series') %-->/<!--% zero_pad_left(series.id) %-->.m3u8">Download the M3U playlist</a></li>
 	</ul>
 	<div class="series-description"><!--% series.description %--></div>
   </article>

templates/content-series_episode.tpl.html

@@ -13,7 +13,6 @@
 	<li>Date of earliest show: <!--% series.earliest_show %--></li>
 	<li>Date of latest show: <!--% series.latest_show %--></li>
 	<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->&full=1&gomax=1">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->&full=1&gomax=1">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->&full=1&gomax=1">mp3</a></li>
-	<li><a href="<!--% absolute_url(baseurl,'//series') %-->/<!--% zero_pad_left(series.id) %-->.m3u8">Download the M3U playlist</a></li>
 </ul>
 <p><em><!--% series.description %--></em></p>
 <section id="series_episodes" class="lane stack">

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 twt_eps AS eps
+					FROM twat_eps AS eps
 		),
 		episode_date AS (
 			SELECT eps.date 
-			FROM twt_eps AS eps
+			FROM twat_eps AS eps
 			WHERE eps.id = ?
 		),
 		episode_previous AS (
 			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM twt_eps AS eps
+			FROM twat_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 twt_eps AS eps
+			FROM twat_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 twt_eps AS eps
+		FROM twat_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-correspondent_m3u.tpl.html

@@ -1,7 +0,0 @@
-<!--% USE DBI(constants.driver) %-->
-<!--% FOREACH host IN DBI.query(
-	'select h.hostid from hosts as h'
-) %-->
-,<!--% host.hostid %-->
-<!--% END %-->
-

templates/ids-series_episodes_m3u.tpl.html

@@ -1,7 +0,0 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% FOREACH series IN DBI.query(
-	'select s.id from miniseries as s'
-) %-->
-,<!--% series.id %-->
-<!--% END %-->
-

templates/ids-twt_episode.tpl.html

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

templates/m3u-correspondent.tpl.m3u8

@@ -1,24 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'queries-correspondent.tpl.html' %-->
-<!--% USE DBI(constants.driver) %-->
-<!--% results_hpr_shows = DBI.prepare(query_hpr_shows) %-->
-<!--% hpr_shows = results_hpr_shows.execute(id); %-->
-<!--% FOREACH hpr_show IN hpr_shows; %-->
-#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
-
-
-<!--% media_path(hpr_show.id, 'hpr', 'mp3', baseurl, media_baseurl) %-->
-
-
-<!--% END %-->
-<!--% results_hpr_shows = DBI.prepare(query_twt_shows) %-->
-<!--% twt_result_status = results_twt_show_count.execute(id); %-->
-<!--% twt_shows = results_hpr_shows.execute(id); %-->
-<!--% FOREACH hpr_show IN twt_shows; %-->
-#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
-
-
-<!--% media_path(hpr_show.id, 'twt', 'mp3', baseurl, media_baseurl) %-->
-
-
-<!--% END %-->

templates/m3u-series_episodes.tpl.m3u8

@@ -1,13 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'queries-series_episodes.tpl.html' %-->
-<!--% USE DBI(constants.driver) %-->
-<!--% results_hpr_shows = DBI.prepare(query_shows_sql) %-->
-<!--% hpr_shows = results_hpr_shows.execute(id); %-->
-<!--% FOREACH hpr_show IN hpr_shows; %-->
-#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
-
-
-<!--% media_path(hpr_show.id, 'hpr', 'mp3', baseurl, media_baseurl) %-->
-
-
-<!--% END %-->

templates/m3u.tpl.m3u8

@@ -1,2 +0,0 @@
-#EXTM3U
-<!--% INCLUDE $content %-->

templates/queries-correspondent.tpl.html

@@ -33,7 +33,7 @@
 %-->
 <!--% query_twt_show_count = '
 		SELECT COUNT(id) as Tally
-		FROM twt_eps AS eps
+		FROM twat_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 twt_eps AS eps
+		FROM twat_eps AS eps
 		INNER JOIN hosts ON eps.hostid = hosts.hostid
 		INNER JOIN miniseries ON eps.series = miniseries.id
 		WHERE hosts.hostid = ?

templates/queries-series_episodes.tpl.html

@@ -14,24 +14,14 @@
 		 WHERE miniseries.id = ?
 		 ORDER BY name'
 %-->
-<!--% query_shows_sql = 'WITH
-	comment_tallies AS (	
-		SELECT 
-			eps_id,
-			COUNT(eps_id) AS eps_tally
-		FROM comments
-		GROUP BY eps_id 
-	)
-	SELECT
+<!--% query_shows_sql = 'SELECT
 	id, date, title,
 	duration, summary, notes,
 	explicit, eps.license, tags,
-	hosts.host, hosts.hostid,
-	COALESCE(comment_tallies.eps_tally,0) AS commentsTally
+	hosts.host, hosts.hostid
 	FROM eps
 	INNER JOIN hosts
 	ON eps.hostid = hosts.hostid
-	LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 	WHERE series = ? AND eps.date < date(\'now\', \'+1 days\')
 	ORDER BY eps.id DESC
 	'

templates/queries-tags.tpl.html

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

templates/shared-utils.tpl.html

@@ -134,52 +134,3 @@
     <!--% END %-->
 	<span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.latest) %-->/index.html" rel="last" aria-label="latest episode">Latest<span class="no-css"> &gt;&gt;</span><!--% INSERT $arrow_last %--></a></span></nav>
 <!--% END %-->
-
-<!--% MACRO get_new_year_show_start BLOCK %-->
-<!--% start_year = date.format(date.now, '%Y') %-->	
-<!--% IF date.format(date.now, '%m') != 12 || date.format(date.now, '%j') == 1 %-->
-	<!--% start_year = start_year - 1 %-->
-<!--% END %-->
-	<time datetime="<!--% start_year %-->-12-31T10:00Z"><!--% start_year %-->-12-31 10:00 UTC (5:00 AM EST)</time>
-<!--% END %--> 
-
-<!--% MACRO get_new_year_show_end BLOCK %-->
-<!--% end_year = date.format(date.now, '%Y') %-->	
-<!--% IF date.format(date.now, '%m') == 12 || date.format(date.now, '%j') == 1 %-->
-	<!--% end_year = end_year + 1 %-->
-<!--% END %-->
-	<time datetime="<!--% end_year %-->-01-01T12:00Z"><!--% end_year %-->-01-01 12:00 UTC (7:00 AM EST)</time>
-<!--% END %-->
-
-<!--% MACRO get_new_year_show_ordinal_year BLOCK %-->
-<!--% ordinal_year = date.format(date.now, '%Y') - 2011 %-->
-<!--% IF date.format(date.now, '%m') != 12 || date.format(date.now, '%j') == 1 %-->
-	<!--% ordinal_year = ordinal_year - 1 %-->
-<!--% END %-->
-<!--% years.0 = 'th'
-	  years.1 = 'st'
-	  years.2 = 'nd'
-	  years.3 = 'rd'
-	  years.4 = 'th'
-	  years.5 = 'th'
-	  years.6 = 'th'
-	  years.7 = 'th'
-	  years.8 = 'th'
-	  years.9 = 'th'
-	  years.14 = 'Fourteenth'
-	  years.15 = 'Fifteenth' 
-	  years.16 = 'Sixteenth' 
-	  years.17 = 'Seventeenth' 
-	  years.18 = 'Eighteenth' 
-	  years.19 = 'Nineteenth' 
-	  years.20 = 'Twentieth'
-	  years.30 = 'Thirtieth'
-	  years.40 = 'Fortieth' 
-	  years.50 = 'Fiftieth' %-->
-<!--% index = ordinal_year % 10 %-->
-<!--% IF ordinal_year < 21 || (index == 0 && ordinal_year < 51) %-->
-	<!--% years.$ordinal_year %-->
-<!--% ELSE %-->
-<!--% ordinal_year %--><sup><!--% years.$index %--></sup>
-<!--% END %-->
-<!--% END %-->