diff options
| -rw-r--r-- | css/styles.css | 14 | ||||
| -rw-r--r-- | i18n.cpp | 27 | ||||
| -rw-r--r-- | pages/edit_timer.ecpp | 16 | ||||
| -rw-r--r-- | pages/recordings.ecpp | 10 |
4 files changed, 47 insertions, 20 deletions
diff --git a/css/styles.css b/css/styles.css index f96b52d..7612bde 100644 --- a/css/styles.css +++ b/css/styles.css @@ -37,8 +37,8 @@ img { */ div.domTTOverlib { - border: 1px solid #333366; - background-color: #333366; + border: 1px solid #C0C1DA; + background-color: #E9EFFF; } div.domTTOverlib .caption { @@ -81,7 +81,7 @@ div.menu a { div.menu a.active { text-decoration: none; - color: #6D96A9; + color: #FFDB88; font-weight: bold; } @@ -297,6 +297,7 @@ table.schedule tr td { vertical-align: top; padding: 3px 7px 3px 3px; background: url(bg_line.png) bottom repeat-x; + border-bottom: 1px solid #C0C1DA; } table.schedule tr td.day { @@ -358,7 +359,8 @@ div.recordings { div.recording_item { overflow: hidden; - border: 0px dotted green; + background: url(bg_line.png) bottom repeat-x; + border-bottom: 1px solid #C0C1DA; } .recording_item div { @@ -382,6 +384,7 @@ div.recording_item { .recording_item div.recording_name { font-weight: bold; + cursor: pointer; } .recording_item div.recording_actions { @@ -400,11 +403,10 @@ div.recordings_data { div.domTTrecordings { border: none; - width: 75%; } .domTTrecordings div.re_shortdescr { - width: 66%; + background-color: #E9EFFF; } .domTTrecordings div.re_longdescr { @@ -442,7 +442,7 @@ const tI18nPhrase Phrases[] = { "", // Eesti "", // Dansk "", //Czech - }, + }, { "Use VPS", // English "VPS verwenden", // Deutsch "", // Slovenski @@ -685,7 +685,28 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", //Czech }, - + { "Click to view details.", // English + "Für Details klicken.", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", //Czech + }, { "more", // English "mehr", // Deutsch "", // Slovenski @@ -708,7 +729,7 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", //Czech }, - + /* { "", // English "", // Deutsch diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index 27b0362..cee1ddd 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -38,14 +38,15 @@ using namespace vdrlive; int lifetime = 0; string aux = ""; </%args> +<%request scope="page"> +cTimer* timer; +</%request> <%include>page_init.eh</%include> <%cpp> - pageTitle = tr("Edit timer"); - cMutexLock timersLock( &LiveTimerManager() ); SortedTimers& timers = LiveTimerManager().GetTimers(); - cTimer* timer = 0; + timer = 0; if ( !timerid.empty() ) { timer = timers.GetByTimerId( timerid ); if ( timer == 0 ) @@ -108,16 +109,15 @@ using namespace vdrlive; <html> <head> <title>VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $></title> - <link rel="stylesheet" type="text/css" href="/styles.css" /> + <link rel="stylesheet" type="text/css" href="styles.css" /> </head> <body> <div class="left_area"> <& pageelems.logo &> - <& menu > + <& menu active=("timers") component=("edit_timer.header") &> </div> <div class="right_area"> <div class="inhalt"> -<& pageelems.header_box content=(timer ? tr("Edit timer") : tr("New timer")) &> <form method="POST" name="edit_timer" action="edit_timer.ecpp"> <input type="hidden" name="timerid" value="<$ timerid $>"/> <input type="hidden" name="aux" value="<$ aux $>"/> @@ -195,3 +195,7 @@ using namespace vdrlive; </body> </html> <%include>page_exit.eh</%include> + +<%def header> +<span><$ (timer ? tr("Edit timer") : tr("New timer")) $></span> +</%def> diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 912e663..2db0081 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -158,23 +158,23 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { }> <div class="re_longdescr" id="<$ (lPref + recItem->Id()) $>"> <div class="re_station"> - <div class="boxheader"><div><div><$ tr("Recording details") $><& tooltip.close domId=(lPref + recItem->Id()) &></div></div></div> + <div class="boxheader"><div><div><$ recItem->Name() $><& tooltip.close domId=(lPref + recItem->Id()) &></div></div></div> </div> <div class="re_content"> <div class="info"><$ (start) $></div> <div class="title"><$ (title) $></div> + <div class="short"><$ (shortDescr) $></div> <div class="description"> <$ (longDescr) $> </div> </div> </div> <div class="re_shortdescr" id="<$ (sPref + recItem->Id()) $>"> - <div class="re_station"> - <div class="boxheader"><div><div><$ (title) $></div></div></div> - </div> <div class="re_content"> - <div class="info"><$ (start) $></div> +% if (!shortDescr.empty()) { <div class="short"><$ (shortDescr) $></div> +% } + <div class="hint"><$ tr("Click to view details.") $></div> </div> </div> <{ |