From 503a94cd38b65b686fe898aba960b55ab47ddbf5 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun, 24 Feb 2008 16:59:29 +0100
Subject: Pagemenu is an ID of the corresponding div now. There is only one
 pagemenu allowed so this change makes it clear. Adapted styles in global
 styles.css as well in the themes supplied with live.

---
 pages/menu.ecpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'pages')

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index c7a9ba2..bb7f47a 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -27,11 +27,8 @@ std::string set_component;
 <%cpp>
 if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 
-bool hasComp(!component.empty());
-bool hasMesg(timerNotifier.ShouldNotify());
-
 set_active = active;
-if (hasComp) {
+if (!component.empty()) {
 	set_component = component;
 }
 
@@ -63,15 +60,17 @@ if (LiveSetup().UseAuth()) {
 </%cpp>
 	| <a <& tooltip.display domId=("aboutBox") &>>?</a>
 </div>
-<div class="pagemenu <? (!hasComp && !hasMesg) ? "notpresent" ?>">
+<%cpp>
+if (!component.empty()) {
+</%cpp>
+<div id="pagemenu">
   <div> <!-- outer -->
-	<div id="pmmessage" class="<? (!hasMesg) ? "notpresent" ?>"><span><$ timerNotifier.Message() $></span></div>
-    <div id="pmcontent" class="<? (!hasComp) ? "notpresent" ?>"> <!-- inner -->
+    <div> <!-- inner -->
 	  <& menu.component current=("whats_on") &>
 	  <& menu.component current=("schedule") &>
 	  <& menu.component current=("timers") &>
 <%cpp>
-	if ( LiveFeatures< features::epgsearch >().Recent() ) {
+	if (LiveFeatures< features::epgsearch >().Recent()) {
 </%cpp>
 	  <& menu.component current=("search") &>
 	  <& menu.component current=("searchtimers") &>
@@ -83,6 +82,9 @@ if (LiveSetup().UseAuth()) {
     </div>
   </div>
 </div>
+<%cpp>
+}
+</%cpp>
 
 <%def setactive>
 <%args>
-- 
cgit v1.2.3