Merge pull request 'I112_Add_support_for_a_different_php_basename' (#113 ) from I112_Add_support_for_a_different_php_basename into main

Reviewed-on: #113
Change php_baseurl to hub_baseurl in the template files
2023-06-01 16:04:23 +00:00 · 2023-05-31 10:25:17 +02:00 · 2023-05-30 20:48:32 +02:00 · 2023-05-30 20:10:08 +02:00 · 2023-05-30 17:59:33 +02:00 · 2023-05-30 09:13:01 +02:00
25 changed files with 159 additions and 52 deletions
--- a/README.md
+++ b/README.md
@@ -68,3 +68,4 @@ and add the label "**Feature Request**".
 * Roan "Rho`n" Horning 
 * gordons
 * Ken Fallon
+* norrist
--- 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;}
--- a/site.cfg
+++ b/site.cfg
@@ -26,6 +26,7 @@ output_path: ./public_html
 content: page.tpl.html
 #baseurl: OPTIONAL [i.e. file://<full path to local website directory>]
 baseurl: file:///home/roan/Development/hpr/website/hpr_generator/public_html/
+hub_baseurl: http://hub.hackerpublicradio.com/
 media_baseurl: https://archive.org/download/hpr$eps_id/

 # Configure the navigation menu and the content templates for each page 
@@ -146,6 +147,10 @@ content: content-promote.tpl.html
 navigation: navigation-about.tpl.html
 content: content-sitemap.tpl.html

+[tags]
+navigation: navigation-main.tpl.html
+content: content-tags.tpl.html
+
 [twat_episode]
 navigation: navigation-get-shows.tpl.html
 content: content-twat_episode.tpl.html
--- a/templates/content-about.tpl.html
+++ b/templates/content-about.tpl.html
@@ -1,6 +1,6 @@
  <h1>About HPR.</h1>
  <h2 id="history">History<a href="#history">.</a></h2>
-  <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to <a target="_blank" href="http://www.oldskoolphreak.com" target="_blank">Radio FreeK America</a>, <a target="_blank" href="http://www.binrev.com" target="_blank">Binary Revolution Radio</a> &amp; <a target="_blank" href="http://nomicon.info" target="_blank">Infonomicon</a>, and it is a direct continuation of <a target="_blank" href="<!--% absolute_url(baseurl) %-->twat.html" target="_blank">Twatech</a> radio. Please listen to StankDawg&#39;s &quot;<a target="_blank" href="<!--% absolute_url(baseurl) %-->eps/hpr0001.mp3" target="_blank">Introduction to HPR</a>&quot; for more information.</p>
+  <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to <a target="_blank" href="http://www.oldskoolphreak.com" target="_blank">Radio FreeK America</a>, <a target="_blank" href="http://www.binrev.com" target="_blank">Binary Revolution Radio</a> &amp; <a target="_blank" href="http://nomicon.info" target="_blank">Infonomicon</a>, and it is a direct continuation of <a target="_blank" href="<!--% absolute_url(baseurl) %-->twat.html" target="_blank">Twatech</a> radio. Please listen to StankDawg&#39;s &quot;<a target="_blank" href="<!--% media_path(1, 'hpr', 'mp3', baseurl, media_baseurl) %-->" target="_blank">Introduction to HPR</a>&quot; for more information.</p>

  <h2 id="community">The HPR Community<a href="#community">.</a></h2>
  <p>What differentiates HPR from other podcasts is that the shows are crowd sourced from the community - fellow listeners like <strong><a target="_blank" href="<!--% absolute_url(baseurl) %-->contact.html" target="_blank">you</a></strong>. There is no restriction on how long the show can be, nor on the topic you can cover as long as they are not spam and <em>&quot;are of interest to <a target="_blank" href="http://en.wikipedia.org/wiki/Hacker_(hobbyist)" target="_blank">Hackers</a>&quot;</em>. If you want to see what topics have been covered so far just have a look at our <a target="_blank" href="<!--% absolute_url(baseurl) %-->eps/index.html" target="_blank">Archive</a>. We also allow for a <a target="_blank" href="<!--% absolute_url(baseurl) %-->series/index.html" target="_blank">series</a> of shows so that hosts can go into more detail on a topic.<p>
--- a/templates/content-contribute.tpl.html
+++ b/templates/content-contribute.tpl.html
@@ -55,7 +55,7 @@
  
  <h2>4. Upload your show</h2>
  <p>
-  Once you have your audio ready you can post your show by going to the <a href="https://www.hackerpublicradio.org/calendar.php">Calendar</a> page or press the <strong><a href="https://www.hackerpublicradio.org/calendar.php">⇧Upload⇧</strong></a> button.
+  Once you have your audio ready you can post your show by going to the <a href="<!--% hub_baseurl %-->calendar.php">Calendar</a> page or press the <strong><a href="<!--% hub_baseurl %-->calendar.php">⇧Upload⇧</strong></a> button.
  </p>
  <p>
  After you have selected a date you will be redirected to the <a href="https://www.hackerpublicradio.org/request.php">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and so it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers.
--- 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>
--- 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>
--- 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>
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -34,11 +34,11 @@
 	%-->
 	<!--% USE date %-->
 	<!--% calc = date.calc %-->
-	<!--%  days_till_next_episode = calc.Delta_Days(date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d'),next_available_episode_result.last_year,next_available_episode_result.last_month,next_available_episode_result.last_day + 1) %-->
+	<!--%  days_till_next_episode = calc.Delta_Days(date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d'),next_available_episode_result.last_year,next_available_episode_result.last_month,next_available_episode_result.last_day) %-->
 	<!--% END %-->
 	<!--% USE date %-->  
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
-	<p>We started producing shows as <a href="<!--% absolute_path(baseurl) %-->eps/index.html#twat_episodes"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topic</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. if you listen to HPR then please consider contributing one show a year. if you <a href="<!--% absolute_path(baseurl) %-->contribute.html">record</a> your show now it could be <a href="https://www.hackerpublicradio.org/calendar.php">released</a> in <strong><!--% days_till_next_episode %--></strong> days.</p>
+	<p>We started producing shows as <a href="<!--% absolute_path(baseurl) %-->eps/index.html#twat_episodes"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topic</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. if you listen to HPR then please consider contributing one show a year. if you <a href="<!--% absolute_path(baseurl) %-->contribute.html">record</a> your show now it could be <a href="<!--% hub_baseurl %-->calendar.php">released</a> in <strong><!--% days_till_next_episode %--></strong> days.</p>
  </article>
  <!--% display_call_for_shows() %-->
  <article>
@@ -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) %-->
@@ -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>
--- a/templates/content-request_a_slot.tpl.html
+++ b/templates/content-request_a_slot.tpl.html
@@ -7,7 +7,7 @@
  This is intended only for exceptional circumstances, such as a scheduled interview where we would like the audio to be released as soon after the event as possible, or to cover an important topical situation that has occurred. Due to the extended time now needed to post shows to external sites, the extra work this entails and the disruptive effect of reservations, we will no longer be allowing them except in very rare cases of the type mentioned above. [<a href="http://hackerpublicradio.org/pipermail/hpr_hackerpublicradio.org/2018-February/014260.html">?</a>]
  </p>
  <p>
-  You can post your show by going to the <a href="http://www.hackerpublicradio.org/calendar.php">Calendar</a> page. Once you have selected a date you will be redirected to the <a href="<!--% absolute_url(baseurl) %-->request.html">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and therefore it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers. 
+  You can post your show by going to the <a href="<!--% hub_baseurl %-->calendar.php">Calendar</a> page. Once you have selected a date you will be redirected to the <a href="<!--% absolute_url(baseurl) %-->request.html">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and therefore it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers. 
  </p>
  <p>
  The audio of your show will not be moderated, however <em>the information provided in the upload form <strong>may be moderated</strong></em>. All publicly facing material is managed by the HPR Community as a whole, and not just the host providing the show. The show <a href="<!--% absolute_url(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
@@ -134,6 +134,6 @@
    </li>
  </ul>
  <p>
-  Press submit and your show will be sent to the HPR Volunteers to be processed. Keep an eye on the <a href="http://www.hackerpublicradio.org/calendar.php">calendar</a> for when it is posted.
+  Press submit and your show will be sent to the HPR Volunteers to be processed. Keep an eye on the <a href="<!--% hub_baseurl %-->calendar.php">calendar</a> for when it is posted.
  Your show information is used to process the media files, on the website, in the RSS feeds, and on social media sites.
  </p>
--- 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>
--- a/templates/content-sitemap.tpl.html
+++ b/templates/content-sitemap.tpl.html
@@ -1,7 +1,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <h1>Sitemap</h1>
  <ul>
-    <li><a href="https://www.hackerpublicradio/calendar.php"><strong>⇧Upload⇧</strong></a> ← Upload Your Show</li>
+    <li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a> ← Upload Your Show</li>
    <li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a> ← The HPR Homepage</li>
    <li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a> ← The RSS Syndication Feeds</li>
    <ul>
--- a/templates/content-tags.tpl.html
+++ b/templates/content-tags.tpl.html
@@ -0,0 +1,85 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS "queries-tags-${constants.database}.tpl.html" %-->
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PERL %-->
+$Template::Stash::PRIVATE = undef; # Allow . in tag
+<!--% END %-->
+<!--% uniq_tag_count = 0 %-->
+<!--% comma_re = '(?x)(?:^|,\s*)(?:"((?>[^"]*)(?:""[^"]*)*)"|([^",]*))'; %-->
+<!--# 'Moka5,interview, "computer science"' -->
+<!--% FOREACH episode IN DBI.query(query_tags);
+    ep_id = episode.id;
+    ep_tags = episode.tags;
+    FOREACH tag_str IN ep_tags.split(comma_re);
+        NEXT UNLESS tag_str;
+        NEXT IF tag_str == '';
+        tag = tag_str.lower;
+        first_char = tag.substr(0,1);
+        IF first_char == '.';
+            first_char = '&#x0002E;'; # Unicode .
+        END;
+        IF all_tags.${first_char}.exists(tag);
+            all_tags.${first_char}.${tag}.count = all_tags.${first_char}.${tag}.count + 1;
+            all_tags.${first_char}.${tag}.urls.push(ep_id);
+        ELSE;
+            all_tags.${first_char}.${tag}.count = 1;
+            uniq_tag_count = uniq_tag_count + 1;
+            all_tags.${first_char}.${tag}.urls = [ep_id];
+        END;
+    END;
+END %-->
+<!--% USE date %-->
+<!--% all_first = ['#','&#x0002E;','/','0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'] %-->
+
+<style>
+    .columns3 { columns: 3 auto; list-style-type: none }
+    hr.thin {
+        border: 0;
+        height: 0;
+        border-top: 1px solid rgba(0, 0, 0, 0.1);
+        border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+    }
+    p.ralign { text-align: right }
+</style>
+<article>
+	<a id="TOP"><h1 class="title">Tag summary</h1></a>
+	<h4 class="date">Page generated on <!--% date.format(date.now, format => '%Y-%m-%d at %H:%M:%S UTC', gmt => 1) %--></h4>
+	<p>This section summarises all of the tags currently used throughout the
+	database. The tags are in alphabetical order and each is followed by links to
+	the show numbers where it is used so you can see the context the author used
+	it in. There are currently <!--% uniq_tag_count %--> unique tags in the system.</p>
+	<h4>Alphabetical index</h4>
+	<p>This is an index to the initial letters of the tags below.</p>
+	<ul class="columns3">
+    <!--% FOREACH first_char IN all_first %-->
+        <!--% IF all_tags.${first_char} %-->
+            <li><a href="<!--% absolute_path(baseurl) %-->tags.html#<!--% all_tags.${first_char}.keys.sort.first %-->"><strong><!--% first_char %--></strong></a></li>
+        <!--% END %-->
+    <!--% END %-->
+	</ul>
+	<hr>
+    <!--% FOREACH first_char IN all_first %-->
+        <!--% IF all_tags.${first_char} %-->
+		<p class="ralign"><a href="<!--% absolute_path(baseurl) %-->tags.html#TOP">&UpArrow; Go to index</a></p>
+	        <h3>Tags beginning with '<!--% first_char %-->'</h3>
+	        <ul>
+                <!--% FOREACH tag IN all_tags.${first_char}.keys.sort %-->
+    	        	<li>
+    	        		<a id="<!--% tag %-->"><strong><!--% tag %--></strong></a>: 
+                        <!--% ep_links = [] %-->
+                        <!--% FOREACH ep_id IN all_tags.${first_char}.${tag}.urls.nsort;
+							ep_links.push("<a href=\"${absolute_path(baseurl)}eps/hpr" _ zero_pad_left(ep_id) _ '/index.html"'
+                                ' target="_blank" aria-label="' _ tag _
+                                ' - show ' _ ep_id _ '">' _ ep_id _ '</a>');
+                        END %-->
+                        <!--% ep_links.join(', ') %-->
+    	        	</li>
+                <!--% END %-->
+	        </ul>
+        <!--% END %-->
+    <!--% END %-->
+	<p><a href="#TOP">Go to TOP of page</a></p>
+</article>
+<!--% PERL %-->
+$Template::Stash::PRIVATE = 1;
+<!--% END %-->
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a></li>
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html"><strong>Get Shows »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a></li>
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows »</strong></a>
 			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -1,11 +1,11 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>	
-			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a></li>
-			<li><a href="http://www.hackerpublicradio.org/tags.php">Tags</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->tags.html">Tags</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a></li>
 		</ul>
--- a/templates/page.tpl.html
+++ b/templates/page.tpl.html
@@ -24,7 +24,7 @@
  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg.rss" />
  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx.rss" />
  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3.rss" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="/comments_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<!--% hub_baseurl %-->comments_rss.php" />
  <link rel="license" title="cc by 3.0"  href="https://creativecommons.org/licenses/by-sa/3.0/" />
  <link href="<!--% absolute_path(baseurl) %-->css/hpr.css" rel="stylesheet" />
  <!--[if IE]>
@@ -43,7 +43,11 @@
 			<a href="<!--% absolute_path(baseurl) %-->sitemap.html">Site Map</a>
 			- <a href="#maincontent">skip to main content</a>
 			</p>
-		<h1 id="sitename">Hacker <a href="https://www.hackerpublicradio.org/comments_viewer.php">P</a>ublic <a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio</h1>
+			<h1 id="sitename">
+				<a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">H</a>acker
+				<a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">P</a>ublic
+				<a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio
+			</h1>
 		<h2>Your ideas, projects, opinions - podcasted.</h2>
 		<h3>New episodes Monday through Friday.</h3>
 	</div>
--- a/templates/queries-index-mysql.tpl.html
+++ b/templates/queries-index-mysql.tpl.html
@@ -6,9 +6,9 @@
 		)
 		SELECT 
 			MIN(next_id.id_next) AS \'next_id\', 
-			DATE_FORMAT(MIN(last_date), \'%Y\') AS \'last_year\',
-			DATE_FORMAT(MIN(last_date), \'%d\') AS \'last_day\',
-			DATE_FORMAT(MIN(last_date), \'%m\') AS \'last_month\'
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%Y\') AS \'last_year\',
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%d\') AS \'last_day\',
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%m\') AS \'last_month\'
 		FROM next_id
 		LEFT JOIN eps ON next_id.id_next = eps.id 
 		WHERE eps.id IS NULL
--- a/templates/queries-index-sqlite.tpl.html
+++ b/templates/queries-index-sqlite.tpl.html
@@ -6,9 +6,9 @@
 		)
 		SELECT 
 			MIN(next_id.id_next) AS \'next_id\', 
-			strftime(\'%Y\', MIN (last_date)) AS \'last_year\',
-			strftime(\'%d\', MIN (last_date)) AS \'last_day\',
-			strftime(\'%m\', MIN (last_date)) AS \'last_month\'
+			strftime(\'%Y\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_year\',
+			strftime(\'%d\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_day\',
+			strftime(\'%m\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_month\'
 		FROM next_id
 		LEFT JOIN eps ON next_id.id_next = eps.id 
 		WHERE eps.id IS NULL
--- a/templates/queries-tags-mysql.tpl.html
+++ b/templates/queries-tags-mysql.tpl.html
@@ -0,0 +1 @@
+<!--% query_tags = 'SELECT id, tags FROM eps' %-->
--- a/templates/queries-tags-sqlite.tpl.html
+++ b/templates/queries-tags-sqlite.tpl.html
@@ -0,0 +1 @@
+<!--% query_tags = 'SELECT id, tags FROM eps' %-->
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -19,20 +19,26 @@ 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 %-->
-<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 %-->
-	<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 %-->
@@ -41,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 %-->
@@ -52,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 %-->

--- 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 %-->
Author	SHA1	Message	Date
Ken Fallon	de58d9dc61	Merge pull request 'I112_Add_support_for_a_different_php_basename' (#113 ) from I112_Add_support_for_a_different_php_basename into main Reviewed-on: #113	2023-06-01 16:04:23 +00:00
Ken Fallon	c9510516f1	Change php_baseurl to hub_baseurl in the template files	2023-05-31 10:25:17 +02:00
Ken Fallon	d828cdbce8	Rename php_baseurl to hub_baseurl	2023-05-30 20:48:32 +02:00
Ken Fallon	6211b9a033	Change dynamic site name to hub.hackerpublicradio.com	2023-05-30 20:10:08 +02:00
Ken Fallon	f95ff21c5e	Remove references to absolute_path(php_baseurl)	2023-05-30 17:59:33 +02:00
Ken Fallon	69055d6e9c	Added php_baseurl	2023-05-30 09:13:01 +02:00
Ken Fallon	52c5d02dbc	Add config entry for php_baseurl	2023-05-30 09:10:27 +02:00
Ken Fallon	db5774f642	Added support for having a different php FQDN location from the main site via php_baseurl	2023-05-29 16:11:59 +02:00
Roan Horning	7dca1d75cb	Merge pull request '[I107] Fix calculation of the days until next available episode timeslot' (#108 ) from I107_Error-generating-next-available-episode into main Reviewed-on: #108	2023-05-18 13:09:18 +00:00
Roan Horning	e7fe824302	Fix calculation of the days until next available episode timeslot Do all date calulation in DB instead of naively adding 1 to the day that is returned.	2023-05-18 09:04:04 -04:00
Roan Horning	69255693ef	Merge pull request 'Implement Tags page' (#106 ) from I6_Implement_Tags_page into main Reviewed-on: #106	2023-05-06 13:14:51 +00:00
Roan Horning	8b218e2036	Fix episode url issues Add absolute_path macro. Add eps folder to path. Pad episode number in path.	2023-05-06 09:07:25 -04:00
Gordon Stanton	afc6b7518f	Fixed link to Tags. Get episode ID and episode tags from eps. Generate the Tags page by looping through the tags, order by their first character. Added tags page to the config.	2023-05-01 00:50:01 +10:00
Roan Horning	f3de654284	Update 'README.md' Add new contributor: norrist	2023-04-02 14:36:34 +00:00
Roan Horning	d2bf821aa8	Merge pull request 'h_is_for_hackers' (#105 ) from norrist/hpr_generator:h_is_for_hackers into main Reviewed-on: #105	2023-04-02 14:32:38 +00:00
Todd Norris	91ce3c4325	add comments viewer and put links on separate lines	2023-04-02 14:32:38 +00:00
Todd Norris	821ea9b62d	H links to correspondents page	2023-04-02 14:32:38 +00:00
Roan Horning	6c9d6239bb	Update audio link to use media_path MACRO	2023-04-02 10:24:41 -04:00
Roan Horning	f2c9326e61	Merge pull request '[I70] Add audio links' (#104 ) from I70-Add_audio_links into main Reviewed-on: #104	2023-04-02 13:08:42 +00:00
Roan Horning	ebced513ad	Add audio links to the episodes on a series page	2023-04-02 09:06:57 -04:00
Roan Horning	a2863e5d84	Update layout of episode summary information.	2023-04-02 08:53:07 -04:00
Roan Horning	1c94855de2	Update location of comments The listen_now MACRO formating changed, requiring an update to the postion of the comments reference.	2023-04-02 08:50:04 -04:00
Roan Horning	c6e909523f	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.	2023-04-02 07:24:43 -04:00
Roan Horning	a9c4388cb0	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.	2023-04-01 19:56:11 -04:00
Roan Horning	24c2f9044e	Update show_meta MACRO Display comments as part of the show meta data	2023-04-01 19:37:38 -04:00
Roan Horning	f045cdd32f	Update display_comments_tally MACRO Display on the number of comments. Show a message when the show has now comments.	2023-04-01 19:34:09 -04:00
Roan Horning	dc4377d588	Add arial-title attribute to episode download links	2023-04-01 19:29:00 -04:00
				`@@ -0,0 +1 @@`
				`<!--% query_tags = 'SELECT id, tags FROM eps' %-->`