From d43534acfc3e0e094671485b9ddffec77d1ef6ec Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Fri, 25 May 2007 13:51:30 +0000
Subject: - merged 'What's on now' and 'What's on next'

---
 pages/menu.ecpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'pages/menu.ecpp')

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index acae70c..4a034a1 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -29,8 +29,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		set_component = component;
 }>
 <div class="menu">
-	<a href="whats_on.html?type=now" <& menu.setactive current=("now") &>><$ tr("What's on now?") $></a> |
-	<a href="whats_on.html?type=next" <& menu.setactive current=("next") &>><$ tr("What's on next?") $></a> |
+	<a href="whats_on.html?type=now" <& menu.setactive current=("whats_on") &>><$ tr("What's on?") $></a> |
 	<a href="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> |
 	<a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> |
 % if (LiveSetup().HaveEPGSearch()) {
@@ -51,8 +50,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <div class="pagemenu">
  <div> <!-- outer -->
   <div> <!-- inner -->
-	<& menu.component current=("now") &>
-	<& menu.component current=("next") &>
+	<& menu.component current=("whats_on") &>
 	<& menu.component current=("schedule") &>
 	<& menu.component current=("timers") &>
 % if (LiveSetup().HaveEPGSearch()) {
-- 
cgit v1.2.3