From 91cbc81a12920ca67862c59fff529bbcfab26bae Mon Sep 17 00:00:00 2001 From: Roan Horning Date: Thu, 1 Sep 2022 22:58:24 -0400 Subject: [PATCH 1/4] Add MACRO display_tags --- templates/content-episode.tpl.html | 3 ++- templates/content-index.tpl.html | 2 +- templates/shared-episode-summary.tpl.html | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html index d48bf1a..9df2b4a 100644 --- a/templates/content-episode.tpl.html +++ b/templates/content-episode.tpl.html @@ -54,7 +54,8 @@


-Hosted by .

+Hosted by on is flagged as and is released under a license.
+
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html index 821ee49..becd8ca 100644 --- a/templates/content-index.tpl.html +++ b/templates/content-index.tpl.html @@ -56,7 +56,7 @@


Hosted by on is flagged as and released under a license.
-Tags: .
+
listen in ogg, spx, or mp3 format. Comments ().

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html index 6ebdee1..2feee6c 100644 --- a/templates/shared-episode-summary.tpl.html +++ b/templates/shared-episode-summary.tpl.html @@ -1,12 +1,15 @@ - - . + + + . + + . . .
- . + From cfd463d2b0cc366cc678dc2905950594eefd89d2 Mon Sep 17 00:00:00 2001 From: Roan Horning Date: Thu, 1 Sep 2022 23:05:59 -0400 Subject: [PATCH 2/4] Add MACRO display_comments_tally --- templates/content-episode.tpl.html | 11 ++++++++++- templates/content-index.tpl.html | 2 +- templates/shared-episode-summary.tpl.html | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html index 9df2b4a..5ecec64 100644 --- a/templates/content-episode.tpl.html +++ b/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,14 @@ episode_maxmin.latest, episode_maxmin.earliest, episode_previous.previous, episode_next.next, hosts.hostid, hosts.host, - miniseries.name AS \'series\', miniseries.id AS \'seriesid\' + 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 = ? ') %--> @@ -56,6 +64,7 @@
Hosted by on is flagged as and is released under a license.

+
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html index becd8ca..8ef8a69 100644 --- a/templates/content-index.tpl.html +++ b/templates/content-index.tpl.html @@ -58,7 +58,7 @@
Hosted by on is flagged as and released under a license.

listen in ogg, spx, or mp3 format. - Comments (). +

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html index 2feee6c..c5c714e 100644 --- a/templates/shared-episode-summary.tpl.html +++ b/templates/shared-episode-summary.tpl.html @@ -5,6 +5,9 @@ . + + +Comments (). From 67a8a2bfa4d6aa63b1f99debe6d391581e781952 Mon Sep 17 00:00:00 2001 From: Roan Horning Date: Fri, 2 Sep 2022 18:21:15 -0400 Subject: [PATCH 3/4] Add MACRO display_listen_in --- templates/content-episode.tpl.html | 1 + templates/content-index.tpl.html | 2 +- templates/shared-episode-summary.tpl.html | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html index 5ecec64..6161e57 100644 --- a/templates/content-episode.tpl.html +++ b/templates/content-episode.tpl.html @@ -64,6 +64,7 @@
Hosted by on is flagged as and is released under a license.

+ |
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html index 8ef8a69..23fafbe 100644 --- a/templates/content-index.tpl.html +++ b/templates/content-index.tpl.html @@ -57,7 +57,7 @@
Hosted by on is flagged as and released under a license.

-listen in ogg, spx, or mp3 format. + |

diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html index c5c714e..dc72317 100644 --- a/templates/shared-episode-summary.tpl.html +++ b/templates/shared-episode-summary.tpl.html @@ -5,6 +5,9 @@ . + +Listen in ogg, spx, or mp3 format. + Comments (). From f7216132a49f4bcdcabee6f47dcfbdaa2ca49ebc Mon Sep 17 00:00:00 2001 From: Roan Horning Date: Fri, 2 Sep 2022 18:23:50 -0400 Subject: [PATCH 4/4] Update episode template to match current HPR layout and content --- templates/content-episode.tpl.html | 25 +++++++++++++++++++---- templates/shared-episode-summary.tpl.html | 6 ++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html index 6161e57..fe24fa6 100644 --- a/templates/content-episode.tpl.html +++ b/templates/content-episode.tpl.html @@ -40,6 +40,8 @@ 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.description AS \'series_description\', COALESCE (comment_tallies.eps_tally, 0) AS eps_tally FROM eps INNER JOIN hosts ON eps.hostid = hosts.hostid @@ -66,9 +68,27 @@ Hosted by +

- +

Comments

@@ -94,9 +114,6 @@ Subscribe to the comments + + + + . + .