Fix MACRO show_series link to series page

This commit is contained in:
Roan Horning 2022-08-06 10:01:30 -04:00
parent 6414390a3d
commit a23ca24bd6
Signed by: rho_n
GPG Key ID: 234AEF20B72D5769
4 changed files with 12 additions and 11 deletions

View File

@ -17,7 +17,7 @@
hosts.local_image,
hosts.hostid,
hosts.host, hosts.email,
miniseries.name AS series
miniseries.name AS series, miniseries.id AS seriesid
FROM eps
INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id

View File

@ -15,7 +15,7 @@
eps.duration, eps.notes, eps.tags,
hosts.hostid,
hosts.host, hosts.email, hosts.local_image,
miniseries.name AS series
miniseries.name AS series, miniseries.id AS seriesid
FROM eps
INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id

View File

@ -25,7 +25,7 @@
<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
<!--% FOREACH latest_episodes IN DBI.query('
SELECT
substr(\'0000\' || eps.id, -4, 4) AS [id],
eps.id,
CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
eps.date, eps.license, eps.duration,
eps.title, eps.summary, eps.tags,
@ -33,7 +33,7 @@
hosts.local_image,
hosts.hostid,
hosts.host, hosts.email,
miniseries.name AS series
miniseries.name AS series, miniseries.id AS seriesid
FROM eps
INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id
@ -51,7 +51,7 @@
<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) %-->/index.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% latest_episodes.explicit %--> and released under a <!--% latest_episodes.license %--> license. <br>
<strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<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) %-->
<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) %-->
<a href="eps.php?id=3628#comments">comments (0)</a></small>
</p>
</header>
@ -78,13 +78,13 @@
</header>
<!--% FOREACH last_5_weeks_episodes IN DBI.query('
SELECT
substr(\'0000\' || eps.id, -4, 4) AS [id],
eps.id,
CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
eps.date, eps.license, eps.title, eps.summary,
eps.duration, eps.notes, eps.tags,
substr(\'0000\' || hosts.hostid, -4, 4) AS [hostid],
hosts.hostid,
hosts.host, hosts.email, hosts.local_image,
miniseries.name AS series
miniseries.name AS series, miniseries.id AS seriesid
FROM eps
INNER JOIN hosts ON eps.hostid = hosts.hostid
INNER JOIN miniseries ON eps.series = miniseries.id

View File

@ -1,5 +1,6 @@
<!--% MACRO show_series(series) IF series != "" %-->
<label>Series:</label> <a href="series.php?id=11"><!--% series %--></a>.
<!--% PROCESS 'shared-utils.tpl.html' %-->
<!--% MACRO show_series(series, series_id) IF series != "" %-->
<label>Series:</label> <a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></a>.
<!--% END %-->
<!--% MACRO show_summary(show, hide_host) BLOCK %-->
@ -7,7 +8,7 @@
hosted by <a href="correspondents/host<!--% show.id %-->.html"><!--% show.host %--></a>
<!--% END %-->
</h3>
<p class="meta"><span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% show.duration %-->.</span> <span><label>Flag:</label> <!--% show.explicit %-->.</span> <span><!--% show_series(show.series) %--></span> <br>
<p class="meta"><span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% show.duration %-->.</span> <span><label>Flag:</label> <!--% show.explicit %-->.</span> <span><!--% show_series(show.series, show.seriesid) %--></span> <br>
<span><label>Tags:</label> <em><!--% show.tags %--></em>.</span><br>
<!--% show.summary %-->
</p>