Styles etc. verbessert

2 files changed, 10 insertions, 11 deletions

diff --git a/styles.css b/styles.css
index 70b013e..118b1ef 100644
--- a/styles.css
+++ b/styles.css
@@ -8,17 +8,18 @@ body {
 div.left_area {
 	width: 150px;
 	float: left;
+	margin: 5px;
 }
 
 div.inhalt {
-
+	float: left;
+	margin: 5px;
 }
 
 div.menu {
 	border: 1px solid #6D96A9;
 	color: #6D96A9;
 	padding: 5px;
-	margin: 5px;
 }
 
 div.menu a {
diff --git a/whats_on_now.ecpp b/whats_on_now.ecpp
index 73dfdd7..2ceb44c 100644
--- a/whats_on_now.ecpp
+++ b/whats_on_now.ecpp
@@ -9,10 +9,6 @@
 </%args>
 <{
 
-char buf[6];
-struct tm tm_r;
-//strftime(buf, sizeof(buf), "%H.%M", localtime(tm_r));
-
 cSchedulesLock schedulesLock;
 const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 
@@ -29,7 +25,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 		</div>
 		<div class="inhalt">
 			<div class="head_box">
-				Was l&auml;ft jetzt um Uhr
+				Was l&auml;uft jetzt um Uhr
 			</div>
 
 <{
@@ -39,13 +35,15 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 			if (Schedule) {
 				const cEvent *Event = Schedule->GetPresentEvent();
 					if (Event) {
-						const char *title = Event->Title() ? Event->Title() : '';
+						std::string title(Event->Title() ? Event->Title() : "");
+						std::string short_description(Event->ShortText() ? Event->ShortText() : "");
+						std::string description(Event->Description() ? Event->Description() : "");
 }>
 			<div class="event">
 				<div class="station"><$ Channel->Name() $></div>
-				<span class="title"><$ Event->Title() $></span><br/>
-				<span class="short"></span>
-				<p><? Event->Description() ? Event->Description() ?></p>
+				<span class="title"><$ title $></span><br/>
+				<span class="short"><$ short_description $></span>
+				<p><$  description $></p>
 			</div>
 <{
 					}