Michis header style and fontsize changes

13 files changed, 88 insertions, 37 deletions

diff --git a/css/styles.css b/css/styles.css
index 7860621..72df8eb 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -1,8 +1,8 @@
 body {
 	margin: 0px;
 	padding: 0px;
-	font-size: 12px;
-	font-family: Helvetica,Arial,sans-serif;
+	font-size: 11px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
 div.left_area {
@@ -31,14 +31,39 @@ div.menu a:hover {
 	background: #DEE6EE;
 }
 
-div.head_box {
-	border: 1px solid #6D96A9;
-	background: #DEE6EE;
-	margin: 2px;
-	padding: 5px;
+div.head_box_l {
+	background-image: url(bg_header_l.png);
+	background-position: top left;
+	background-repeat: no-repeat;
+	margin: 0;
+	margin-bottom: 2ex;
+	padding: 0;
+}
+
+div.head_box_m {
+	background-image: url(bg_header_h.png);
+	background-repeat: repeat-x;
+	margin: 3px;
+	padding: 0;
+}
+
+div.head_box_r {
+	background-image: url(bg_header_r.png);
+	background-position: top right;
+	background-repeat: no-repeat;
+	margin: -3px;
+	padding: 0;
+	padding-left: 0.5em;
+}
+
+table.head_box_text {
+	color: #ffffff;
+	font-size: 11px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	padding: 0;
+	margin: 0;
+	height: 30px;
 	font-weight: bold;
-	font-size: 14px;
-	color: black;
 }
 
 button.smallbutton {
@@ -48,7 +73,7 @@ button.smallbutton {
 	background-image: url(button_blue.png);
 	background-repeat: no-repeat;
 	color: #FFFFFF;
-	font-size: 14px;
+	font-size: 11px;
 	border: 0px;
 	vertical-align: middle;
 	text-align: center;
@@ -88,23 +113,27 @@ div.description {
 	height: 150px;
 	overflow: auto;
 	margin-top: 10px;
+	font-size: 11px;
 }
 
 div.info {
 	text-align: right;
 	margin-bottom: 3px;
+	font-size: 11px;
 }
 
 table.event tr td.station {
 	background: #6D96A9;
 	color: white;
 	font-weight: bold;
+	font-size: 11px;
 	margin: 0;
 	padding: 3px 3px 3px 10px;
 }
 
 table.event tr td.content .title {
 	font-weight: bold;
+	font-size: 11px;
 	height: 15px;
 }
 
@@ -116,6 +145,7 @@ table.event tr td.content .short {
 table.timers {
 	margin-top: 10px;
 	border: 1px solid #6D96A9;
+	font-size: 11px;
 }
 
 table.timers tr td {
@@ -143,12 +173,14 @@ table.timers tr td.head {
 table.schedule {
 	margin-top: 10px;
 	border: 1px solid #6D96A9;
+	font-size: 11px;
 }
 
 table.schedule tr td.head {
 	background: #6D96A9;
 	color: white;
 	font-weight: bold;
+	font-size: 11px;
 	margin: 0;
 	padding: 3px;
 }
@@ -156,11 +188,13 @@ table.schedule tr td.head {
 table.schedule tr td {
 	vertical-align: top;
 	padding: 3px 7px 3px 3px;
+	font-size: 11px;
 }
 
 
 table.schedule tr.active {
 	background: #DEE6EE;
+	font-size: 11px;
 }
 
 
diff --git a/images/Makefile b/images/Makefile
index fb4a949..004b947 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -16,7 +16,8 @@ VDRDIR   ?= ../../../..
 
 OBJS	= logo.o record.o active.o inactive.o button_blue.o	\
 	  file.o folder_closed.o folder_open.o plus.o minus.o	\
-	  transparent.o
+	  transparent.o						\
+	  bg_header_h.o bg_header_l.o bg_header_r.o
 
 ### Default rules:
 
diff --git a/images/bg_header_h.png b/images/bg_header_h.png
new file mode 100644
index 0000000..5a9f00b
--- /dev/null
+++ b/images/bg_header_h.png
diff --git a/images/bg_header_l.png b/images/bg_header_l.png
new file mode 100644
index 0000000..2034acc
--- /dev/null
+++ b/images/bg_header_l.png
diff --git a/images/bg_header_r.png b/images/bg_header_r.png
new file mode 100644
index 0000000..63b8708
--- /dev/null
+++ b/images/bg_header_r.png
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 );
diff --git a/recordings.cpp b/recordings.cpp
index 50b27f6..ad5a815 100644
--- a/recordings.cpp
+++ b/recordings.cpp
@@ -10,7 +10,7 @@ namespace vdrlive {
 		m_recordingsLock(&Recordings)
 
 	{
-		esyslog("DH: ****** RecordingsTree::RecordingsTree() ********");
+		// esyslog("DH: ****** RecordingsTree::RecordingsTree() ********");
 		for ( cRecording* recording = Recordings.First(); recording != 0; recording = Recordings.Next( recording ) ) {
 			if (m_maxLevel < recording->HierarchyLevels()) {
 				m_maxLevel = recording->HierarchyLevels();
@@ -19,7 +19,7 @@ namespace vdrlive {
 			RecordingsItemPtr dir = m_root;
 			string name(recording->Name());
 
-			esyslog("DH: recName = '%s'", recording->Name());
+			// esyslog("DH: recName = '%s'", recording->Name());
 			int level = 0;
 			size_t index = 0;
 			size_t pos = 0;
@@ -34,30 +34,30 @@ namespace vdrlive {
 						dir->m_entries.insert(pair< string, RecordingsItemPtr > (dirName, recPtr));
 						i = findDir(dir, dirName);
 						if (i != dir->m_entries.end()) {
-							esyslog("DH: added dir: '%s'", dirName.c_str());
+							// esyslog("DH: added dir: '%s'", dirName.c_str());
 						}
 						else {
-							esyslog("DH: panic: didn't found inserted dir: '%s'", dirName.c_str());
+							// esyslog("DH: panic: didn't found inserted dir: '%s'", dirName.c_str());
 						}
 					}
 					dir = i->second;
-					esyslog("DH: current dir: '%s'", dir->Name().c_str());
+					// esyslog("DH: current dir: '%s'", dir->Name().c_str());
 					level++;
 				}
 				else {
 					string recName(name.substr(index, name.length() - index));
 					RecordingsItemPtr recPtr (new RecordingsItemRec(recName, recording));
 					dir->m_entries.insert(pair< string, RecordingsItemPtr > (recName, recPtr));
-					esyslog("DH: added rec: '%s'", recName.c_str());
+					// esyslog("DH: added rec: '%s'", recName.c_str());
 				}
 			} while (pos != string::npos);
 		}
-		esyslog("DH: ------ RecordingsTree::RecordingsTree() --------");
+		// esyslog("DH: ------ RecordingsTree::RecordingsTree() --------");
 	}
 
 	RecordingsTree::~RecordingsTree()
 	{
-		esyslog("DH: ****** RecordingsTree::~RecordingsTree() ********");
+		// esyslog("DH: ****** RecordingsTree::~RecordingsTree() ********");
 	}
 
 	RecordingsTree::Map::iterator RecordingsTree::begin(const vector< string >& path)