From 8f608826a1c9aa6024010a3970d61657c505c96a Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Tue, 9 Jan 2007 00:36:09 +0000 Subject: fixed page layout (partly by Michi) --- css/styles.css | 40 +++++++++++++++++++++++++++++++++++++--- i18n.cpp | 22 ++++++++++++++++++++++ pages/edit_timer.ecpp | 23 +++++++++++++---------- pages/error.ecpp | 3 +++ pages/pageelems.ecpp | 15 +++++++-------- pages/remote.ecpp | 3 +++ pages/schedule.ecpp | 37 ++++++++++++++++++++++--------------- pages/timers.ecpp | 3 +++ 8 files changed, 110 insertions(+), 36 deletions(-) diff --git a/css/styles.css b/css/styles.css index aeca93b..326d816 100644 --- a/css/styles.css +++ b/css/styles.css @@ -171,7 +171,7 @@ div.station div { margin: 0; padding: 0; background: url(/bg_box_l.png) top left no-repeat; - height: 23px; + height: 23px; } div.station div div { @@ -198,7 +198,7 @@ div.tools { height: 220px; margin: 0; padding: 0; - + background: #DEE6EE; text-align: center; vertical-align: top; @@ -212,7 +212,7 @@ div.content { padding: 0; margin: 0; margin-left: 25px; - + border-right: 1px solid #000000; border-bottom: 1px solid #000000; } @@ -313,6 +313,40 @@ table.schedule tr.active { border: 0px solid white; } +.recording li { +} + +.recording_item div { + float: left; +} + +.recording_item div.recording_day { + width: 2.5em; +} + +.recording_item div.recording_date { + width: 6em; +} + +.recording_item div.recording_time { + width: 6em; +} + +.recording_item div.recording_name { + font-weight: bold; +} + +.recordings ul { + clear: both; +} + +.recording_item div.recording_clear { + clear: both; + width: 0px; + height: 0px; +} + + /* ############################## # Remote Control Keypad diff --git a/i18n.cpp b/i18n.cpp index 5f9f93c..6dfa702 100644 --- a/i18n.cpp +++ b/i18n.cpp @@ -91,6 +91,28 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", //Czech }, + { "%b %d %y", // English + "%d.%m.%y", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", //Czech + }, { "Date", // English "Datum", // Deutsch "", // Slovenski diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index a97ed37..df26c6b 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -74,7 +74,7 @@ using namespace vdrlive; string result; if ( request.getMethod() == "POST" ) { uint flags = ( active ? tfActive : 0 ) | ( vps ? tfVps : 0 ); - string weekdays = string( wday_mon ? "M" : "-" ) + ( wday_tue ? "T" : "-" ) + ( wday_wed ? "W" : "-" ) + string weekdays = string( wday_mon ? "M" : "-" ) + ( wday_tue ? "T" : "-" ) + ( wday_wed ? "W" : "-" ) + ( wday_thu ? "T" : "-" ) + ( wday_fri ? "F" : "-" ) + ( wday_sat ? "S" : "-" ) + ( wday_sun ? "S" : "-" ); int start = start_h * 100 + start_m; @@ -85,6 +85,7 @@ using namespace vdrlive; return reply.redirect("timers.html"); } +<& pageelems.doc_type &> VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $> @@ -95,6 +96,7 @@ using namespace vdrlive; VDR Live! <& menu > +
<& pageelems.header_box content=(timer ? tr("Edit timer") : tr("New timer")) &>
@@ -114,18 +116,18 @@ using namespace vdrlive; <& channels_widget name=("channel") channelid=(true) selected=(channel) &> - + <$ tr("Title" ) $>: - - + + <$ tr("Day") $>: - + <$ tr("Weekday") $>: @@ -138,17 +140,17 @@ using namespace vdrlive; /> <$ tr("Sunday") $> - + <$ tr("Start") $>: : - + <$ tr("Stop") $>: : - + <$ tr("Use VPS") $>: /> @@ -158,18 +160,19 @@ using namespace vdrlive; <$ tr("Priority") $>: - + <$ tr("Lifetime") $>: - +
+
<%include>page_exit.eh diff --git a/pages/error.ecpp b/pages/error.ecpp index 196f147..2ca1333 100644 --- a/pages/error.ecpp +++ b/pages/error.ecpp @@ -7,6 +7,7 @@ errorTitle = tr("Page error"); errorMessage; +<& pageelems.doc_type &> VDR-Live - <$ pageTitle $> @@ -17,10 +18,12 @@ VDR Live! <& menu > +
<& pageelems.header_box content=(pageTitle) &> <& error.error_widget errorTitle=(errorTitle) errorMessage=(errorMessage) &>
+
<%def error_widget> diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 42fecb1..1ab95da 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -1,13 +1,10 @@ -<%pre> - -<%args> - -<{ -}> +<%def doc_type> + + <%def header_box> <%args> content[]; -htmlcode; +component; <{ }> @@ -18,7 +15,9 @@ htmlcode; % for(content_type::const_iterator it = content.begin(); it != content.end(); ++it) { <$ *it $> % } -% reply.out() << htmlcode; +% if (!component.empty()) { + <& (component) &> +% } diff --git a/pages/remote.ecpp b/pages/remote.ecpp index cb6a97f..460d859 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -9,6 +9,7 @@ using namespace vdrlive; <%cpp> pageTitle = tr("Remote control"); +<& pageelems.doc_type &>