Merge pull request '[i237] Remove Show Transcrip from after show notes to before show notes' (#243) from i237_Remove-Show-Transcript-from-end-of-ep-pages into main

Reviewed-on: #243

templates/content-episode.tpl.html

@@ -28,7 +28,6 @@ Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pa
 	</header>
 	<div><!--% episode.notes %--></div>
 <footer>
-<!--% show_transcript(episode, "hpr", baseurl, media_baseurl) %-->
 <p>
 <!--% episode_navigation %-->
 </p>

templates/content-index.tpl.html

@@ -63,9 +63,6 @@
 		</p>
 	</header>
 		<!--% tidy_notes(latest_episodes.notes) %-->
-	<footer>
-	<!--% show_transcript(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-	</footer>
 </article>
 <!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->

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,7 +25,7 @@ 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. 

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