- Presence of IMDb URLs is now configurable. Closes bug #401.

3 files changed, 22 insertions, 10 deletions

diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index de828e4..b61e663 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -96,7 +96,7 @@ int update_status(1);
 <%args>
 	string title;
 </%args>
-<%cpp> { </%cpp> <a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
+<%cpp> if (LiveSetup().GetShowIMDb()) { </%cpp> <a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
 </%def>
 
 <# ---------------------------------------------------------------------- #>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 67f9e01..2acfdc4 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -86,12 +86,14 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
 		recItemParams.add("level", lexical_cast<string, int>(level + 1));
 </%cpp>
 		<ul class="recordingslist" style="display: none;">
-%		callComp("recordings.recordings_item", request, reply, recItemParams);
+<%cpp>
+		callComp("recordings.recordings_item", request, reply, recItemParams);
+</%cpp>
     	</ul>
 	</li>
-%	}
-%}
 <%cpp>
+	}
+}
 for (iter = recordingsTree->begin(path); iter != end; ++iter) {
 	RecordingsItemPtr recItem = iter->second;
     if (!recItem->IsDir()) {
@@ -141,11 +143,11 @@ 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=\"/img/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>
-	<div class="recording_actions">&nbsp;</div>
+		<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level, "<img src=\"/img/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>
+		<div class="recording_actions">&nbsp;</div>
 	</div>
 </%def>
 
@@ -164,7 +166,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
 	string archived;
 </%args>
 	<div class="recording_item">
-	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"/img/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_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"/img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(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>
@@ -181,6 +183,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
 		else {
 </%cpp>
 		<img src="/img/transparent.png" alt="" width="16px" height="16px" />
+		<& pageelems.imdb_info_href title=(name) &>
 <%cpp>
 		}
 </%cpp>
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 548846f..d89acf0 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -22,6 +22,7 @@ using namespace std;
 	string useAjax;
 	string showInfoBox;
 	string useStreamdev;
+	string showIMDb;
 	string streamdevport;
 	string streamdevtype;
 	int authchanged = 0;
@@ -63,6 +64,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 			LiveSetup().SetUseStreamdev(!useStreamdev.empty());
 			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : lexical_cast<int>(streamdevport));
 			LiveSetup().SetStreamdevType(streamdevtype.empty() ? "PES" : streamdevtype);
+			LiveSetup().SetShowIMDb(!showIMDb.empty());
 			LiveSetup().SaveSetup();
 			message = tr("Setup saved.");
 		}
@@ -86,6 +88,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	useStreamdev = LiveSetup().GetUseStreamdev() ? "1" : "";
 	streamdevport = lexical_cast<std::string, int>(LiveSetup().GetStreamdevPort());
 	streamdevtype = LiveSetup().GetStreamdevType();
+	showIMDb = LiveSetup().GetShowIMDb() ? "1" : "";
 
 </%cpp>
 <& pageelems.doc_type &>
@@ -203,6 +206,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</td>
 					</tr>
 					<tr>
+						<td class="label leftcol"><div class="withmargin"><$ tr("Add links to IMDb") $>:</div></td>
+						<td class="rightcol">
+							<input type="checkbox" name="showIMDb" id="showIMDb" value="1" <%cpp> CHECKIF(!showIMDb.empty()); </%cpp>/>
+						</td>
+					</tr>
+					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("additional fixed times in 'What's on?'") $>:</div></td>
 						<td class="rightcol"><input type="text" name="times" value="<$ times $>" id="times" />
 							<& tooltip.help text=(tr("Format is HH:MM. Separate multiple times with a semicolon")) &></td>