diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Makefile | 4 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 3 | ||||
| -rw-r--r-- | pages/recordings.ecpp | 63 | ||||
| -rw-r--r-- | pages/schedule.ecpp | 2 |
4 files changed, 61 insertions, 11 deletions
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); <div class="about_right">Michael Brückner (skiller2k1)</div> <div class="about_head"><div><div><$ tr("Information") $></div></div></div> <div class="about_left"><$ tr("LIVE version") $>:</div> - <div class="about_right"><$ LIVEVERSION $></div> + <div class="about_right"><$ LIVEVERSION $><$ VERSION_SUFFIX $></div> <div class="about_left"><$ tr("VDR version") $>:</div> <div class="about_right"><$ VDRVERSION $></div> <div class="about_head"><div><div><$ tr("Features") $></div></div></div> 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 <string> + #include <vdr/plugin.h> #include <vdr/config.h> @@ -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; </%pre> <%args> + string todel; </%args> <%session scope="global"> bool logged_in(false); </%session> <%request scope="page"> - RecordingsTreePtr recordingsTree(LiveRecordingsManager()->GetRecordingsTree()); + string deleteResult; </%request> <%include>page_init.eh</%include> <%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(), "~", "/"); +} </%cpp> <& pageelems.doc_type &> <html> @@ -37,18 +52,34 @@ using namespace std; </head> <body> <& pageelems.logo &> +<%cpp> +if (! deleteResult.empty()) { +</%cpp> + <& menu active=("recordings") component=("recordings.delete_error") &> +<%cpp> +} else { +</%cpp> <& menu active=("recordings") &> +<%cpp> +} +</%cpp> <div class="inhalt"> <div class="boxheader"><div><div><$ tr("List of recordings") $></div></div></div> -% if (Recordings.Count() == 0) { +<%cpp> + if (Recordings.Count() == 0) { +</%cpp> <$ tr("No recordings found") $> -% } else { +<%cpp> + } else { +</%cpp> <div class="recordings"> <ul class="recordingslist" style="display: block;"> <& recordings.recordings_item &> </ul> </div> -% } +<%cpp> + } +</%cpp> </div> </body> </html> @@ -62,6 +93,7 @@ using namespace std; int level = 0; </%args> <%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; +</%args> +<%cpp> { </%cpp><a href="recordings.html?todel=<$ id $>" <& tooltip.hint text=(tr("Delete this recording from hard disc!")) &>><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" /></a><%cpp> } </%cpp> +</%def> + +<# ---------------------------------------------------------------------- #> + <%def rec_tools> <%args> string id; @@ -120,6 +161,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { </%args> <& 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) &> </%def> <# ---------------------------------------------------------------------- #> @@ -189,7 +231,6 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { </%cpp> <!-- not supported yet ... <img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" /> - <img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" /> --> </div> <%cpp> @@ -201,3 +242,9 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) { </%cpp> </div> </%def> + +<# ---------------------------------------------------------------------- #> + +<%def delete_error> +<%cpp> { </%cpp><$ deleteResult $><%cpp> } </%cpp> +</%def> 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"); </head> <body> <& pageelems.logo &> - <& menu active=("schedule") component=("schedule.channel_selection")> + <& menu active=("schedule") component=("schedule.channel_selection") &> <div class="inhalt"> <%cpp> if ( Schedule == 0 ) { |