From dc4377d58842e89b10188583c9beee904108a57a Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 1 Apr 2023 19:29:00 -0400
Subject: [PATCH 1/8] Add arial-title attribute to episode download links

---
 templates/shared-episode-summary.tpl.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 7ac1b84..d190088 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -19,11 +19,11 @@ from the series <em><a href="<!--% baseurl %-->series/<!--% zero_pad_left(series
 <!--% IF episode_type == "" %--><!--% episode_type = 'hpr' %--><!--% END %-->
  Listen in 
 <!--% IF episode_type == 'hpr' %-->
-<a href="<!--% media_path(eps_id, episode_type, 'ogg', baseurl, media_baseurl) %-->">ogg</a>,
-<a href="<!--% media_path(eps_id, episode_type, 'spx', baseurl, media_baseurl) %-->">spx</a>,
+<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>,
 or 
 <!--% END %-->
-<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->">mp3</a> format.
+<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.
 <!--% END %-->
 
 <!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->

From f045cdd32fc3ffcb06f940c60ad385414f055bc4 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 1 Apr 2023 19:34:09 -0400
Subject: [PATCH 2/8] Update display_comments_tally MACRO

Display on the number of comments. Show a message
when the show has now comments.
---
 templates/shared-episode-summary.tpl.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index d190088..5020bf2 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -27,7 +27,7 @@ or
 <!--% 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>.
+<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(eps_id) %-->/index.html#comments" aria-label="Comments for hpr<!--% zero_pad_left(eps_id) %-->"><!--% IF tally > 0 %--><!--% tally %--><!--% ELSE %-->(Be the first)<!--% END %--></a>.
 <!--% END %-->
 
 <!--% MACRO show_meta(show, hide_tags) BLOCK %-->

From 24c2f9044e0adabc067e1936974d394e714d67d8 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 1 Apr 2023 19:37:38 -0400
Subject: [PATCH 3/8] Update show_meta MACRO

Display comments as part of the show meta data
---
 templates/shared-episode-summary.tpl.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 5020bf2..377b6f1 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -31,8 +31,14 @@ or
 <!--% END %-->
 
 <!--% MACRO show_meta(show, hide_tags) 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>
-	<!--% IF hide_tags == "" %--><!--% display_tags(tags) %--><!--% END %-->
+	<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>
+	<!--% IF hide_tags == "" %--><!--% display_tags(show.tags) %--><!--% END %-->
+	<!--% IF show.comentsTally || show.commentsTally == 0 %-->
+	<span><label>Comments:</label> <!--% display_comments_tally(show.id, show.commentsTally) %--></span>
+	<!--% END %-->
 <!--% END %-->
 
 <!--% MACRO show_summary(show, hide_host) BLOCK %-->

From a9c4388cb01067ea00dd2d74ce3994c3619be667 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 1 Apr 2023 19:56:11 -0400
Subject: [PATCH 4/8] Update listen_now MACRO

The ability to download and play the episode is being moved up in the episode description. Display content in a more condensed form.
---
 templates/shared-listen-now.tpl.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/templates/shared-listen-now.tpl.html b/templates/shared-listen-now.tpl.html
index a6f961a..9aaafac 100644
--- a/templates/shared-listen-now.tpl.html
+++ b/templates/shared-listen-now.tpl.html
@@ -1,16 +1,12 @@
-<!--% MACRO listen_now(episode, episode_type, baseurl, media_baseurl) BLOCK %-->
-	<h2>Listen Now</h2>
-	<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
+<!--% PROCESS 'shared-episode-summary.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>	
 	<audio controls preload="none">
 	<source src="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->" type="audio/ogg" >
 		<source src="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->" type="audio/mpeg" >
 	</audio>
-	<ul>
-<!--% IF episode_type != "twat" %-->
-		<li>ogg: <a href="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %--></a></li>
-		<li>spx: <a href="<!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %--></a></li>
-<!--% END %-->
-		<li>mp3: <a href="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %--></a></li>
-	</ul>
+	<!--% IF !hide_duration %--><br>
+	Duration: <!--% display_episode_duration(episode.duration) %--><!--% END %--></p>
 <!--% END %-->
 

From c6e909523f7e8f01ad7098a2a3cb8b284bade2d3 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sun, 2 Apr 2023 07:24:43 -0400
Subject: [PATCH 5/8] Add requested audio links

Have links to an episodes auido files appear in the Last 5 weeks section of the index page, on the full index page, and on individual host pages.
---
 templates/content-correspondent.tpl.html | 6 ++++--
 templates/content-episodes.tpl.html      | 1 +
 templates/content-index.tpl.html         | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index afe67a6..a99ce48 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -62,11 +62,13 @@
 		</p>
 	<!--% FOREACH hpr_show IN hpr_shows; %-->
 
-		<!--% show_summary(hpr_show, 'hide_host') %-->
-    <!--% END %-->
+	<!--% show_summary(hpr_show, 'hide_host') %-->
+    <p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
+	<!--% END %-->
 	<!--% FOREACH twat_show IN twat_shows; %-->
 
 		<!--% twat_show_summary(twat_show, 'hide_host') %-->
+		<p class="listen-in"><!--% display_listen_in(twat_show.id,"twat") %--></p>
     <!--% END %-->
 	</article>
 	<p><a href="contribute.html">Become a Correspondent</a></p>
diff --git a/templates/content-episodes.tpl.html b/templates/content-episodes.tpl.html
index ca5153d..f830dad 100644
--- a/templates/content-episodes.tpl.html
+++ b/templates/content-episodes.tpl.html
@@ -11,6 +11,7 @@
 <!--% FOREACH episodes IN DBI.query(query_episodes) 
 %-->
 	<!--% show_summary(episodes) %-->
+	<p class="listen-in"><!--% display_listen_in(episodes.id) %--></p>
 <!--% END %-->
 <h2 id="twat_episodes">Today With a Techie Archived Shows</h2>
 	<p>
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index c5f6308..8fce278 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -84,6 +84,7 @@
 <!--% FOREACH last_5_weeks_episodes IN DBI.query(query_last_5_weeks_episodes) 
 %-->
 	<!--% show_summary(last_5_weeks_episodes) %-->
+	<p class="listen-in"><!--% display_listen_in(last_5_weeks_episodes.id) %--></p>
 <!--% END %-->
 </article>
 <h1>Older Shows</h1>

From 1c94855de26698d441c0b0ba365cb922190cddbb Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sun, 2 Apr 2023 08:50:04 -0400
Subject: [PATCH 6/8] Update location of comments

The listen_now MACRO formating changed, requiring an update to the postion of the comments reference.
---
 templates/content-episode.tpl.html | 6 +++---
 templates/content-index.tpl.html   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 163eff5..cd46463 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -18,10 +18,10 @@
 		</p>
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
 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_tags(episode.tags) %-->  
+
+<label>Comments: </label><!--% display_comments_tally(episode.id, episode.eps_tally) %--> <br>
 <!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
-<!--% 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>
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 8fce278..c6491f5 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -63,10 +63,10 @@
 		<h3><!--% latest_episodes.summary%--></h3>
 		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
 	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>
-<!--% display_tags(latest_episodes.tags) %--><br>
+	<!--% display_tags(latest_episodes.tags) %--> 
+	<span><!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--></span>
+	<span><label>Comments: </label><!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></span><br>
 <!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-<small><!--% display_listen_in(latest_episodes.id) %--> <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--> | 
-<!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></small>
 		</p>
 	</header>
 		<!--% tidy_notes(latest_episodes.notes) %-->

From a2863e5d848581e51ad328f0801615c3c2abd16e Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sun, 2 Apr 2023 08:53:07 -0400
Subject: [PATCH 7/8] Update layout of episode summary information.

---
 public_html/css/hpr.css                   |  5 +++++
 templates/shared-episode-summary.tpl.html | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public_html/css/hpr.css b/public_html/css/hpr.css
index e51cf87..1654cc9 100644
--- a/public_html/css/hpr.css
+++ b/public_html/css/hpr.css
@@ -248,6 +248,11 @@ pre.comment {
 	line-height: 1.2rem;
 }
 
+h3.title { margin: 1.25rem 0 0.75rem 0 }
+p.meta { margin: 0.25rem 0 }
+p.summary { margin: 0.25rem 0 }
+p.listen-in { margin-top: 0 }
+
 @media only screen and (max-width: 680px) { 
 	#container {width: 95%;}
 	img#hprlogo {float: left; max-width: 85px; padding: .35em;}
diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 377b6f1..3ac1b96 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -47,9 +47,8 @@ or
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>
-	<p class="meta"><!--% show_meta(show) %--><br>
-    <!--% show.summary %-->
-	</p>
+	<p class="meta"><!--% show_meta(show) %--></p>
+	<p class="summary"><!--% show.summary %--></p>
 <!--% END %-->
 
 <!--% MACRO twat_show_summary(show, hide_host) BLOCK %-->
@@ -58,8 +57,7 @@ or
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>
-	<p class="meta"><!--% show_meta(show) %--><br>
-    <!--% show.summary %-->
-	</p>
+	<p class="meta"><!--% show_meta(show) %--></p>
+	<p class="summary"><!--% show.summary %--></p>
 <!--% END %-->
 

From ebced513adda5a977825923b1408ebb4934404e6 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sun, 2 Apr 2023 09:06:57 -0400
Subject: [PATCH 8/8] Add audio links to the episodes on a series page

---
 templates/content-series_episode.tpl.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/content-series_episode.tpl.html b/templates/content-series_episode.tpl.html
index 943132f..417303c 100644
--- a/templates/content-series_episode.tpl.html
+++ b/templates/content-series_episode.tpl.html
@@ -22,5 +22,6 @@
 <!--% show_results = query_shows.execute(id) %-->
 <!--% FOREACH show IN show_results %-->
 <!--% show_summary(show) %-->
+<p class="listen-in"><!--% display_listen_in(show.id) %--></p>
 <!--% END %-->
 </article>