Updated header lines.

Moved channel selection into menu line, when schedule is active.

8 files changed, 28 insertions, 26 deletions

diff --git a/css/styles.css b/css/styles.css
index bcf485e..a47f8a4 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -90,6 +90,10 @@ div.menu a:hover {
 	text-decoration: underline;
 }
 
+div.menu form {
+	display: inline;
+}
+
 div.inhalt {
 	padding: 10px;
 }
@@ -292,7 +296,7 @@ table.schedule tr td.head {
 table.schedule tr td {
 	vertical-align: top;
 	padding: 3px 7px 3px 3px;
-	background: url(http://cerebellum/~michi/bg_line.png) bottom repeat-x;
+	background: url(bg_line.png) bottom repeat-x;
 }
 
 table.schedule tr td.day {
diff --git a/images/Makefile b/images/Makefile
index 450cb35..1f1545f 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 menu_line_bg.o
+	  movie.o menu_line_bg.o bg_line.o
 
 ### Default rules:
 
diff --git a/images/bg_line.png b/images/bg_line.png
new file mode 100644
index 0000000..96ea2b6
--- /dev/null
+++ b/images/bg_line.png
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 2989e99..87978f5 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -4,20 +4,24 @@
 </%pre>
 <%args>
 active;
+component;
 </%args>
 <%request scope="page">
 std::string set_active;
+std::string set_component;
 </%request>
 <{
 	set_active = active;
+	if (!component.empty())
+		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="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> 
+	<a href="whats_on.html?type=now" <& menu.setactive current=("now") &>><$ tr("What's on now?") $></a> <& menu.component current=("now") &> |
+	<a href="whats_on.html?type=next" <& menu.setactive current=("next") &>><$ tr("What's on next?") $></a> <& menu.component current=("next") &> |
+	<a href="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> <& menu.component current=("schedule") &> |
+	<a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> <& menu.component current=("timers") &> |
+	<a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a> <& menu.component current=("recordings") &> |
+	<a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a> <& menu.component current=("remote") &>
 </div>
 
 <%def setactive>
@@ -25,4 +29,11 @@ std::string set_active;
 current;
 </%args>
 <%cpp> if (current== set_active) { </%cpp>class="active"<%cpp> } </%cpp>
-</%def>
\ No newline at end of file
+</%def>
+
+<%def component>
+<%args>
+current;
+</%args>
+<%cpp> if ((current== set_active) && (!set_component.empty())) { </%cpp><& (set_component) &><%cpp> } </%cpp>
+</%def>
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 6261e34..07f0a1d 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -42,7 +42,7 @@ component;
 	tChannelID channelid;
 	tEventID eventid;
 </%args>
-	<a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="/record.png" alt="" <& tooltip_widget tooltip=(tr("Record this")) &> border="0"/></a>
+	<a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip_widget tooltip=(tr("Record this")) &> border="0"/></a>
 <%cpp>
 
 </%cpp>
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index dabad65..798a759 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -111,7 +111,6 @@ using namespace vdrlive;
 		</div>
 	<div class="right_area"
 		<div class="inhalt">
-			<& pageelems.header_box content=(pageTitle) &>
 			<div class="screenshot">
 				<img src="screenshot.jpg" name="vdrlive" /><br />
 				<$ tr("Interval:") $> <select name="interval" onchange="ChangeInterval()"></select>
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 579be9a..f524c7f 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -45,13 +45,12 @@ using namespace vdrlive;
 <html>
 	<head>
 		<title>VDR Live - <$ pageTitle $></title>
-		<link rel="stylesheet" type="text/css" href="/styles.css" />
+		<link rel="stylesheet" type="text/css" href="styles.css" />
 	</head>
 	<body>
 		<& pageelems.logo &>
-		<& menu active=("schedule")>
+		<& menu active=("schedule") component=("schedule.channel_selection")>
 		<div class="inhalt">
-<&pageelems.header_box component=("schedule.channel_selection") &>
 			<table class="schedule" cellspacing="0" callpadding="0">
 <{
 				bool active_line = false;
@@ -105,15 +104,5 @@ using namespace vdrlive;
 <%include>page_exit.eh</%include>
 
 <%def channel_selection>
-				<table>
-					<tr>
-						<td><? Channel ? Channel->Name() ?></td>
-						<td>
-							<form name="channels" id="channels">
-							<& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "")
-									onchange=("document.forms.channels.submit()") &>
-							</form>
-						</td>
-					</tr>
-				</table>
+<form name="channels" id="channels"><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &></form>
 </%def>
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 422b2ea..84d8371 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -23,7 +23,6 @@ using namespace vdrlive;
 		<& pageelems.logo &>
 		<& menu active=("timers") &>
 		<div class="inhalt">
-			<& pageelems.header_box	content=(pageTitle) &>
 %			if (timers.size() == 0) {
 				Keiner Timer definiert
 %			} else {