Merge pull request '[i299] fix auto scroll highlighting of code blocks' (#302) from i299_fix-auto-scroll-highlighting-of-code-blocks into main

Reviewed-on: #302

public_html/css/hpr.css

@@ -755,9 +755,12 @@ 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

@@ -171,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,7 +29,7 @@
 					<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 class="lane stack">
 				<!--% FOREACH hpr_show IN hpr_shows; %-->

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