From f81178b2d93a7f7d41c62d583ad5ec71cc1d8f3f Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Sun, 24 Feb 2008 09:29:38 +0100
Subject: added priority column

---
 pages/timerconflicts.ecpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index 9d1b15a..1be8558 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -51,7 +51,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 					for (std::list< TimerInConflict >::const_iterator confltimer = conflTimers.begin(); confltimer != conflTimers.end(); ++confltimer) {
 </%cpp>
 						<tr class="head">
-							<td colspan="9">
+							<td colspan="10">
 								<div class="boxheader"><div><div><$ FormatDateTime(tr("%A, %x"), conflict->ConflictTime()) + " " + FormatDateTime(tr("%I:%M %p"), conflict->ConflictTime()) + " - " + lexical_cast<string, int>(confltimer->percentage) + "%" $></div></div></div>
 							</td>
 						</tr>
@@ -60,6 +60,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 							<td><div class="withmargin"><$ trVDR("Channel") $></div></td>
 							<td><div class="withmargin"><$ trVDR("Start") $></div></td>
 							<td><div class="withmargin"><$ trVDR("Stop") $></div></td>
+							<td><div class="withmargin"><$ trVDR("Priority") $></div></td>
 							<td><div class="withmargin"><$ trVDR("File") $></div></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
@@ -103,6 +104,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a href="schedule.html?channel=<$ timer->Channel()->Number()$>"><$ timer->Channel()->Name() $></a></div></td>
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></div></td>
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $></div></td>
+								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ timer->Priority() $></div></td>
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a
 %								if (!longDescription.empty()) {
 									<& tooltip.hint text=(longDescription) &><& tooltip.display domId=(epgEvent->Id()) &>
@@ -116,7 +118,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 %						}
 </%cpp>
 						<tr class="spacer">
-							<td colspan="9"/>
+							<td colspan="10"/>
 						</tr>
 <%cpp>
 					}
-- 
cgit v1.2.3