From 62ece78abdf89523121503b807c2ad6552bbd325 Mon Sep 17 00:00:00 2001
From: Thomas Keil <tkeil (at) datacrystal (dot) de>
Date: Sat, 13 Jan 2007 23:40:50 +0000
Subject: Bugfixes

---
 pages/menu.ecpp     |  4 +---
 pages/schedule.ecpp | 20 ++++++++++++++++----
 pages/whats_on.ecpp | 29 ++++++++++++++---------------
 3 files changed, 31 insertions(+), 22 deletions(-)

(limited to 'pages')

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index a36a01a..2989e99 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -24,7 +24,5 @@ std::string set_active;
 <%args>
 current;
 </%args>
-<{ if (current== set_active) { }>
-class="active"
-<{ } }>
+<%cpp> if (current== set_active) { </%cpp>class="active"<%cpp> } </%cpp>
 </%def>
\ No newline at end of file
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 3bc50fd..019b3ad 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -73,18 +73,30 @@ using namespace vdrlive;
 					tEventID event = Event->EventID();
 
 					if (current_day != day) {
-						current_day = day;
+						if (current_day != "") {
 }>
 						<tr>
-							<td class="head" colspan="4"><$ current_day $></td>
+							<td colspan="4" style="border-top: 1px solid black">&nbsp;</td></tr>
 						</tr>
+<{
+						}
+}>
+						<tr>
+							<td class="day" colspan="4"><div class="boxheader"><div><div><$ day $></div></div></div></td>
+						</tr>
+%					current_day = day;
 %					}
 					<tr class="<? active_line ? "active" ?>">
-						<td><& pageelems.event_timer channelid=(channel_id) eventid=(event) &></td>
+						<td style="border-left: 1px solid black"><& pageelems.event_timer channelid=(channel_id) eventid=(event) &></td>
 						<td><$ start $> - <$ end $></td>
 						<td><strong><$ title $></strong><br /><$ short_description $><br /></td>
-						<td>&nbsp;</td>
+						<td style="border-right: 1px solid black">&nbsp;</td>
 					</tr>
+%				}
+%				if (Schedule->Events()->Count() > 0) {
+						<tr>
+							<td colspan="4" style="border-top: 1px solid black">&nbsp;</td></tr>
+						</tr>
 %				}
 			</table>
 		</div>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 3c06c91..5eb5edb 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -68,22 +68,22 @@ if (type == "now") {
 								description += string(" ") + tr("more") + string(" ...");
 							}
 }>
-				<div class="event">
-					<div class="station">
-						<div><div><div><$ channel_name $></div></div></div>
-					</div>
-					<div class="tools">
-						<& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
-					</div>
-					<div class="content">
-						<div class="info"><$ start $> - <$ end $></div>
-						<div class="title"><$ title $></div>
-						<div class="short"><$ short_description $></div>
-						<div class="description">
-							<$  description $>
-						</div>
+			<div class="event">
+				<div class="station">
+					<div><div><div><$ channel_name $></div></div></div>
+				</div>
+				<div class="tools">
+					<& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
+				</div>
+				<div class="content">
+					<div class="info"><$ start $> - <$ end $></div>
+					<div class="title"><$ title $></div>
+					<div class="short"><$ short_description $></div>
+					<div class="description">
+						<$  description $>
 					</div>
 				</div>
+			</div>
 
 
 <{
@@ -93,7 +93,6 @@ if (type == "now") {
 		}
 	}
 }>
-			</div>
 		</div>
 	</body>
 </html>
-- 
cgit v1.2.3