From d1fdb6237750d0553b26b0726428d28507141aa6 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 11:21:51 +0100
Subject: force protocol on urls coming from relive

---
 template/assemblies/player/relive.phtml | 2 +-
 template/relive-player.phtml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml
index 718b249..e9fe89c 100644
--- a/template/assemblies/player/relive.phtml
+++ b/template/assemblies/player/relive.phtml
@@ -8,7 +8,7 @@
 		class="relive"
 	>
 		<source
-			src="<?=h($talk['playlist'])?>"
+			src="<?=h(forceproto($talk['playlist']))?>"
 			title="h.264 (HLS)"
 			type="application/x-mpegURL"
 		/>
diff --git a/template/relive-player.phtml b/template/relive-player.phtml
index 2ee9ace..0fdee88 100644
--- a/template/relive-player.phtml
+++ b/template/relive-player.phtml
@@ -21,7 +21,7 @@
 			<div class="col-xs-12">
 				<div class="alert alert-success">
 					<h3>Download</h3>
-					<p>Click here to <a href="<?=h($talk['mp4'])?>">Download</a> this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.</p>
+					<p>Click here to <a href="<?=h(forceproto($talk['mp4']))?>">Download</a> this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.</p>
 				</div>
 			</div>
 		</div>
@@ -42,7 +42,7 @@
 					<h3>Sorry about the Flash</h3>
 					<p>
 						As there is no desktop player which supports time-shifting, we chose embed a Flash player here which does.
-						If you still want to watch with a desktop player, use this URL: <a href="<?=h($talk['playlist'])?>"><?=h($talk['playlist'])?></a>
+						If you still want to watch with a desktop player, use this URL: <a href="<?=h(forceproto($talk['playlist']))?>"><?=h(forceproto($talk['playlist']))?></a>
 					</p>
 					<p>
 						Note: Downloading this file is useless because of the way HLS works. You need to play the URL from your player.
-- 
cgit v1.2.3


From 6be05f60903348f4690249052c98a15ca10ab3ed Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 11:26:17 +0100
Subject: add audio-only multiview

---
 template/multiview.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/multiview.phtml b/template/multiview.phtml
index e07446b..4f8597f 100644
--- a/template/multiview.phtml
+++ b/template/multiview.phtml
@@ -7,7 +7,8 @@
 
 	<div class="row room-group">
 		<? foreach($rooms as $room): ?>
-				<? foreach($room->getStreams() as $stream): ?>
+			<? foreach($room->getStreams() as $stream): ?>
+				<? if($selection && $stream->getSelection() != $selection) continue ?>
 				<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
 					<div class="cell">
 						<h2><?=h($stream->getDisplay())?></h2>
-- 
cgit v1.2.3


From f271e140787d58a8aaa6815344501f8ccb09f27e Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 16:36:06 +0100
Subject: make the click-targets in he schedule bigger, thanks @sebastian

---
 template/assemblies/schedule.phtml | 61 ++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
index b749e0b..2d5fc21 100644
--- a/template/assemblies/schedule.phtml
+++ b/template/assemblies/schedule.phtml
@@ -10,46 +10,49 @@
 						data-start="<?=intval($event['start'])?>"
 						data-end="<?=intval($event['end'])?>"
 					>
-						<? if(@$event['special'] == 'daychange'): ?>
+						<? $scheduleRoom = Room::createIfExists($roomname) ?>
+						<? if($scheduleRoom): ?>
+							<a
+								class="inner"
+								href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"
+								title="Switch to <?=h($scheduleRoom->getDisplay())?>"
+							>
+						<? else: ?>
+							<div class="inner">
+						<? endif ?>
 
-							<h3><?=h($event['title'])?></h3>
+							<? if(@$event['special'] == 'daychange'): ?>
 
-						<? elseif(@$event['special'] == 'gap'): ?>
+								<h3><?=h($event['title'])?></h3>
 
-							<!--h3>Gap</h3-->
+							<? elseif(@$event['special'] == 'gap'): ?>
 
-						<? elseif(@$event['special'] == 'pause'): ?>
+								<!--h3>Gap</h3-->
 
-							<h3><?=h($event['title'])?></h3>
+							<? elseif(@$event['special'] == 'pause'): ?>
 
-						<? else: ?>
+								<h3><?=h($event['title'])?></h3>
+
+							<? else: ?>
 
-							<? $scheduleRoom = Room::createIfExists($roomname) ?>
-							<h4><?=h(strftime('%H:%M', $event['start']))?>
-								&ndash;
-								<?=h(strftime('%H:%M', $event['end']))?>
-								&nbsp;in&nbsp;
-								<? if($scheduleRoom): ?>
-									<a href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>">
-										<?=h($scheduleRoom->getDisplay())?>
-									</a>
-								<? else: ?>
+								<h4><?=h(strftime('%H:%M', $event['start']))?>
+									&ndash;
+									<?=h(strftime('%H:%M', $event['end']))?>
+									&nbsp;in&nbsp;
 									<?=h($roomname) ?>
-								<? endif ?>
-							</h4>
-							<h3>
-								<? if($scheduleRoom): ?>
-									<a
-										href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"
-										title="Switch to <?=h($scheduleRoom->getDisplay())?>"
-									><?=h($event['title'])?></a>
-								<? else: ?>
+								</h4>
+								<h3>
 									<?=h($event['title'])?>
+								</h3>
+								<? if($event['speaker']): ?>
+									<h5>by&nbsp;<?=h($event['speaker'])?></h5>
 								<? endif ?>
-							</h3>
-							<? if($event['speaker']): ?>
-								<h5>by&nbsp;<?=h($event['speaker'])?></h5>
 							<? endif ?>
+
+						<? if($scheduleRoom): ?>
+							</a>
+						<? else: ?>
+							</div>
 						<? endif ?>
 					</div>
 
-- 
cgit v1.2.3


From de21ef94cc0a529a8c7195994a56bb70772d9e4e Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 16:42:03 +0100
Subject: use locally configured display name for room in schedule

---
 template/assemblies/schedule.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
index 2d5fc21..b47f30d 100644
--- a/template/assemblies/schedule.phtml
+++ b/template/assemblies/schedule.phtml
@@ -39,7 +39,7 @@
 									&ndash;
 									<?=h(strftime('%H:%M', $event['end']))?>
 									&nbsp;in&nbsp;
-									<?=h($roomname) ?>
+									<?=h($scheduleRoom->getDisplay()) ?>
 								</h4>
 								<h3>
 									<?=h($event['title'])?>
-- 
cgit v1.2.3