From 900d856f4196491550779de43ad3e5f2f0f271ce Mon Sep 17 00:00:00 2001
From: Thomas Keil <tkeil (at) datacrystal (dot) de>
Date: Wed, 3 Jan 2007 20:48:45 +0000
Subject: Neues und Bugfixes

---
 i18n.cpp                |  2 +-
 pages/Makefile          |  2 +-
 pages/menu.ecpp         |  3 ++-
 pages/whats_on_now.ecpp | 16 ++--------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/i18n.cpp b/i18n.cpp
index 0303734..5c3e790 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -25,7 +25,7 @@ const tI18nPhrase Phrases[] = {
     "", // Dansk
     "", //Czech
   },
-	{ "%I.%M %p", // Time formatting string
+	{ "%I:%M %p", // Time formatting string
 	  "%H:%M Uhr",
 	  "",
 	  "",
diff --git a/pages/Makefile b/pages/Makefile
index b37c527..bc6a6d8 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -14,7 +14,7 @@ VDRDIR   ?= ../../../..
 
 ### The object files (add further files here):
 
-OBJS	= menu.o channels.o schedule.o whats_on_now.o
+OBJS	= menu.o  event_widget.o channels.o schedule.o whats_on_now.o whats_on_next.o
 
 ### Default rules:
 
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index e461ad1..4e42e41 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -3,5 +3,6 @@
 #include <vdr/config.h>
 </%pre>
 			<div class="menu">
-				<a href="whats_on_now.html"><$ tr("What's on now?") $></a>
+				<a href="whats_on_now.html"><$ tr("What's on now?") $></a><br/>
+				<a href="whats_on_next.html"><$ tr("What's on next?") $></a>
 			</div>
\ No newline at end of file
diff --git a/pages/whats_on_now.ecpp b/pages/whats_on_now.ecpp
index eb323d9..4a2a5bc 100644
--- a/pages/whats_on_now.ecpp
+++ b/pages/whats_on_now.ecpp
@@ -29,7 +29,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 		</div>
 		<div class="inhalt">
 			<div class="head_box">
-				<$ tr("What's running at") $> <$ FormatDateTime(tr("%I.%M %p"), time(0)) $>
+				<$ tr("What's running at") $> <$ FormatDateTime(tr("%I:%M %p"), time(0)) $>
 			</div>
 
 <{
@@ -43,19 +43,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 						std::string short_description(Event->ShortText() ? Event->ShortText() : "");
 						std::string description(Event->Description() ? Event->Description() : "");
 }>
-			<table class="event" cellpadding="0" cellspacing="0">
-				<tr><td class="station" colspan="2"><$ Channel->Name() $></td></tr>
-				<tr>
-					<td class="tools">
-					&nbsp;
-					</td>
-					<td class="content">
-						<div class="title"><$ title $></div>
-						<div class="short"><$ short_description $></div>
-						<div class="description"><$  description $></div>
-					</td>
-				</tr>
-			</table>
+<& event_widget title=(title) short_description=(short_description) description=(description) channel_name=(Channel->Name())>
 <{
 					}
 			}
-- 
cgit v1.2.3