Michis header style and fontsize changes

7 files changed, 34 insertions, 18 deletions

diff --git a/pages/Makefile b/pages/Makefile
index 97b91cf..1425c1c 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -18,7 +18,7 @@ VDRDIR   ?= ../../../..
 OBJS	= menu.o event_widget.o channels.o recordings.o schedule.o \
           screenshot.o timers.o whats_on_now.o whats_on_next.o     \
           keypress.o remote.o channels_widget.o edit_timer.o       \
-          error_widget.o error.o
+          error_widget.o error.o pageelems.o
 
 ### Default rules:
 
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
new file mode 100644
index 0000000..42fecb1
--- /dev/null
+++ b/pages/pageelems.ecpp
@@ -0,0 +1,26 @@
+<%pre>
+</%pre>
+<%args>
+</%args>
+<{
+}>
+<%def header_box>
+<%args>
+content[];
+htmlcode;
+</%args>
+<{
+}>
+			<div class="head_box_l">
+				<div class="head_box_m">
+					<div class="head_box_r">
+						<table class="head_box_text"><tr><td>
+%							for(content_type::const_iterator it = content.begin(); it != content.end(); ++it) {
+								<$ *it $>
+%							}
+%							reply.out() << htmlcode;
+						</td></tr></table>
+					</div>
+				</div>
+			</div>
+</%def>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index caae7ec..bed138f 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -34,9 +34,7 @@ try {
 <& menu &>
 		</div>
 		<div class="inhalt">
-			<div class="head_box">
-				<$ tr("Recordings") $>
-			</div>
+<& pageelems.header_box content=(tr("Recordings")) &>
 %			if (Recordings.Count() == 0) {
 				Keine Aufnahmen vorhanden
 %			} else {
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index bdb7773..994dc6f 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -11,7 +11,7 @@ using namespace vdrlive;
 		var newImg = new Image();
 		var imgsrc = "";
 		var interval = -1;
-		  
+
 		function StreamLoad()
 		{
 			uniq = new Date();
@@ -19,7 +19,7 @@ using namespace vdrlive;
 			document.images.vdrlive.src=newImg.src;
 			newImg.src=imgsrc+"?"+uniq;
 		}
-				  
+
 		function StreamInit()
 		{
 			imgsrc = document.images.vdrlive.src;
@@ -105,9 +105,7 @@ using namespace vdrlive;
 <& menu >
 		</div>
 		<div class="inhalt">
-			<div class="head_box">
-				<$ tr("Remote Control") $>
-			</div>
+<& pageelems.header_box content=(tr("Remote Control")) &>
 			<div class="screenshot">
 				<img src="screenshot.jpg" name="vdrlive" /><br />
 				<$ tr("Interval:") $> <select name="interval" onchange="ChangeInterval()"></select>
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 7784f81..411dfe3 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -22,9 +22,7 @@ using namespace vdrlive;
 <& menu >
 		</div>
 		<div class="inhalt">
-			<div class="head_box">
-				<$ tr("Timers") $>
-			</div>
+<& pageelems.header_box	content=(tr("Timers")) &>
 <{
 			cMutexLock timersLock( &LiveTimerManager() );
 			SortedTimers& timers = LiveTimerManager().GetTimers();
diff --git a/pages/whats_on_next.ecpp b/pages/whats_on_next.ecpp
index 6145864..9f3be56 100644
--- a/pages/whats_on_next.ecpp
+++ b/pages/whats_on_next.ecpp
@@ -30,9 +30,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 <& menu >
 		</div>
 		<div class="inhalt">
-			<div class="head_box">
-				<$ tr("What's on next?") $>
-			</div>
+<& pageelems.header_box content=(tr("What's on next?")) &>
 
 <{
 	ReadLock channelsLock( Channels );
diff --git a/pages/whats_on_now.ecpp b/pages/whats_on_now.ecpp
index a79be7d..6bb976c 100644
--- a/pages/whats_on_now.ecpp
+++ b/pages/whats_on_now.ecpp
@@ -30,9 +30,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 <& menu >
 		</div>
 		<div class="inhalt">
-			<div class="head_box">
-				<$ tr("What's running at") $> <$ FormatDateTime(tr("%I:%M %p"), time(0)) $>
-			</div>
+<& pageelems.header_box content=(tr("What's running at")) content=(FormatDateTime(tr("%I:%M %p"), time(0))) &>
 
 <{
 	ReadLock channelsLock( Channels );