From aabeca44f50a9db05f379cc86725786e59ef6879 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Mon, 13 Mar 2023 23:15:46 -0400
Subject: [PATCH] Refactor templates to use show_avatar MACRO

---
 templates/content-episode.tpl.html      | 3 +--
 templates/content-index.tpl.html        | 7 ++-----
 templates/content-twat_episode.tpl.html | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 2c6ec91..dc446f1 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -16,8 +16,7 @@
 		<h3><!--% episode.summary %--></h3>
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
-<p><!--% IF get_avatar_src(episode.hostid) != 'hpr_logo.png' %-->
-<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar_src(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
+<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_listen_in(episode.id) %--> | 
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 6de2665..7d7331e 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -43,11 +43,8 @@
 	<header>
 			<h1><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1>
 		<h3><!--% latest_episodes.summary%--></h3>
-		<p class="meta"$><!--% IF get_avatar_src(latest_episodes.hostid) != 'hpr_logo.png' %-->
-			<a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html">
-				<!--% host_thumb(get_avatar_src(latest_episodes.hostid), latest_episodes.host, host_cnt, 0) %-->
-			</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>
+		<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>
 <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>
diff --git a/templates/content-twat_episode.tpl.html b/templates/content-twat_episode.tpl.html
index 0d7b65f..ae844d3 100644
--- a/templates/content-twat_episode.tpl.html
+++ b/templates/content-twat_episode.tpl.html
@@ -52,8 +52,7 @@
 		<h3><!--% episode.summary %--></h3>
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
-<p><!--% IF get_avatar_src(episode.hostid) != 'hpr_logo.png' %-->
-<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar_src(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
+<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_listen_in(episode.id, "twat") %-->