From 3120fd09120f40432957e30a5560889badfa10a1 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 23 Nov 2008 18:55:47 +0100 Subject: Added nowrap class in styles.css. Time strings are now 'nonwrapable'. Removed in german translations the 'Uhr' from time formating. --- css/styles.css | 4 ++++ pages/pageelems.ecpp | 2 +- pages/recordings.ecpp | 4 ++-- pages/schedule.ecpp | 2 +- pages/searchresults.ecpp | 2 +- pages/timerconflicts.ecpp | 4 ++-- pages/timers.ecpp | 4 ++-- pages/whats_on.ecpp | 4 ++-- po/de_DE.po | 4 ++-- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/css/styles.css b/css/styles.css index 7c36def..acf5ed0 100644 --- a/css/styles.css +++ b/css/styles.css @@ -109,6 +109,10 @@ a:active { display: none; } +.nowrap { + white-space: nowrap; +} + /* ###################### # Tooltip style for hints ###################### diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 90cbaa7..4ced607 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -331,7 +331,7 @@ int update_status(1); <& (tools_comp) id=(boxId) archived=(archived) detail=(1) title=(title) &>
-
<%cpp> if (!archived.empty()) { <$ (archived + " ") $><%cpp> } <$ (time) $>
+
<%cpp> if (!archived.empty()) { <$ (archived + " ") $><%cpp> } <$ (time) $>
<%cpp> if (elapsed >= 0) { diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index ea18800..5789304 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -224,8 +224,8 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
<%cpp> reply.out() << StringRepeat(level + 1, "\"\""); <%cpp> if (!archived.empty()) { " alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { " alt="movie" /><%cpp> }
<$ day $>
-
<$ FormatDateTime(tr("%b %d %y"), startTime) $>
-
<$ FormatDateTime(tr("%I:%M %p"), startTime) $>
+
<$ FormatDateTime(tr("%b %d %y"), startTime) $>
+
<$ FormatDateTime(tr("%I:%M %p"), startTime) $>
<$ duration $>
<& tooltip.display domId=(id) &>><$ name $>
<%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {<$ shortDescr $><%cpp> } else {  <%cpp> }
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index f8623da..544136b 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -129,7 +129,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); "><& pageelems.event_timer epgid=(epgid) &> "><%cpp>if (LiveFeatures().Recent() ) { " alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>><%cpp> } else { <%cpp> } "><& pageelems.imdb_info_href title=(title) &> - ">
<$ start $> - <$ end $>
+ ">
<$ start $> - <$ end $>
topaligned rightcol ">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgEvent->Id()) &>><$ title $>
<%cpp>if (short_description.empty()) {  <%cpp> } <$ short_description $>
<%cpp> diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp index 0cf1e2c..64ae350 100644 --- a/pages/searchresults.ecpp +++ b/pages/searchresults.ecpp @@ -97,7 +97,7 @@ bool logged_in(false); "><& pageelems.event_timer epgid=(epgid) &> ">
<$ channelname $>
- ">
<$ start $> - <$ end $>
+ ">
<$ start $> - <$ end $>
">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><$ result->Title() $>
<%cpp>if (result->ShortText().empty()) {  <%cpp> } <$ result->ShortText() $>
% } diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index b9e3669..c7e18ea 100644 --- a/pages/timerconflicts.ecpp +++ b/pages/timerconflicts.ecpp @@ -102,8 +102,8 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); ">" alt="" <%cpp> if (!timerStateHint.empty()) { <& tooltip.hint text=(timerStateHint) &><%cpp> } > ">
<$ timer->Channel()->Name() $>
- ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $>
- ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $>
+ ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $>
+ ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $>
">
<$ timer->Priority() $>
">
">" alt="" <%cpp> if (!timerStateHint.empty()) { <& tooltip.hint text=(timerStateHint) &><%cpp> } > ">
<$ timer->Channel()->Name() $>
- ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $>
- ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $>
+ ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $>
+ ">
<$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $>
">
<& tooltip.display domId=(epgEvent->Id()) &> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index dc348be..042d08b 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -189,7 +189,7 @@ if (type == "now") { <& pageelems.epg_tool_box detail=(1) epgid=(epgEvent->Id()) title=(epgEvent->Title()) startTime=(epgEvent->GetStartTime()) endTime=(epgEvent->GetEndTime()) &>
-
<$ (timeSpan) $>
+
<$ (timeSpan) $>
<& pageelems.progressbar progress=(epgEvent->Elapsed()) duration=(epgEvent->Duration()) &>
<$ (epgEvent->Title()) $>
<$ (epgEvent->ShortDescr()) $>
@@ -212,7 +212,7 @@ if (type == "now") { <& pageelems.epg_tool_box detail=(0) epgid=(epgEvent->Id()) title=(epgEvent->Title()) startTime=(epgEvent->GetStartTime()) endTime=(epgEvent->GetEndTime()) lastCurrentChanel=(lastCurrentChanel ? 1 : 0) &> ">
-
<$ (timeSpan) $>
+
<$ (timeSpan) $>
<& pageelems.progressbar progress=(epgEvent->Elapsed()) duration=(epgEvent->Duration()) &>
diff --git a/po/de_DE.po b/po/de_DE.po index 3c464be..712ff44 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -102,7 +102,7 @@ msgid "FTA" msgstr "FTA" msgid "%I:%M %p" -msgstr "%H:%M Uhr" +msgstr "%H:%M" msgid "EPGSearch version outdated! Please update." msgstr "EPGSearch-Version zu alt, bitte updaten!" @@ -400,7 +400,7 @@ msgid "error retrieving status info!" msgstr "Fehler: Status nicht verfügbar!" msgid "%I:%M:%S %p" -msgstr "%H:%M:%S Uhr" +msgstr "%H:%M:%S" msgid "Wrong username or password" msgstr "Falscher Benutzername oder Passwort" -- cgit v1.2.3