From 81db819a3d93b57dd77ad7ee2c654a607abd99c9 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Fri, 25 Jan 2008 23:35:48 +0100 Subject: - tadi's update --- pages/Makefile | 4 +++- pages/pageelems.ecpp | 3 ++- pages/recordings.ecpp | 63 ++++++++++++++++++++++++++++++++++++++++++++------- pages/schedule.ecpp | 2 +- 4 files changed, 61 insertions(+), 11 deletions(-) (limited to 'pages') diff --git a/pages/Makefile b/pages/Makefile index 11b7ebe..8f718fe 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -41,10 +41,12 @@ all: libpages.a MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies -$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp) +$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp) @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@ +ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) +endif ### Targets: diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index b61e663..34cfbf8 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -9,6 +9,7 @@ #include "timers.h" #include "tools.h" #include "epg_events.h" +#include "gen_version_suffix.h" using namespace std; using namespace vdrlive; @@ -334,7 +335,7 @@ int update_status(1);
Michael Brückner (skiller2k1)
<$ tr("Information") $>
<$ tr("LIVE version") $>:
-
<$ LIVEVERSION $>
+
<$ LIVEVERSION $><$ VERSION_SUFFIX $>
<$ tr("VDR version") $>:
<$ VDRVERSION $>
<$ tr("Features") $>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 2acfdc4..11b20a6 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -1,4 +1,6 @@ <%pre> +#include + #include #include @@ -6,26 +8,39 @@ #include "tools.h" #include "epg_events.h" -#include "recman.h" #include "setup.h" +#include "tasks.h" +#include "tools.h" + +#include "recman.h" using namespace vdrlive; using namespace std; <%args> + string todel; <%session scope="global"> bool logged_in(false); <%request scope="page"> - RecordingsTreePtr recordingsTree(LiveRecordingsManager()->GetRecordingsTree()); + string deleteResult; <%include>page_init.eh <%cpp> - if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); +if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); + +pageTitle = tr("Recordings"); - pageTitle = tr("Recordings"); +if (!todel.empty()) { + RemoveRecordingTask task(todel); + LiveTaskManager().Execute(task); + if (!task.Result()) + deleteResult = string() + tr("ERROR:") + " " + task.Error(); + else + deleteResult = string() + tr("Deleted recording:") + " " + StringReplace(task.RecName(), "~", "/"); +} <& pageelems.doc_type &> @@ -37,18 +52,34 @@ using namespace std; <& pageelems.logo &> +<%cpp> +if (! deleteResult.empty()) { + + <& menu active=("recordings") component=("recordings.delete_error") &> +<%cpp> +} else { + <& menu active=("recordings") &> +<%cpp> +} +
<$ tr("List of recordings") $>
-% if (Recordings.Count() == 0) { +<%cpp> + if (Recordings.Count() == 0) { + <$ tr("No recordings found") $> -% } else { +<%cpp> + } else { +
    <& recordings.recordings_item &>
-% } +<%cpp> + } +
@@ -62,6 +93,7 @@ using namespace std; int level = 0; <%cpp> +RecordingsTreePtr recordingsTree(LiveRecordingsManager()->GetRecordingsTree()); RecordingsMap::iterator iter; RecordingsMap::iterator end = recordingsTree->end(path); @@ -113,6 +145,15 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { <# ---------------------------------------------------------------------- #> +<%def del_rec> +<%args> + string id; + +<%cpp> { >" alt="" /><%cpp> } + + +<# ---------------------------------------------------------------------- #> + <%def rec_tools> <%args> string id; @@ -120,6 +161,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { <& pageelems.ajax_action_href action="play_recording" param=(id) tip=(tr("play this recording.")) image="play.png" alt="" &> <& pageelems.imdb_info_href title=(title) &> +<& recordings.del_rec id=(id) &> <# ---------------------------------------------------------------------- #> @@ -189,7 +231,6 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { <%cpp> @@ -201,3 +242,9 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { + +<# ---------------------------------------------------------------------- #> + +<%def delete_error> +<%cpp> { <$ deleteResult $><%cpp> } + diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 7896f6f..35b892b 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -64,7 +64,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& pageelems.logo &> - <& menu active=("schedule") component=("schedule.channel_selection")> + <& menu active=("schedule") component=("schedule.channel_selection") &>
<%cpp> if ( Schedule == 0 ) { -- cgit v1.2.3