VDR-Live - <$ pageTitle $>

diff --git a/pages/infobox.ecpp b/pages/infobox.ecpp new file mode 100644 index 0000000..b338015 --- /dev/null +++ b/pages/infobox.ecpp @@ -0,0 +1,72 @@ +<%pre> +#include +#include +#include +#include +#include +#include + +#include "exception.h" +#include "tools.h" +#include "epg_events.h" + +using namespace vdrlive; +using namespace std; + + +<%include>page_init.eh +<{ + EpgEvents epgEvents; + + if (cReplayControl::NowReplaying()) { + cThreadLock RecordingsLock(&Recordings); + cRecording *Recording = Recordings.GetByName(cReplayControl::NowReplaying()); + if (Recording) { + const cRecordingInfo* info = Recording->Info(); + if (info) { + EpgEventPtr epgEvent(new EpgEvent("recording", + Recording->Name(), + info->Title() ? info->Title() : Recording->Name(), + info->ShortText() ? info->ShortText() : "", + info->Description() ? info->Description() : "", + Recording->start, + Recording->start)); + epgEvents.push_back(epgEvent); + } + } + } + else { + ReadLock channelsLock( Channels ); + if (cDevice::CurrentChannel()) { + cChannel* Channel = Channels.GetByNumber(cDevice::CurrentChannel()); + if (!Channel) + throw HtmlError("got invalid channel number!"); + cSchedulesLock schedulesLock; + const cSchedules* Schedules = cSchedules::Schedules(schedulesLock); + const cSchedule *Schedule = Schedules->GetSchedule(Channel); + if (Schedule) { + const cEvent *Event = Schedule->GetPresentEvent(); + if (Event) { + EpgEventPtr epgEvent(new EpgEvent("channel", + Event, + Channel->Name())); + epgEvents.push_back(epgEvent); + } + } + } + } + if (epgEvents.size() > 0) { + for (vector::iterator i = epgEvents.begin(); i != epgEvents.end(); ++i) { + EpgEventPtr epg = *i; +}> + <& pageelems.status_box type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) &> +<{ + } + } + else { +}> + No relevant information could be retrieved! +<{ + } +}> +<%include>page_exit.eh diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 8cc94fd..92afc5a 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -17,7 +17,21 @@ using namespace vdrlive; <# ---------------------------------------------------------------------- #> <%def logo> -

+ + +<# ---------------------------------------------------------------------- #> + +<%def progressbar> +<%args> + string progress; + +

<# ---------------------------------------------------------------------- #> @@ -60,6 +74,7 @@ using namespace vdrlive; string title; string short_descr; string long_descr; + int elapsed = -1;

@@ -71,6 +86,9 @@ using namespace vdrlive;

<$ (time) $>

+% if (elapsed >= 0) { +

<& pageelems.progressbar progress=(elapsed) &>

+% }

<$ (title) $>

<$ (short_descr) $>

@@ -80,3 +98,32 @@ using namespace vdrlive;

+ +<# ---------------------------------------------------------------------- #> + +<%def status_box> +<%args> + string type; + string currentTime; + string caption; + string title; + string duration; + int elapsed; + +

<$ caption $>

<$ currentTime $>

<$ title $>

<$ duration $>

+% if (elapsed >= 0) { +

<& pageelems.progressbar progress=(elapsed) &>

+% } +

+ diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 1901b78..755a3bc 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -27,14 +27,14 @@ EpgEvents epgEvents; VDR-Live - <$ pageTitle $> - <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> + - + <& pageelems.logo &> <& menu active=("recordings") &> -

% if (Recordings.Count() == 0) { Keine Aufnahmen vorhanden % } else { @@ -154,7 +154,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { + epg->StartTime(tr("%b %d %y")) + string(" ") + epg->StartTime(tr("%I:%M %p"))); }> - <& pageelems.epg_tt_box boxId=(epg->Id()) caption=(epg->Caption()) tools_comp=("recordings.rec_tools") time=(start) title=(epg->Title()) short_descr=(epg->ShortDescr()) long_descr=(epg->LongDescr()) &> + <& pageelems.epg_tt_box boxId=(epg->Id()) caption=(epg->Caption()) tools_comp=("recordings.rec_tools") time=(start) title=(epg->Title()) short_descr=(epg->ShortDescr()) long_descr=(epg->LongDescr()) elapsed=(epg->Elapsed()) &> <{ } }> diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 4565680..16033ff 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -64,12 +64,9 @@ using namespace vdrlive; VDR-Live - <$ pageTitle $> - -

- <& pageelems.logo &> - <& menu active="remote" &> -

+ <& pageelems.logo &> + <& menu active="remote" &>

@@ -150,7 +147,6 @@ using namespace vdrlive;

<%include>page_exit.eh diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index f524c7f..5e04264 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -46,8 +46,9 @@ using namespace vdrlive; VDR Live - <$ pageTitle $> + <& pageelems.ajax_js &> - + <& pageelems.logo &> <& menu active=("schedule") component=("schedule.channel_selection")>

diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index cf3ee1a..1915cd2 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -18,8 +18,9 @@ using namespace vdrlive; VDR-Live - <$ pageTitle $> + <& pageelems.ajax_js &> - + <& pageelems.logo &> <& menu active=("searchtimers") &>

diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 84d8371..d24a2d5 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -18,8 +18,9 @@ using namespace vdrlive; VDR-Live - <$ pageTitle $> + <& pageelems.ajax_js &> - + <& pageelems.logo &> <& menu active=("timers") &>

diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp index acdf567..32ce737 100644 --- a/pages/tooltip.ecpp +++ b/pages/tooltip.ecpp @@ -44,5 +44,5 @@ domId; <%args> domId; - ')">

+ ')">

diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 78a6347..555b6ed 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -38,7 +38,7 @@ if (type == "now") { <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> - + <& pageelems.logo &> <& menu active=(type) &>

@@ -54,7 +54,7 @@ if (type == "now") { if (Schedule) { const cEvent *Event = (type == "now" ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent()); if (Event) { - std::string evntId("eventId_"); + string evntId("eventId_"); evntId += lexical_cast(++evntNr); EpgEventPtr epgEvent(new EpgEvent(evntId, Event, Channel->Name())); epgEvents.push_back(epgEvent); @@ -81,10 +81,12 @@ if (type == "now") {

<$ (epgEvent->ShortDescr()) $>

<$ (StringWordTruncate(epgEvent->LongDescr(), 150, truncated)) $>

LongDescr(), 300, truncated)) + string("
") + string(tr("Click to view details."))) &><& tooltip.display domId=(epgEvent->Id()) &>><$ (string(tr("more")) + string(" ...")) $>

+% if (epgEvent->Elapsed() >= 0) { +

<& pageelems.progressbar progress=(epgEvent->Elapsed()) &>

+% }

- <{ } } @@ -99,7 +101,7 @@ if (type == "now") { for (vector::iterator i = epgEvents.begin(); i != epgEvents.end(); ++i) { EpgEventPtr epg = *i; }> - <& pageelems.epg_tt_box boxId=(epg->Id()) caption=(epg->Caption()) time=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) short_descr=(epg->ShortDescr()) long_descr=(epg->LongDescr()) &> + <& pageelems.epg_tt_box boxId=(epg->Id()) caption=(epg->Caption()) time=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) short_descr=(epg->ShortDescr()) long_descr=(epg->LongDescr()) elapsed=(epg->Elapsed()) &> <{ } }> diff --git a/tools.cpp b/tools.cpp index 1cdd447..677ce02 100644 --- a/tools.cpp +++ b/tools.cpp @@ -10,7 +10,7 @@ using namespace std; using namespace tnt; - + istream& operator>>( istream& is, tChannelID& ret ) { if ( is.rdbuf()->in_avail() > 0 ) { @@ -31,7 +31,7 @@ string FormatDateTime( char const* format, time_t time ) builder << "cannot represent timestamp " << time << " as local time"; throw runtime_error( builder.str() ); } - + char result[ 256 ]; if ( strftime( result, sizeof( result ), format, &tm_r ) == 0 ) { ostringstream builder; -- cgit v1.2.3