Merge remote branch 'mav55/MultiSchedule'

a-mair · Jan 1, 2011 · 98c93ca · 98c93ca
2 parents 21c19b3 + 78bf26e
commit 98c93ca
Show file tree

Hide file tree

Showing 5 changed files with 488 additions and 2 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -867,6 +867,80 @@ table.listing a {
 	font-weight: bold;
 }
 
+/* ##################################
+   # table schedule
+   # (this is used for the MultiSchedule)
+   ##################################
+*/
+
+table.mschedule {
+	padding: 0px;
+	margin: 0px;
+}
+
+table.mschedule tr {
+        height: 12px;
+}
+
+table.mschedule tr td.event {
+	background: transparent url(img/bg_line.png) bottom repeat-x;
+	border-bottom: 1px solid #C0C1DA;
+}
+
+table.mschedule tr td.has_timer {
+        background-color: #FFE0E0;
+}
+
+table.mschedule tr.odd td.time {
+        background-color: #D0D0ff;
+}
+
+table.mschedule tr.even td.time {
+        background-color: #ffffff;
+}
+
+table.mschedule tr.current_row td.time {
+        background-color: #ffB0B0; 
+}
+
+table.mschedule tr td.leftcol {
+	padding-left: 7px;
+	padding-right: 5px;
+}
+
+table.mschedule div.content1 {
+        min-width: 10em;
+        max-width: 30em;
+}
+
+table.mschedule div.tools1 {
+        float: right;
+}
+
+table.mschedule div.start {
+        float: left;
+}
+
+table.mschedule tr td div.title {
+        padding: 3px;
+        clear: both;
+}
+
+table.mschedule tr td div.short {
+        clear: both;
+        overflow: hidden;
+}
+
+table.mschedule tr td div.description {
+        overflow: hidden;
+        clear: both;
+}
+
+table.mschedule a {
+	color: black;
+	font-weight: bold;
+}
+
 /*
   ##############################
   #  Blue Background Thingy

diff --git a/pages/Makefile b/pages/Makefile
@@ -13,8 +13,8 @@ VDRDIR   ?= ../../../..
 
 ### The object files (add further files here):
 
-OBJS	= menu.o recordings.o schedule.o screenshot.o timers.o		\
-          whats_on.o switch_channel.o keypress.o remote.o		\
+OBJS	= menu.o recordings.o schedule.o multischedule.o screenshot.o   \
+          timers.o whats_on.o switch_channel.o keypress.o remote.o	\
           channels_widget.o edit_timer.o error.o pageelems.o tooltip.o	\
           vlc.o searchtimers.o edit_searchtimer.o searchresults.o	\
           searchepg.o login.o ibox.o xmlresponse.o play_recording.o	\

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
@@ -36,6 +36,7 @@ if (!component.empty()) {
 <div class="menu">
 	  <a href="whats_on.html?type=now" <& menu.setactive current=("whats_on") &>><$ tr("What's on?") $></a>
 	| <a href="schedule.html" <& menu.setactive current=("schedule") &>><$ trVDR("Schedule") $></a>
+	| <a href="multischedule.html" <& menu.setactive current=("multischedule") &>><$ trVDR("MultiSchedule") $></a>
 	| <a href="timers.html" <& menu.setactive current=("timers") &>><$ trVDR("Timers") $></a>
 <%cpp>
 if ( LiveFeatures< features::epgsearch >().Recent() ) {
@@ -85,6 +86,7 @@ if (!component.empty()) {
     <div> <!-- inner -->
 	  <& menu.component current=("whats_on") &>
 	  <& menu.component current=("schedule") &>
+	  <& menu.component current=("multischedule") &>
 	  <& menu.component current=("timers") &>
 <%cpp>
 	if (LiveFeatures< features::epgsearch >().Recent()) {