diff options
| -rw-r--r-- | i18n.cpp | 2 | ||||
| -rw-r--r-- | pages/Makefile | 2 | ||||
| -rw-r--r-- | pages/menu.ecpp | 3 | ||||
| -rw-r--r-- | pages/whats_on_now.ecpp | 16 |
4 files changed, 6 insertions, 17 deletions
@@ -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"> - - </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())> <{ } } |