From cd260aabdb23fd97d9cb8b0105e61d90ca844f01 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun, 3 Jun 2007 22:18:54 +0000
Subject: - general CSS based themeing support. - added setup option to select
 theme. - added search scheme for themable images and stylesheets. - added
 marine (default) and redwine theme. - documented new features. All developers
 must read   doc/dev-conventions.txt

---
 pages/content.ecpp      |  4 ++--
 pages/edit_timer.ecpp   |  2 +-
 pages/login.ecpp        |  2 +-
 pages/pageelems.ecpp    | 16 ++++++++--------
 pages/recordings.ecpp   | 10 +++++-----
 pages/remote.ecpp       |  4 ++--
 pages/schedule.ecpp     |  4 ++--
 pages/searchtimers.ecpp | 10 +++++-----
 pages/setup.ecpp        | 30 ++++++++++++++++++++++++++++++
 pages/timers.ecpp       |  8 ++++----
 pages/tooltip.ecpp      | 10 ++++++++--
 pages/whats_on.ecpp     |  8 ++++----
 12 files changed, 72 insertions(+), 36 deletions(-)

(limited to 'pages')

diff --git a/pages/content.ecpp b/pages/content.ecpp
index 61b8100..8f3cbbb 100644
--- a/pages/content.ecpp
+++ b/pages/content.ecpp
@@ -18,10 +18,10 @@ bool logged_in(false);
 string mime("image/png");
 if (request.getArgsCount() > 0) {
 	mime = request.getArg(0);
-	dsyslog("vdrlive::content found mime arg (%s)", mime.c_str());
+	// dsyslog("vdrlive::content found mime arg (%s)", mime.c_str());
 }
 reply.setContentType(mime);
-dsyslog("vdrlive::content::mimetype(%s)", mime.c_str());
+// dsyslog("vdrlive::content::mimetype(%s)", mime.c_str());
 
 // FileCache::ptr_type f = LiveFileCache().get("/tmp/live/" + request.getPathInfo());
 string path(request.getPathInfo());
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index cc51f9d..176db0e 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -183,7 +183,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								<label for="wday_tue"><$ tr("Tuesday") $></label>
 							</div>
 							<div class="dotted">
-								<input id="wdry_wed" type="checkbox" name="wday_wed" value="1" <{ reply.out() << ( wday_wed ? "checked=\"checked\"" : "" ); }> />
+								<input id="wday_wed" type="checkbox" name="wday_wed" value="1" <{ reply.out() << ( wday_wed ? "checked=\"checked\"" : "" ); }> />
 								<label for="wday_wed"><$ tr("Wednesday") $></label>
 							</div>
 							<div class="dotted">
diff --git a/pages/login.ecpp b/pages/login.ecpp
index c3863ff..70fe7d8 100644
--- a/pages/login.ecpp
+++ b/pages/login.ecpp
@@ -45,7 +45,7 @@ if (logged_in || !LiveSetup().UseAuth()) return reply.redirect(LiveSetup().GetSt
 	<div style="width: 350px; margin: 0 auto; text-align: center; padding: 20px">
 		<div class="boxheader"><div><div><$ tr("VDR Live Login") $></div></div></div>
 		<div style="border: 1px solid black; padding: 15px">
-			<img src="logo_login.png" alt="VDR Live"></img>
+			<img src="<$ LiveSetup().GetThemedLink("img", "logo_login.png") $>" alt="VDR Live"></img>
 			<form name="auth">
 				<input type="hidden" name="action" value="login" />
 				<table class="login">
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 928e7b5..c8ac171 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -24,6 +24,7 @@ using namespace vdrlive;
 
 <%def stylesheets>
 <link rel="stylesheet" type="text/css" href="styles.css"/>
+<link rel="stylesheet" type="text/css" href="<$ LiveSetup().GetThemedLink("css", "theme.css") $>"/>
 <link rel="stylesheet" type="text/css" href="css/siteprefs.css"/>
 </%def>
 
@@ -31,9 +32,8 @@ using namespace vdrlive;
 
 <%def logo>
 <div class="page_header">
-
-<a href="<$ LiveSetup().GetStartScreenLink()$>">	
-<img src="logo.png" alt="VDR Live!" class="logo"></img></a>
+<a href="<$ LiveSetup().GetStartScreenLink()$>">
+<img src="<$ LiveSetup().GetThemedLink("img", "logo.png") $>" alt="VDR Live!" class="logo"></img></a>
 	<& infobox &>
 </div>
 <div style="clear: both"></div>
@@ -54,7 +54,7 @@ using namespace vdrlive;
 		</div>
 		<div class="st_controls">
 			<div class="st_update">
-				<a href="javascript:LiveStatusToggleUpdate()" <& tooltip.hint text=(tr("Stop updates")) &>><img id="statusReloadBtn" src="stop_update.png" alt="" /></a>
+				<a href="javascript:LiveStatusToggleUpdate()" <& tooltip.hint text=(tr("Stop updates")) &>><img id="statusReloadBtn" src="<$ LiveSetup().GetThemedLink("img", "stop_update.png") $>" alt="" /></a>
 			</div>
 			<div id="infobox_recording_buttons" style="display: none">
 				<& ajax_action_href action=("stop_recording") id=("infobox_stop") image=("stop.png") tip=(tr("stop playback")) &>
@@ -111,10 +111,10 @@ using namespace vdrlive;
 	if (timer) {
 </%cpp>
 	<a href="edit_timer.html?timerid=<$ LiveTimerManager().GetTimers().GetTimerId(*timer) $>">
-		<img src="record_timer.png" alt="" <& tooltip.hint text=(tr("Edit this")) &> />
+		<img src="LiveSetup().GetThemedLink("img", "record_timer.png") $>" alt="" <& tooltip.hint text=(tr("Edit this")) &> />
 <%cpp> } else { </%cpp>
 	<a href="edit_timer.html?channelid=<$ channelid $>&eventid=<$ eventid $>">
-		<img src="record.png" alt="" <& tooltip.hint text=(tr("Record this")) &> />
+		<img src="<$ LiveSetup().GetThemedLink("img", "record.png") $>" alt="" <& tooltip.hint text=(tr("Record this")) &> />
 <%cpp> } </%cpp>
 	</a>
 </%def>
@@ -137,7 +137,7 @@ using namespace vdrlive;
 	string alt;
 	string id;
 </%args>
-<%cpp> { </%cpp> <a <%cpp> if (!id.empty()) { </%cpp> id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(!id.empty()) &> href="javascript:LiveSimpleAjaxRequest('<$ action $>.xml', 'param', '<$ param $>');" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ image $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp>
+<%cpp> { </%cpp> <a <%cpp> if (!id.empty()) { </%cpp> id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(!id.empty()) &> href="javascript:LiveSimpleAjaxRequest('<$ action $>.xml', 'param', '<$ param $>');" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ LiveSetup().GetThemedLink("img", image) $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp>
 </%def>
 
 <# ---------------------------------------------------------------------- #>
@@ -205,7 +205,7 @@ using namespace vdrlive;
 <{
 					Features< features::epgsearch >& epgsearch = LiveFeatures< features::epgsearch >();
 }>
-					<img align="center" src="<$ epgsearch.Recent() ? "" : "in" $>active.png"/> EPGsearch
+					<img align="center" src="<$ LiveSetup().GetThemedLink("img", epgsearch.Recent() ? "active.png" : "inactive.png") $>"/> EPGsearch
 %					if ( epgsearch.Recent() ) {
 						(<$ tr("active") $>: <$ epgsearch.Version() $>)
 %					} else {
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index b1b6b55..6695925 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -146,7 +146,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 <%args>
 	string archived;
 </%args>
-<img src="on_dvd.png" alt="on_dvd" <& tooltip.hint text=(archived) &> />
+<img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> />
 </%def>
 
 <# ---------------------------------------------------------------------- #>
@@ -159,7 +159,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 	string folderimg = "folder_closed.png";
 </%args>
 	<div class="recording_item" onclick="Toggle(this)">
-	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><img class="recording_expander" src="<$ collapseimg $>" alt="" /><img class="recording_folder" src="<$ folderimg $>" alt="" /></div>
+	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><img class="recording_expander" src="<$ LiveSetup().GetThemedLink("img", collapseimg) $>" alt="" /><img class="recording_folder" src="<$ LiveSetup().GetThemedLink("img", folderimg) $>" alt="" /></div>
 	<div class="recording_spec">
 	  <div class="recording_name"><$ name $></div>
     </div>
@@ -183,7 +183,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 	string archiveId;
 </%args>
 	<div class="recording_item">
-	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><& archived_disc archived=(archived) &><%cpp> } else { </%cpp><img src="movie.png" alt="movie" /><%cpp> } </%cpp></div>
+	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><& archived_disc archived=(archived) &><%cpp> } else { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "movie.png") $>" alt="movie" /><%cpp> } </%cpp></div>
 	<div class="recording_spec">
 		<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
 		<div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), startTime) $></div>
@@ -203,8 +203,8 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 <%cpp>
 		}
 </%cpp>
-		<img src="edit.png" alt="" />
-		<img src="del.png" alt="" />
+		<img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" />
+		<img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" />
 	</div>
 <%cpp>
 	if (! archived.empty()) {
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index 12850f0..e4a7826 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -80,11 +80,11 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <{				if (!LiveGrabImageManager().CanGrab()) {	}>
 					bloek
 <{				} else {									}>
-					<img src="screenshot.jpg" name="vdrlive" /><br />
+					<img src="<$ LiveSetup().GetThemedLink("img", "screenshot.jpg") $>" name="vdrlive" /><br />
 <{				}											}>
 			</div>
 			<div>
-			<img src="remotecontrol.jpg" width="162" height="363" border="0" usemap="#remote" alt="" />
+			<img src="<$ LiveSetup().GetThemedLink("img", "remotecontrol.jpg") $>" width="162" height="363" border="0" usemap="#remote" alt="" />
 			     <map name="remote">
 			     	  <area href="#" shape="circle" coords="37,36,10" alt="Power" onclick="KeyPress(<$ kPower $>)" nohref="nohref" alt="" />
 				  <area href="#" shape="rect" coords="27,60,59,75" alt="1" onclick="KeyPress(<$ k1 $>)" nohref="nohref" alt="" />
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 5357b3d..fd5ece1 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -109,9 +109,9 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 					<tr class="<? active_line ? "active" ?>">
 						<td style="border-left: 1px solid black"><& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
 %						if ( LiveFeatures< features::epgsearch >().Recent() ) {
-						<a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="/search.png" border="0" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
+						<a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" border="0" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 %						}
-						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>"><img src="imdb.png" border="0" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
+						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" border="0" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
 						</td>
 						<td><$ start $> - <$ end $></td>
 						<td>
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp
index 4a39402..296a110 100644
--- a/pages/searchtimers.ecpp
+++ b/pages/searchtimers.ecpp
@@ -66,14 +66,14 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 }>
 				<tr>
 					<td class="border" style="border-left: 1px solid black"></td>
-					<td><{ if(timer->UseAsSearchTimer()) { }><img src="arrow.png" alt=""></img><{ } }></td>
+					<td><{ if(timer->UseAsSearchTimer()) { }><img src="<$ LiveSetup().GetThemedLink("img", "arrow.png") $>" alt=""></img><{ } }></td>
 					<td><$ timer->Search() $></td>
 					<td><$ timer->ChannelText() $></td>
 					<td><? timer->UseTime() ? timer->StartTimeFormatted()+" - "+timer->StopTimeFormatted() ?></td>
-					<td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=toggle"><img src="<$ timer->UseAsSearchTimer() ? "active" : "inactive" $>.png" alt="<$ tr("Toggle search timer actions (in)active") $>" <& tooltip.hint text=(tr("Toggle search timer actions (in)active")) &>></img></a></td>
-					<td><a href="searchresults.html?searchtimerid=<$ timer->Id() $>"><img src="search.png" border="0" alt="<$ tr("Browse search timer results") $>" <& tooltip.hint text=(tr("Browse search timer results")) &>></img></a></td>
-					<td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="edit.png" alt="<$ tr("Edit search timer") $>" <& tooltip.hint text=(tr("Edit search timer")) &>></img></a></td>
-					<td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=delete" onclick="return confirm('<$ tr("Delete this search timer?") $>')"><img src="del.png" alt="<$ tr("Delete search timer") $>" <& tooltip.hint text=(tr("Delete search timer")) &>></img></a></td>
+					<td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=toggle"><img src="<$ LiveSetup().GetThemedLink("img", timer->UseAsSearchTimer() ? "active.png" : "inactive.png") $>" alt="<$ tr("Toggle search timer actions (in)active") $>" <& tooltip.hint text=(tr("Toggle search timer actions (in)active")) &>></img></a></td>
+					<td><a href="searchresults.html?searchtimerid=<$ timer->Id() $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="<$ tr("Browse search timer results") $>" <& tooltip.hint text=(tr("Browse search timer results")) &>></img></a></td>
+					<td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="<$ tr("Edit search timer") $>" <& tooltip.hint text=(tr("Edit search timer")) &>></img></a></td>
+					<td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=delete" onclick="return confirm('<$ tr("Delete this search timer?") $>')"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="<$ tr("Delete search timer") $>" <& tooltip.hint text=(tr("Delete search timer")) &>></img></a></td>
 					<td class="border" style="border-right: 1px solid black"></td>
 				</tr>
 <{
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index b099c0f..43c0de8 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -1,4 +1,5 @@
 <%pre>
+#include <vdr/tools.h>
 #include "setup.h"
 #include "tools.h"
 
@@ -13,6 +14,7 @@ using namespace std;
 	string pass;
 	string times;
 	string startscreen;
+	string theme;
 	string localnetmask;
 </%args>
 <%session scope="global">
@@ -37,6 +39,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		}
 		LiveSetup().SetTimes(times);
 		LiveSetup().SetStartScreen(startscreen);
+		LiveSetup().SetTheme(theme);
 		LiveSetup().SaveSetup();
 	}
 	pageTitle = tr("Setup");
@@ -50,6 +53,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	useauth = LiveSetup().GetUseAuth();
 	times = LiveSetup().GetTimes();
 	startscreen = LiveSetup().GetStartScreen();
+	theme = LiveSetup().GetTheme();
 	localnetmask = LiveSetup().GetLocalNetMask();
 </%cpp>
 <& pageelems.doc_type &>
@@ -128,6 +132,32 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</select></td>
 						<td class="border" style="border-right: 1px solid black"></td>
 					</tr>
+					<tr>
+						<td class="border" style="border-left: 1px solid black"></td>
+						<td class="label"><$ tr("Theme") $>:</td>
+						<td><select name="theme" size="1" id="theme">
+<%cpp>
+{
+	cReadDir d(USRDIR "/themes");
+	struct dirent* e;
+	string parent("..");
+	string current(".");
+	while ((e = d.Next())) {
+		if ((current == e->d_name) || (parent == e->d_name)) {
+			continue;
+		}
+		if (DT_DIR != e->d_type) {
+			continue;
+		}
+</%cpp>
+							<option value="<$ e->d_name $>" <{ SELECTIF(theme == e->d_name) }>><$ e->d_name $></option>
+<%cpp>
+	}
+}
+</%cpp>
+						</select></td>
+						<td class="border" style="border-right: 1px solid black"></td>
+					</tr>
 					<tr>
 						<td class="border" style="border-left: 1px solid black"></td>
 						<td class="buttonpanel" colspan="2">
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index dc67178..01eacc9 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -99,14 +99,14 @@ using namespace vdrlive;
 </%cpp>
 				<tr>
 					<td class="border" style="border-left: 1px solid black"></td>
-					<td><img src="<$ timerStateImg $>" alt=""></img></td>
+					<td><img src="<$ LiveSetup().GetThemedLink("img", timerStateImg) $>" alt=""></img></td>
 					<td><a href="schedule.html?channel=<$ timer->Channel()->Number()$>"><$ timer->Channel()->Name() $></a></td>
 					<td><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></td>
 					<td><$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $></td>
 					<td><$ timer->File() $></td>
-					<td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=toggle"><img src="<$ (timer->Flags() & tfActive) ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td>
-					<td><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="edit.png" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td>
-					<td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="del.png" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td>
+					<td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=toggle"><img src="<$ LiveSetup().GetThemedLink("img", (timer->Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td>
+					<td><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td>
+					<td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td>
 					<td class="border" style="border-right: 1px solid black"></td>
 				</tr>
 <%cpp>
diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp
index bdba57c..bd11415 100644
--- a/pages/tooltip.ecpp
+++ b/pages/tooltip.ecpp
@@ -1,3 +1,9 @@
+<%pre>
+#include "setup.h"
+
+using namespace vdrlive;
+
+</%pre>
 <%def javascript>
 <%args>
 styleClass="domTThint";
@@ -44,12 +50,12 @@ domId;
 <%args>
 domId;
 </%args>
- <a href="#void" onclick="domTT_close('<$ (domId + "_tip") $>')"><img src="close.png" alt="" /></a>
+ <a href="#void" onclick="domTT_close('<$ (domId + "_tip") $>')"><img src="<$ LiveSetup().GetThemedLink("img", "close.png") $>" alt="" /></a>
 </%def>
 
 <%def help>
 <%args>
 text;
 </%args>
- <img src="help.png" onmouseover="domTT_close(domTT_lastOpened); domTT_activate(this, event, 'predefined', 'tipHint', 'content', '<$ text $>');"></img>
+ <img src="<$ LiveSetup().GetThemedLink("img", "help.png") $>" onmouseover="domTT_close(domTT_lastOpened); domTT_activate(this, event, 'predefined', 'tipHint', 'content', '<$ text $>');"></img>
 </%def>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index d537262..09bb560 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -143,9 +143,9 @@ if (type == "now") {
 						<& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_id) image="zap.png" alt="" &>
 %							}
 %						if ( LiveFeatures< features::epgsearch >().Recent() ) {
-						<a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(epgEvent->Title()) $>"><img src="search.png" border="0" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
+						<a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(epgEvent->Title()) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 %						}
-						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="imdb.png" border="0" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
+						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
 					</div>
 				 	<div>
 						<div class="info"><$ (epgEvent->StartTime(tr("%I:%M %p"))) $> - <$ (epgEvent->EndTime(tr("%I:%M %p"))) $></div>
@@ -166,9 +166,9 @@ if (type == "now") {
 						<& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_id) image="zap.png" alt="" &>
 %					}
 %					if ( LiveFeatures< features::epgsearch >().Recent() ) {
-						<a href="searchresults.html?searchplain=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="/search.png" border="0" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
+						<a href="searchresults.html?searchplain=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" border="0" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 %					}
-						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="imdb.png" border="0" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
+						<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(epgEvent->Title()) $>"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" border="0" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
 					</td>
 					<td>
 						<div><$ (epgEvent->StartTime(tr("%I:%M %p"))) $> - <$ (epgEvent->EndTime(tr("%I:%M %p"))) $></div>
-- 
cgit v1.2.3