From 53c4d5c90fc1a13064c1b463708dc3bcd5a6ec43 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Tue, 3 Mar 2015 13:06:12 +0100
Subject: Fixes for Schedules with more and with not streamed Rooms

---
 assets/css/_program.less          |  2 +-
 template/assemblies/program.phtml | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/assets/css/_program.less b/assets/css/_program.less
index 8c528a9..92c86ce 100644
--- a/assets/css/_program.less
+++ b/assets/css/_program.less
@@ -16,7 +16,7 @@
 		position: absolute;
 		left: 0;
 		width: 150px;
-		height: 500px;
+		height: 100%;
 		background-color: @program-now-bg;
 		font-size: 14px;
 
diff --git a/template/assemblies/program.phtml b/template/assemblies/program.phtml
index ce69c51..d7f7045 100644
--- a/template/assemblies/program.phtml
+++ b/template/assemblies/program.phtml
@@ -7,10 +7,9 @@ foreach(reset($program) as $event)
 <div class="program scroll-container">
 	<div class="scroll-element">
 		<div class="now"><span>now</span></div>
-		<? foreach($program as $name => $events): ?>
-			<div class="room <? if($name == get("ROOMS.$room.SCHEDULE_NAME", $room)): ?>highlight<? endif ?>" style="width: <?=$width / get('SCHEDULE.SCALE')?>px">
+		<? foreach($program as $roomname => $events): ?>
+			<div class="room <? if($roomname == get("ROOMS.$room.SCHEDULE_NAME", $room)): ?>highlight<? endif ?>" style="width: <?=$width / get('SCHEDULE.SCALE')?>px">
 				<? foreach($events as $event): ?>
-
 					<div
 						class="block <?=h(@$event['special'] ?: 'event')?>"
 						style="width: <?=h($event['duration'] / get('SCHEDULE.SCALE'))?>px"
@@ -35,17 +34,27 @@ foreach(reset($program) as $event)
 								&ndash;
 								<?=h(strftime('%H:%M', $event['end']))?>
 								&nbsp;in&nbsp;
-								<a href="<?=h(link_player($room))?>">
-									<?=h(get("ROOMS.$room.DISPLAY"))?>
-								</a>
+								<? if(has("ROOMS.$roomname")): ?>
+									<a href="<?=h(link_player($roomname))?>">
+										<?=h(get("ROOMS.$roomname.DISPLAY"))?>
+									</a>
+								<? else: ?>
+									<?=h($roomname) ?>
+								<? endif ?>
 							</h4>
 							<h3>
-								<a
-									href="<?=h(link_player($room))?>"
-									title="Switch to <?=h(get("ROOMS.$room.DISPLAY"))?>"
-								><?=h($event['title'])?></a>
+								<? if(has("ROOMS.$roomname")): ?>
+									<a
+										href="<?=h(link_player($roomname))?>"
+										title="Switch to <?=h(get("ROOMS.$roomname.DISPLAY"))?>"
+									><?=h($event['title'])?></a>
+								<? else: ?>
+									<?=h($event['title'])?>
+								<? endif ?>
 							</h3>
-							<h5>by&nbsp;<?=h($event['speaker'])?></h5>
+							<? if($event['speaker']): ?>
+								<h5>by&nbsp;<?=h($event['speaker'])?></h5>
+							<? endif ?>
 						<? endif ?>
 					</div>
 
-- 
cgit v1.2.3