Merge pull request '[I37] Fix display of meta data on the episode page' (#38) from I37_Fix-display-meta-data-episode-page into main

Reviewed-on: rho_n/hpr_generator#38

templates/content-episode.tpl.html

@@ -26,6 +26,13 @@
 			INNER JOIN episode_date
 				ON eps.date > episode_date.date
 			WHERE eps.date < date (\'now\')
+		),
+		comment_tallies AS (	
+			SELECT 
+				eps_id,
+				COUNT(eps_id) AS eps_tally
+			FROM comments
+			GROUP BY eps_id 
 		)
 		SELECT eps.id, eps.date, eps.title, eps.duration, 
 			   eps.summary, eps.notes, eps.explicit, eps.license, 
@@ -33,13 +40,16 @@
 			   episode_maxmin.latest, episode_maxmin.earliest,
 			   episode_previous.previous, episode_next.next,
 			   hosts.hostid, hosts.host,
-			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\'
+			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
+			   miniseries.description AS \'series_description\',
+			   COALESCE (comment_tallies.eps_tally, 0) AS eps_tally 
 		FROM 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
 		INNER JOIN episode_previous ON eps.id = episode_previous.id
 		INNER JOIN episode_next ON eps.id = episode_next.id
+		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 		WHERE eps.id = ?
 	')
 %-->
@@ -54,10 +64,31 @@
 		</p>
 <p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
 <img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
-Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a>. <!--% show_meta(episode) %--></p>
+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>
+<!--% display_tags(episode.tags) %--> <br>
+<!--% display_listen_in(episode.id) %--> | 
+<!--% display_comments_tally(episode.id, episode.eps_tally) %-->
+</p>
+<h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
+<p><em><!--% episode.series_description %--></em></p>
 	</header>
 	<div><!--% episode.notes %--></div>
-</article>
+<footer>
+<h2>Listen Now</h2>
+<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
+<audio controls preload="none">
+	<source src="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.ogg" type="audio/ogg" >
+	<source src="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.mp3" type="audio/mpeg" >
+</audio>
+<ul>
+<li>ogg: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.ogg">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.ogg</a></li>
+<li>spx: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.spx">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.spx</a></li>
+<li>mp3: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.mp3">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.mp3</a></li>
+</ul>
+<p>
+<!--% episode_navigation %-->
+</p>
+    </footer></article>
 <!--% END %-->
 <hr />
 <h1>Comments</h1>
@@ -83,9 +114,6 @@ Subscribe to the comments <a href="https://www.hackerpublicradio.org/comments_rs
 <!--% comment_index = comment_index + 1 %-->
 <!--% END %-->
 
-<p>
-<!--% episode_navigation %-->
-</p>
         <h2>Leave Comment</h2>
         <p>
         <strong>Note to Verbose Commenters</strong><br />

templates/content-index.tpl.html

@@ -56,9 +56,9 @@
 		<p class="meta"$><!--% IF get_avatar(latest_episodes.hostid) != 'hpr_logo.png' %-->
 		<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><!--% END %-->
 	<br>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>
-<strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
+<!--% display_tags(latest_episodes.tags) %--><br>
-<small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %-->
+<small><!--% display_listen_in(latest_episodes.id) %--> <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--> | 
-	<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html#comments">Comments (<!--% latest_episodes.eps_tally %-->)</a>.</small>
+<!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></small>
 		</p>
 	</header>
 		<!--% latest_episodes.notes %-->

templates/shared-episode-summary.tpl.html

@@ -1,12 +1,27 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 
-<!--% MACRO show_series(series, series_id)  IF series != "" %-->
+<!--% MACRO show_series(series, series_id, label)  IF series != "" %-->
-	<label>Series:</label> <a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></a>.
+<!--% IF label == "" %-->
+<!--% label = "Series" %-->
+<!--% END %-->
+	<label><!--% label %-->:</label> <a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></a>.
+<!--% END %-->
+
+<!--% MACRO display_tags(tags) BLOCK %-->
+	<span><label>Tags:</label> <em><!--% tags %--></em>.</span>
+<!--% END %-->
+
+<!--% MACRO display_listen_in(eps_id) BLOCK %-->
+Listen in <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.ogg">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.spx">spx</a>, or <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.mp3">mp3</a> format.
+<!--% END %-->
+
+<!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->
+<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(eps_id) %-->/index.html#comments">Comments (<!--% tally %-->)</a>.
 <!--% END %-->
 
 <!--% MACRO show_meta(show) BLOCK %-->
 	<span><label>Released:</label> <!--% 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>
-	<span><label>Tags:</label> <em><!--% show.tags %--></em>.</span>
+	<!--% display_tags(tags) %-->
 <!--% END %-->
 
 <!--% MACRO show_summary(show, hide_host) BLOCK %-->