From fc4cf5793cbe6561347067eb7b25c60a6fc50f77 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 30 Mar 2015 21:18:09 +0200
Subject: Rename program to schedule

---
 template/assemblies/program.phtml  | 65 --------------------------------------
 template/assemblies/schedule.phtml | 59 ++++++++++++++++++++++++++++++++++
 template/room.phtml                |  4 +--
 3 files changed, 61 insertions(+), 67 deletions(-)
 delete mode 100644 template/assemblies/program.phtml
 create mode 100644 template/assemblies/schedule.phtml

(limited to 'template')

diff --git a/template/assemblies/program.phtml b/template/assemblies/program.phtml
deleted file mode 100644
index d7f7045..0000000
--- a/template/assemblies/program.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?
-
-foreach(reset($program) as $event)
-	$width += $event['duration'];
-
-?>
-<div class="program scroll-container">
-	<div class="scroll-element">
-		<div class="now"><span>now</span></div>
-		<? 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"
-						data-start="<?=intval($event['start'])?>"
-						data-end="<?=intval($event['end'])?>"
-					>
-						<? if(@$event['special'] == 'daychange'): ?>
-
-							<h3><?=h($event['title'])?></h3>
-
-						<? elseif(@$event['special'] == 'gap'): ?>
-
-							<!--h3>Gap</h3-->
-
-						<? elseif(@$event['special'] == 'pause'): ?>
-
-							<h3><?=h($event['title'])?></h3>
-
-						<? else: ?>
-
-							<h4><?=h(strftime('%H:%M', $event['start']))?>
-								&ndash;
-								<?=h(strftime('%H:%M', $event['end']))?>
-								&nbsp;in&nbsp;
-								<? if(has("ROOMS.$roomname")): ?>
-									<a href="<?=h(link_player($roomname))?>">
-										<?=h(get("ROOMS.$roomname.DISPLAY"))?>
-									</a>
-								<? else: ?>
-									<?=h($roomname) ?>
-								<? endif ?>
-							</h4>
-							<h3>
-								<? 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>
-							<? if($event['speaker']): ?>
-								<h5>by&nbsp;<?=h($event['speaker'])?></h5>
-							<? endif ?>
-						<? endif ?>
-					</div>
-
-				<? endforeach ?>
-			</div>
-		<? endforeach ?>
-	</div>
-</div>
diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
new file mode 100644
index 0000000..d2bb9e6
--- /dev/null
+++ b/template/assemblies/schedule.phtml
@@ -0,0 +1,59 @@
+<div class="schedule scroll-container">
+	<div class="scroll-element">
+		<div class="now"><span>now</span></div>
+		<? foreach($schedule->getSchedule() as $roomname => $events): ?>
+			<div class="room <? if($roomname == $room->getSlug()): ?>highlight<? endif ?>" style="width: <?=ceil($schedule->getDurationSum() / $schedule->getScale())?>px">
+				<? foreach($events as $event): ?>
+					<div
+						class="block <?=h(@$event['special'] ?: 'event')?>"
+						style="width: <?=h(round($event['duration'] / $schedule->getScale()))?>px"
+						data-start="<?=intval($event['start'])?>"
+						data-end="<?=intval($event['end'])?>"
+					>
+						<? if(@$event['special'] == 'daychange'): ?>
+
+							<h3><?=h($event['title'])?></h3>
+
+						<? elseif(@$event['special'] == 'gap'): ?>
+
+							<!--h3>Gap</h3-->
+
+						<? elseif(@$event['special'] == 'pause'): ?>
+
+							<h3><?=h($event['title'])?></h3>
+
+						<? else: ?>
+
+							<h4><?=h(strftime('%H:%M', $event['start']))?>
+								&ndash;
+								<?=h(strftime('%H:%M', $event['end']))?>
+								&nbsp;in&nbsp;
+								<? /*if(has("ROOMS.$roomname")): ?>
+									<a href="<?=h(link_player($roomname))?>">
+										<?=h(get("ROOMS.$roomname.DISPLAY"))?>
+									</a>
+								<? else:*/ ?>
+									<?=h($roomname) ?>
+								<? /*endif*/ ?>
+							</h4>
+							<h3>
+								<? /*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>
+							<? if($event['speaker']): ?>
+								<h5>by&nbsp;<?=h($event['speaker'])?></h5>
+							<? endif ?>
+						<? endif ?>
+					</div>
+
+				<? endforeach ?>
+			</div>
+		<? endforeach ?>
+	</div>
+</div>
diff --git a/template/room.phtml b/template/room.phtml
index 25a7255..32b7d6c 100644
--- a/template/room.phtml
+++ b/template/room.phtml
@@ -54,8 +54,8 @@
 			</div>
 		<? endif ?>
 		<? if($room->hasSchedule()): ?>
-			<div role="tabpanel" class="tab-pane" id="program">
-				<? require("$assemblies/program.phtml") ?>
+			<div role="tabpanel" class="tab-pane" id="schedule">
+				<? require("$assemblies/schedule.phtml") ?>
 			</div>
 		<? endif ?>
 		<? if($room->hasFeedback()): ?>
-- 
cgit v1.2.3