From a0759ebfa6f30c26139907e01b905a0aa22c34ec Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Sun, 17 Feb 2008 12:54:58 +0100
Subject: moved timer conflicts from main menu to timers menu

---
 pages/menu.ecpp   | 1 -
 pages/timers.ecpp | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'pages')

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index a8eba86..e9b5faf 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -39,7 +39,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 % if ( LiveFeatures< features::epgsearch >().Recent() ) {
 	| <a href="searchepg.html" <& menu.setactive current=("searchepg") &>><$ tr("Search") $></a>
 	| <a href="searchtimers.html" <& menu.setactive current=("searchtimers") &>><$ tr("Searchtimers") $></a>
-	| <a href="timerconflicts.html" <& menu.setactive current=("timerconflicts") &>><$ tr("Timer conflicts") $></a>
 % }
 	| <a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a>
 	| <a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a>
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 581e51c..bc57b66 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -6,6 +6,7 @@
 #include "setup.h"
 #include "i18n.h"
 #include "epg_events.h"
+#include "livefeatures.h"
 
 using namespace std;
 using namespace vdrlive;
@@ -152,4 +153,8 @@ static const size_t maximumDescriptionLength = 300;
 
 <%def timer_actions>
 <a href="edit_timer.html"><$ tr("New timer") $></a>
+% if ( LiveFeatures< features::epgsearch >().Recent() ) {
+<span class="sep">|</span>
+<a href="timerconflicts.html"><$ tr("Timer conflicts") $></a>
+% }
 </%def>
-- 
cgit v1.2.3