From 78ffd15e485fe3ba341bf7d5e7479ff9a5a6de4b Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 23 Mar 2008 01:01:32 +0100 Subject: Some clean up in the timer editing call. Prepeared timer edititing to be a popup like the epg-data. This is not finished yet and seems to have some problems with the form and the popup. So the overall functionality is disabled. Never the less some of the changes for this are of general interrest, so current work was commited. Changes in the styles for this. --- pages/edit_timer.ecpp | 23 ++++++++++++++++++++--- pages/timers.ecpp | 10 ++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'pages') diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index 7b92551..f1c6ca2 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -20,6 +20,7 @@ using namespace vdrlive; // input parameters string timerid; string epgid; + string async; // form parameters tChannelID channel; bool active = true; @@ -53,6 +54,8 @@ cTimer* timer; <%cpp> if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); + bool ajaxReq = !async.empty() && (lexical_cast(async) != 0); + tChannelID channelid = tChannelID(); tEventID eventid = tEventID(); @@ -62,7 +65,9 @@ cTimer* timer; timer = 0; if ( !timerid.empty() ) { - timer = timers.GetByTimerId( timerid ); + string tId = SortedTimers::DecodeDomId(timerid); + dsyslog("DEBUG: TIMER: tId = %s", tId.c_str()); + timer = timers.GetByTimerId(tId); if ( timer == 0 ) throw HtmlError( tr("Couldn't find timer. Maybe you mistyped your request?") ); } @@ -134,19 +139,31 @@ cTimer* timer; VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $> +<%cpp> + if (!ajaxReq) { + <& pageelems.stylesheets &> <& pageelems.ajax_js &> +<%cpp> + } + +<%cpp> + if (!ajaxReq) { + <& pageelems.logo &> <& menu active=("timers") &> +<%cpp> + } +
-
+ - + diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 9af9425..654484f 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -38,7 +38,9 @@ static const size_t maximumDescriptionLength = 300; timer = 0; if ( !timerid.empty() ) { - timer = timers.GetByTimerId( timerid ); + string tId = SortedTimers::DecodeDomId(timerid); + dsyslog("DEBUG: TIMER: tId = %s", tId.c_str()); + timer = timers.GetByTimerId(tId); if ( timer == 0 ) throw HtmlError( tr("Couldn't find timer. Maybe you mistyped your request?") ); if (action == "delete") { @@ -143,9 +145,9 @@ static const size_t maximumDescriptionLength = 300; % } ><$ timer->File() $> - - - + + + <%cpp> } -- cgit v1.2.3
<$ timer ? tr("Edit timer") : tr("New timer") $>
<$ timer ? tr("Edit timer") : tr("New timer") $>
">Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>>">" alt="" <& tooltip.hint text=(tr("Edit timer")) &>>">" alt="" <& tooltip.hint text=(tr("Delete timer")) &>>">Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>>">" alt="" <& tooltip.hint text=(tr("Edit timer")) &>>">" alt="" <& tooltip.hint text=(tr("Delete timer")) &>>