diff options
| -rw-r--r-- | images/Makefile | 5 | ||||
| -rw-r--r-- | images/arrow_rec.gif | bin | 0 -> 4121 bytes | |||
| -rw-r--r-- | pages/recordings.ecpp | 13 | ||||
| -rw-r--r-- | pages/timers.ecpp | 56 |
4 files changed, 38 insertions, 36 deletions
diff --git a/images/Makefile b/images/Makefile index 098a701..f62a90a 100644 --- a/images/Makefile +++ b/images/Makefile @@ -23,7 +23,7 @@ OBJS = logo.o record.o active.o inactive.o button_blue.o \ reload.o stop.o one_uparrow.o one_downarrow.o tv.o \ remotecontrol.o search.o record_timer.o button_red.o \ button_green.o button_new.o help.o logo_login.o \ - button_yellow.o arrow.o on_dvd.o + button_yellow.o arrow.o arrow_rec.o on_dvd.o ### Default rules: @@ -39,6 +39,9 @@ all: libimages.a %.cpp: %.png $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/png" $< +%.cpp: %.gif + $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/gif" $< + %.cpp: %.jpg $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/jpg" $< diff --git a/images/arrow_rec.gif b/images/arrow_rec.gif Binary files differnew file mode 100644 index 0000000..16e4f46 --- /dev/null +++ b/images/arrow_rec.gif diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index c9f9432..4993284 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -23,10 +23,9 @@ RecordingsTree recordingsTree(LiveRecordingsManager()); EpgEvents epgEvents; </%request> <%include>page_init.eh</%include> -<{ -if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); -}> <%cpp> + if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); + pageTitle = tr("Recordings"); </%cpp> <& pageelems.doc_type &> @@ -117,7 +116,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { <# ---------------------------------------------------------------------- #> <%def recordings_data> -<{ +<%cpp> // create hidden div for the tooltip hints. for (vector<EpgEventPtr>::iterator i = epgEvents.begin(); i != epgEvents.end(); ++i) { EpgEventPtr epg = *i; @@ -125,11 +124,11 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { + epg->StartTime(tr("%b %d %y")) + string(" ") + epg->StartTime(tr("%I:%M %p"))); string tools_component = epg->Archived().empty() ? "recordings.rec_tools" : "recordings.archived_disc" ; -}> +</%cpp> <& pageelems.epg_tt_box boxId=(epg->Id()) caption=(epg->Caption()) tools_comp=(tools_component) time=(start) title=(epg->Title()) short_descr=(epg->ShortDescr()) long_descr=(epg->LongDescr()) archived=(epg->Archived()) elapsed=(epg->Elapsed()) &> -<{ +<%cpp> } -}> +</%cpp> </%def> <# ---------------------------------------------------------------------- #> diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 0f20662..7e38444 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -14,16 +14,15 @@ using namespace vdrlive; string action; </%args> <%session scope="global"> -bool logged_in(false); + bool logged_in(false); </%session> <%request scope="page"> -cTimer* timer; + cTimer* timer; </%request> <%include>page_init.eh</%include> -<{ -if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); -}> <%cpp> + if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); + pageTitle = tr("Timers"); cMutexLock timersLock( &LiveTimerManager() ); @@ -38,17 +37,15 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); LiveTimerManager().DelTimer(timer); if (action == "toggle") LiveTimerManager().ToggleTimerActive(timer); - } int previousDay = 0; - </%cpp> <& pageelems.doc_type &> <html> <head> <title>VDR-Live - <$ pageTitle $></title> - <link rel="stylesheet" type="text/css" href="/styles.css" /> + <link rel="stylesheet" type="text/css" href="styles.css" /> <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> </head> @@ -57,60 +54,63 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& menu active=("timers") component=("timers.timer_actions")> <div class="inhalt"> % if (timers.size() == 0) { - Keiner Timer definiert + <$ tr("No timer defined") $> % } else { <table class="timers" cellspacing="0" cellpadding="0"> -<{ +<%cpp> for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { if (previousDay != timer->Day()) { if (previousDay > 0) { -}> +</%cpp> <tr> - <td colspan="11" style="border-top: 1px solid black; border-bottom: none; background-image: none"> </td> + <td colspan="10" style="border-top: 1px solid black; border-bottom: none; background-image: none"> </td> </tr> -<{ +<%cpp> } previousDay = timer->Day(); -}> +</%cpp> <tr class="head"> <td style="background: url(bg_box_l.png); width: 3px;"></td> - <td colspan="9"><$ timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : FormatDateTime(tr("%A, %x"), timer->Day()) $></td> + <td colspan="8"><$ timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : FormatDateTime(tr("%A, %x"), timer->Day()) $></td> <td style="background: url(bg_box_r.png); width: 3px;"></td> </tr> <tr class="description"> <td class="border" style="border-left: 1px solid black"></td> - <td> </td> + <td><img src="transparent.png" alt="" width="16px" height="16px" /></td> <td><$ tr("Channel") $></td> <td><$ tr("Start") $></td> <td><$ tr("Stop") $></td> - <td> </td> <td><$ tr("File") $></td> - <td> </td> - <td> </td> - <td> </td> + <td><img src="transparent.png" alt="" width="16px" height="16px" /></td> + <td><img src="transparent.png" alt="" width="16px" height="16px" /></td> + <td><img src="transparent.png" alt="" width="16px" height="16px" /></td> <td class="border" style="border-right: 1px solid black"></td> </tr> - <{ +<%cpp> } -}> + std::string timerStateImg = "transparent.png"; + if (timer->Recording()) + timerStateImg = "arrow_rec.gif"; + else if (timer->Flags() & tfActive) + timerStateImg = "arrow.png"; +</%cpp> <tr> <td class="border" style="border-left: 1px solid black"></td> - <td><{ if (timer->Flags() & tfActive) { }><img src="/arrow.png" alt=""></img> <{ } }></td> + <td><img src="<$ timerStateImg $>" alt=""></img></td> <td><$ timer->Channel()->Name() $></td> <td><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></td> <td><$ FormatDateTime(tr("%I:%M %p"), timer->StopTime()) $></td> - <td><{ if (timer->Recording()) { }><img src="/record.png" alt="Record" /><{ } }></td> <td><$ timer->File() $></td> - <td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=toggle"><img src="/<$ (timer->Flags() & tfActive) ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td> + <td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=toggle"><img src="<$ (timer->Flags() & tfActive) ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td> <td><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="edit.png" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td> <td><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="del.png" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td> <td class="border" style="border-right: 1px solid black"></td> </tr> -<{ +<%cpp> } } -}> - <tr><td colspan="11" style="border-top: 1px solid black; background-image: none; border-bottom: none"> </td></tr> +</%cpp> + <tr><td colspan="10" style="border-top: 1px solid black; background-image: none; border-bottom: none"> </td></tr> </table> </div> </body> |
