Changed overall menue structure

author: Thomas Keil <tkeil (at) datacrystal (dot) de> 2007-01-13 19:54:00 +0000
committer: Thomas Keil <tkeil (at) datacrystal (dot) de> 2007-01-13 19:54:00 +0000
commit: fa0c9473db7ff372d4654f3a00dd039222c45189 (patch)
tree: 02019a8e85e43b39e09d74533e6aaead4496182b
parent: 2072c668df9ad48586fd2750713da0be742dda6d (diff)
download: vdr-plugin-live-fa0c9473db7ff372d4654f3a00dd039222c45189.tar.gz
vdr-plugin-live-fa0c9473db7ff372d4654f3a00dd039222c45189.tar.bz2
8 files changed, 62 insertions, 62 deletions
diff --git a/css/styles.css b/css/styles.css
index 6afebb0..e32f95a 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -55,26 +55,6 @@ div.domTTOverlib .contents {
 	background-color: #F1F1FF;
 }
 
-/* #######################
-   #  Areas
-   #######################
-*/
-div.left_area {
-	width: 150px;
-	float: left;
-}
-
-div.left_area img.logo {
-	margin: 5px;
-}
-
-div.right_area {
-	float: left;
-}
-
-div.inhalt {
-	margin: 5px;
-}
 
 /* #######################
    #  Menue
@@ -82,19 +62,36 @@ div.inhalt {
 */
 
 div.menu {
-	border: 1px solid #6D96A9;
+	background: #000057  url(menu_line_bg.png) repeat-x;
+	min-height: 30px;
+	margin: 0;
+	padding: 0 0 0 10px;
+	line-height: 20px;
+	vertical-align: middle;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
 	color: #6D96A9;
-	padding: 5px;
-	margin: 5px;
 }
 
 div.menu a {
 	text-decoration: none;
+	color: white;
+	font-weight: bold;
 }
 
-div.menu a:hover {
+div.menu a.active {
 	text-decoration: none;
-	background: #DEE6EE;
+	color: #6D96A9;
+	font-weight: bold;
+}
+
+
+div.menu a:hover {
+	text-decoration: underline;
+}
+
+div.inhalt {
+	padding: 10px;
 }
 
 /* #######################
diff --git a/images/Makefile b/images/Makefile
index a8ef343..450cb35 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -19,7 +19,7 @@ OBJS	= logo.o record.o active.o inactive.o button_blue.o	\
 	  transparent.o	edit.o del.o play.o			\
 	  bg_header_h.o bg_header_l.o bg_header_r.o		\
 	  bg_box_h.o  bg_box_l.o  bg_box_r.o			\
-	  movie.o
+	  movie.o menu_line_bg.o
 
 ### Default rules:
 
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 3d46df4..a36a01a 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -2,11 +2,29 @@
 #include <vdr/plugin.h>
 #include <vdr/config.h>
 </%pre>
+<%args>
+active;
+</%args>
+<%request scope="page">
+std::string set_active;
+</%request>
+<{
+	set_active = active;
+}>
 <div class="menu">
-				<a href="whats_on.html?type=now"><$ tr("What's on now?") $></a><br/>
-				<a href="whats_on.html?type=next"><$ tr("What's on next?") $></a><br/>
-				<a href="schedule.html"><$ tr("Schedule") $></a><br />
-				<a href="timers.html"><$ tr("Timers") $></a><br />
-				<a href="recordings.html"><$ tr("Recordings") $></a><br />
-				<a href="remote.html"><$ tr("Remote Control") $></a>
-			</div>
+	<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="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> |
+	<a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> |
+	<a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a> |
+	<a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a> 
+</div>
+
+<%def setactive>
+<%args>
+current;
+</%args>
+<{ if (current== set_active) { }>
+class="active"
+<{ } }>
+</%def>
+\ No newline at end of file
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index b93e16e..a8aa15d 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -26,22 +26,18 @@ RecordingsTree recordingsTree;
 <& pageelems.tooltip_js &>
 	</head>
 	<body>
-		<div class="left_area">
-			<& pageelems.logo &>
-			<& menu &>
-		</div>
-		<div class="right_area">
-		<div class="inhalt">
+		<& pageelems.logo &>
+		<& menu active=("recordings") &>
+	<div class="inhalt">
 			<& pageelems.header_box content=(tr("Recordings")) &>
 %			if (Recordings.Count() == 0) {
 				Keine Aufnahmen vorhanden
 %			} else {
-				<div class="recordings">
+			<div class="recordings">
 <& recordings.recordings_item &>
-				</div>
+			</div>
 %			}
 		</div>
-		</div>
 	</body>
 </html>
 <%include>page_exit.eh</%include>
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index 0926052..dabad65 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -107,7 +107,7 @@ using namespace vdrlive;
 	<body onload="StreamInit(); FillIntervals();">
 		<div class="left_area">
 			<& pageelems.logo &>
-			<& menu >
+			<& menu active="remote" &>
 		</div>
 	<div class="right_area"
 		<div class="inhalt">
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 4ff06ad..3bc50fd 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -48,11 +48,8 @@ using namespace vdrlive;
 		<link rel="stylesheet" type="text/css" href="/styles.css" />
 	</head>
 	<body>
-		<div class="left_area">
-			<& pageelems.logo &>
-			<& menu >
-		</div>
-	<div class="right_area">
+		<& pageelems.logo &>
+		<& menu active=("schedule")>
 		<div class="inhalt">
 <&pageelems.header_box component=("schedule.channel_selection") &>
 			<table class="schedule" cellspacing="0" callpadding="0">
@@ -91,7 +88,6 @@ using namespace vdrlive;
 %				}
 			</table>
 		</div>
-	</div>
 	</body>
 </html>
 <%include>page_exit.eh</%include>
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 97adafa..422b2ea 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -20,11 +20,8 @@ using namespace vdrlive;
 		<link rel="stylesheet" type="text/css" href="/styles.css" />
 	</head>
 	<body>
-		<div class="left_area">
-			<& pageelems.logo &>
-			<& menu >
-		</div>
-	<div class="right_area">
+		<& pageelems.logo &>
+		<& menu active=("timers") &>
 		<div class="inhalt">
 			<& pageelems.header_box	content=(pageTitle) &>
 %			if (timers.size() == 0) {
@@ -62,7 +59,6 @@ using namespace vdrlive;
 }>
 			</table>
 		</div>
-	</div>
 	</body>
 </html>
 <%include>page_exit.eh</%include>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 9bb3171..3c06c91 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -24,6 +24,7 @@ string head;
 if (type == "now") {
 	head = tr("What's running at")+string(" ")+FormatDateTime(tr("%I:%M %p"), time(0));
 } else {
+	type="next";
 	head = tr("What's on next?");
 }
 
@@ -40,13 +41,9 @@ if (type == "now") {
     </script>
 	</head>
 	<body>
-		<div class="left_area">
-			<& pageelems.logo &>
-			<& menu >
-		</div>
-		<div class="right_area">
-			<div class="inhalt">
-				<& pageelems.header_box content=(head) &>
+		<& pageelems.logo &>
+		<& menu active=(type) &>
+		<div class="inhalt">
 <{
 	ReadLock channelsLock( Channels );
 	if (channelsLock) {
author	Thomas Keil <tkeil (at) datacrystal (dot) de>	2007-01-13 19:54:00 +0000
committer	Thomas Keil <tkeil (at) datacrystal (dot) de>	2007-01-13 19:54:00 +0000
commit	fa0c9473db7ff372d4654f3a00dd039222c45189 (patch)
tree	02019a8e85e43b39e09d74533e6aaead4496182b
parent	2072c668df9ad48586fd2750713da0be742dda6d (diff)
download	vdr-plugin-live-fa0c9473db7ff372d4654f3a00dd039222c45189.tar.gz vdr-plugin-live-fa0c9473db7ff372d4654f3a00dd039222c45189.tar.bz2