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.

5 files changed, 36 insertions, 46 deletions

diff --git a/css/styles.css b/css/styles.css
index 7f0209a..3e64f09 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -413,56 +413,44 @@ div.inhalt {
 	padding: 10px;
 }
 
-div.pagemenu {
+div#pagemenu {
 	margin-top: 2px;
 	padding-top: 6px;
 	background: #FFFFFF url(img/bg_line.png) top repeat-x;
 }
 
-div.pagemenu div {
+div#pagemenu div {
 	padding-bottom: 6px;
 	background: #FFFFFF url(img/bg_line_top.png) bottom repeat-x;
 }
 
-div.pagemenu div div {
+div#pagemenu div div {
 	padding: 2px 0px 2px 10px;
 	background: #E9EFFF;
 	border-top: 1px solid #C0C1DA;
 	border-bottom: 1px solid #C0C1DA;
 }
 
-div.pagemenu div div div {
+div#pagemenu div div div {
 	border: 0;
 	padding: 0;
 	margin: 0;
 }
 
-div.pagemenu form {
+div#pagemenu form {
 	display: inline;
 }
 
-div.pagemenu a {
+div#pagemenu a {
 	color: black;
 	font-weight: bold;
 }
 
-div.pagemenu a.active {
+div#pagemenu a.active {
 	color: blue;
 	font-weight: bold;
 }
 
-div.pagemenu #pmmessage {
-	border-bottom: 0px;
-        text-align: center;
-}
-
-div.pagemenu #pmmessage span {
-	padding: 0em 2em 0em 2em;
-        background: red;
-}
-
-div.pagemenu #pmcontent {
-}
 
 /* #######################
    #  Info Box (near logo)
diff --git a/live/themes/orange-blue/css/theme.css b/live/themes/orange-blue/css/theme.css
index c2b6056..cf3c503 100644
--- a/live/themes/orange-blue/css/theme.css
+++ b/live/themes/orange-blue/css/theme.css
@@ -116,33 +116,33 @@ div.menu a.active {
 	color: #122DBA;
 }
 
-div.pagemenu {
+div#pagemenu {
 	background: #FFFFFF url(../img/bg_line.png) top repeat-x;
 }
 
-div.pagemenu div {
+div#pagemenu div {
 	background: #FFFFFF url(../img/bg_line_top.png) bottom repeat-x;
 }
 
-div.pagemenu div div {
+div#pagemenu div div {
 	background: #122DBA;
 	border-top: 1px solid #C0C0FF;
 	border-bottom: 1px solid #C0C0FF;
 }
 
-div.pagemenu a {
+div#pagemenu a {
 	color: #FCBC40;
 }
 
-div.pagemenu a.active {
+div#pagemenu a.active {
 	color: #FFFDDD;
 }
 
-div.pagemenu span {
+div#pagemenu span {
 	color: #FCBC40;
 }
 
-div.pagemenu span.sep {
+div#pagemenu span.sep {
 	color: #FCBC40;
 }
 
diff --git a/live/themes/redwine/css/theme.css b/live/themes/redwine/css/theme.css
index c8dae90..ee8e776 100644
--- a/live/themes/redwine/css/theme.css
+++ b/live/themes/redwine/css/theme.css
@@ -30,29 +30,29 @@ div.menu {
 	color: #FFE9FA;
 }
 
-div.pagemenu {
+div#pagemenu {
 	background: #FFFFFF url(../img/bg_line.png) top repeat-x;
 }
 
-div.pagemenu div {
+div#pagemenu div {
 	background: #FFFFFF url(../img/bg_line_top.png) bottom repeat-x;
 }
 
-div.pagemenu div div {
+div#pagemenu div div {
 	background: #FFE9FA;
 	border-top: 1px solid #DA8DA8;
 	border-bottom: 1px solid #DA8DA8;
 }
 
-div.pagemenu a.active {
+div#pagemenu a.active {
 	color: #984E79;
 }
 
-div.pagemenu span.sep {
+div#pagemenu span.sep {
 	color: #DA8DA8;
 }
 
-div.pagemenu span.active {
+div#pagemenu span.active {
 	color: #984E79;
 }
 
diff --git a/live/themes/veltliner/css/theme.css b/live/themes/veltliner/css/theme.css
index 7748da2..0121301 100644
--- a/live/themes/veltliner/css/theme.css
+++ b/live/themes/veltliner/css/theme.css
@@ -75,29 +75,29 @@ div.menu {
 	color: #005E00;
 }
 
-div.pagemenu {
+div#pagemenu {
 	background: #00F0F0 url(../img/bg_line.png) top repeat-x;
 }
 
-div.pagemenu div {
+div#pagemenu div {
 	background: #00F0F0 url(../img/bg_line_top.png) bottom repeat-x;
 }
 
-div.pagemenu div div {
+div#pagemenu div div {
 	background: #00AE00;
 	border-top: 1px solid #006300;
 	border-bottom: 1px solid #005E00;
 }
 
-div.pagemenu a.active {
+div#pagemenu a.active {
 	color: #E03000;
 }
 
-div.pagemenu span.sep {
+div#pagemenu span.sep {
 	color: #001E00;
 }
 
-div.pagemenu span.active {
+div#pagemenu span.active {
 	color: #E03000;
 }
 
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>