From 53e682ec9d4e3357052b7b0e397288d20fce4cac Mon Sep 17 00:00:00 2001
From: Thomas Keil <tkeil (at) datacrystal (dot) de>
Date: Wed, 3 Jan 2007 23:52:15 +0000
Subject: Event-Box now has info-DIV with start/end information

---
 css/styles.css           | 5 +++++
 pages/event_widget.ecpp  | 3 +++
 pages/whats_on_next.ecpp | 4 +++-
 pages/whats_on_now.ecpp  | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index 13bf6b0..8d262ad 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -75,6 +75,11 @@ div.description {
 	margin-top: 10px;
 }
 
+div.info {
+	text-align: right;
+	margin-bottom: 3px;
+}
+
 table.event tr td.station {
 	background: #6D96A9;
 	color: white;
diff --git a/pages/event_widget.ecpp b/pages/event_widget.ecpp
index eb97755..355cd8a 100644
--- a/pages/event_widget.ecpp
+++ b/pages/event_widget.ecpp
@@ -14,6 +14,8 @@ title;
 short_description;
 description;
 channel_name;
+start;
+end;
 </%args>
 
 			<table class="event" cellpadding="0" cellspacing="0">
@@ -23,6 +25,7 @@ channel_name;
 					&nbsp;
 					</td>
 					<td class="content">
+						<div class="info"><$ start $>-<$ end $></div>
 						<div class="title"><$ title $></div>
 						<div class="short"><$ short_description $></div>
 						<div class="description"><$  description $></div>
diff --git a/pages/whats_on_next.ecpp b/pages/whats_on_next.ecpp
index ca849bf..5e6d5a6 100644
--- a/pages/whats_on_next.ecpp
+++ b/pages/whats_on_next.ecpp
@@ -43,8 +43,10 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 						std::string title(Event->Title() ? Event->Title() : "");
 						std::string short_description(Event->ShortText() ? Event->ShortText() : "");
 						std::string description(Event->Description() ? Event->Description() : "");
+						std::string start(Event->StartTime() ? FormatDateTime(tr("%I:%M %p"), Event->StartTime()) : "");
+						std::string end(Event->EndTime() ? FormatDateTime(tr("%I:%M %p"), Event->EndTime()) : "");
 }>
-<& event_widget title=(title) short_description=(short_description) description=(description) channel_name=(Channel->Name())>
+<& event_widget title=(title) short_description=(short_description) description=(description) channel_name=(Channel->Name()) start=(start) end=(end)>
 <{
 					}
 			}
diff --git a/pages/whats_on_now.ecpp b/pages/whats_on_now.ecpp
index c623099..8073fa9 100644
--- a/pages/whats_on_now.ecpp
+++ b/pages/whats_on_now.ecpp
@@ -43,8 +43,10 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 						std::string title(Event->Title() ? Event->Title() : "");
 						std::string short_description(Event->ShortText() ? Event->ShortText() : "");
 						std::string description(Event->Description() ? Event->Description() : "");
+						std::string start(Event->StartTime() ? FormatDateTime(tr("%I:%M %p"), Event->StartTime()) : "");
+						std::string end(Event->EndTime() ? FormatDateTime(tr("%I:%M %p"), Event->EndTime()) : "");
 }>
-<& event_widget title=(title) short_description=(short_description) description=(description) channel_name=(Channel->Name())>
+<& event_widget title=(title) short_description=(short_description) description=(description) channel_name=(Channel->Name()) start=(start) end=(end)>
 <{
 					}
 			}
-- 
cgit v1.2.3