diff options
| author | Sascha Volkenandt <sascha (at) akv-soft (dot) de> | 2007-01-05 20:56:33 +0000 |
|---|---|---|
| committer | Sascha Volkenandt <sascha (at) akv-soft (dot) de> | 2007-01-05 20:56:33 +0000 |
| commit | fdee52caab6c03c9512ce16ed654838ce621367e (patch) | |
| tree | 34a311c88ee615dc10907f347da5d46978c93ecd /pages | |
| parent | f809dd4c56887a28beb8b13442cca3017d9bda0e (diff) | |
| download | vdr-plugin-live-fdee52caab6c03c9512ce16ed654838ce621367e.tar.gz vdr-plugin-live-fdee52caab6c03c9512ce16ed654838ce621367e.tar.bz2 | |
- added new page edit_timer
- removed obsolete new_timer
- added button and link to edit_timer
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Makefile | 2 | ||||
| -rw-r--r-- | pages/edit_timer.ecpp (renamed from pages/new_timer.ecpp) | 30 | ||||
| -rw-r--r-- | pages/schedule.ecpp | 1 | ||||
| -rw-r--r-- | pages/timers.ecpp | 4 |
4 files changed, 27 insertions, 10 deletions
diff --git a/pages/Makefile b/pages/Makefile index 53266af..4f6422c 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -17,7 +17,7 @@ VDRDIR ?= ../../../.. OBJS = menu.o event_widget.o channels.o recordings.o schedule.o \ screenshot.o timers.o whats_on_now.o whats_on_next.o \ - keypress.o remote.o + keypress.o remote.o channels_widget.o ### Default rules: diff --git a/pages/new_timer.ecpp b/pages/edit_timer.ecpp index e8c27e7..aa0ec63 100644 --- a/pages/new_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -1,23 +1,41 @@ <%pre> #include <vdr/plugin.h> -#include <vdr/timers.h> #include <vdr/config.h> #include <vdr/i18n.h> #include "setup.h" #include "tools.h" +#include "timers.h" using namespace vdrlive; </%pre> <%args> +timerid; </%args> <{ ReadLock channelsLock( Channels ); - if (channelsLock) { + if (!channelsLock) + return DECLINED; // XXX error page + + { + ReadLock channelsLock2( Channels ); + if (!channelsLock2)return DECLINED; + } + + cMutexLock timersLock( &LiveTimerManager() ); + SortedTimers& timers = LiveTimerManager().GetTimers(); + + cTimer* timer = 0; + if ( !timerid.empty() ) { + timer = timers.GetByTimerId( timerid ); + if ( timer == 0 ) + return DECLINED; // XXX error page + } + }> <html> <head> - <title>VDR Live - <$ tr("New timer") $></title> + <title>VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $></title> <link rel="stylesheet" type="text/css" href="/styles.css" /> </head> <body> @@ -26,8 +44,9 @@ using namespace vdrlive; <& menu > </div> <div class="inhalt"> - <div class="head_box"><$ tr("New timer") $></div> + <div class="head_box"><$ timer ? tr("Edit timer") : tr("New timer") $></div> <form name="new_timer"> + <input type="hidden" name="timerid" value="<$ timerid $>"/> <table> <tr> <td>Timer aktiv: </td> @@ -109,6 +128,3 @@ using namespace vdrlive; </div> </body> </html> -<{ - } -}>
\ No newline at end of file diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index b1443cf..fcc784d 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -43,6 +43,7 @@ int channel = -1; <td><? Channel ? Channel->Name() ?></td> <td> <form name="channels" id="channels"> +<& channels_widget name=("channel") &> <select name="channel" onchange="document.forms.channels.submit()"> <{ for (cChannel *listChannel = Channels.First(); listChannel && listChannel->Number() <= LiveSetup().GetLastChannel(); listChannel = Channels.Next(listChannel)) { diff --git a/pages/timers.ecpp b/pages/timers.ecpp index f3915ff..8fc9e16 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -30,7 +30,7 @@ using namespace vdrlive; </div> <{ cMutexLock timersLock( &LiveTimerManager() ); - SortedTimersInterface& timers = LiveTimerManager().GetTimers(); + SortedTimers& timers = LiveTimerManager().GetTimers(); if (timers.size() == 0) { }> @@ -52,7 +52,7 @@ using namespace vdrlive; for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { }> <tr class="<$ active ? "active" : "" $>"> - <td><button type="button" class="smallbutton" onclick="location.href='edittimer.html?timer=<$ timers.GetTimerId(*timer) $>';"><$ tr("Edit") $></button></td> + <td><button type="button" class="smallbutton" onclick="location.href='edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>';"><$ tr("Edit") $></button></td> <td><img src="/<$ (timer->Flags() & 1) ? "active" : "inactive" $>.png" alt="Aktiv?" /></td> <td><$ timer->Channel()->Name() $></td> <td><$ FormatDateTime(tr("%a, %b %d"), timer->Day()) $></td> |