From 45583aefb7f7bd9259dec8d64299139896bc829f Mon Sep 17 00:00:00 2001
From: Thomas Keil <tkeil (at) datacrystal (dot) de>
Date: Mon, 7 May 2007 16:11:29 +0000
Subject: Changed Header, used time is now one column, fixing bugs #299 and
 #285

---
 i18n.cpp                | 22 ++++++++++++++++++++++
 pages/searchtimers.ecpp | 15 +++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/i18n.cpp b/i18n.cpp
index dfa0259..326ad26 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -3176,6 +3176,28 @@ const tI18nPhrase Phrases[] = {
 	  "", // Dansk
 	  "", // Czech
 	},
+      { "Starts between", // English
+      "Beginnt zwischen", // Deutsch
+      "", // Slovenski
+      "", // Italiano
+      "", // Nederlands
+      "", // Português
+      "", // Français
+      "", // Norsk
+      "", // Finnish
+      "", // Polski
+      "", // Español
+      "", // Greek
+      "", // Svenska
+      "", // Românã
+      "", // Magyar
+      "", // Català
+      "", // Russian
+      "", // Hrvatski
+      "", // Eesti
+      "", // Dansk
+      "", // Czech
+      },
     /*
       { "", // English
       "", // Deutsch
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp
index 81521fb..7ed73f3 100644
--- a/pages/searchtimers.ecpp
+++ b/pages/searchtimers.ecpp
@@ -45,17 +45,21 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		<div class="inhalt">
 			<table class="timers" cellspacing="0" cellpadding="0">
 				<tr class="head">
-					<td style="background: url(bg_box_l.png); width: 3px"></td>
+					<td style="background: url(bg_box_l.png); width: 3px;"></td>
+					<td colspan="8"><$ pageTitle $></td>
+					<td style="background: url(bg_box_r.png); width: 3px;"></td>
+				</tr>
+				<tr class="description">
+					<td class="border" style="border-left: 1px solid black"></td>
 					<td>&nbsp;</td>
 					<td><$ tr("Expression") $></td>
 					<td><$ tr("Channel") $></td>
-					<td><$ tr("Start") $>&nbsp;</td>
-					<td><$ tr("Stop") $></td>
+					<td><$ tr("Starts between") $>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
-					<td style="background: url(bg_box_r.png); width: 3px;"></td>
+					<td class="border" style="border-right: 1px solid black"></td>
 				</tr>
 <{
 				for (SearchTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) {
@@ -65,8 +69,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 					<td><{ if(timer->UseAsSearchTimer()) { }><img src="/arrow.png" alt=""></img><{ } }></td>
 					<td><$ timer->Search() $></td>
 					<td><$ timer->ChannelText() $></td>
-					<td><? timer->UseTime() ? timer->StartTimeFormatted() ?></td>
-					<td><? timer->UseTime() ? timer->StopTimeFormatted() ?></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>
-- 
cgit v1.2.3