diff options
| author | MaZderMind | 2015-12-28 22:45:27 +0100 |
|---|---|---|
| committer | MaZderMind | 2015-12-28 22:45:27 +0100 |
| commit | fb520d55b0598cd917fe0a4bda0b19225f008831 (patch) | |
| tree | f3989113258017de91f8d8a7d55d5f7ed4a9ed40 /template | |
| parent | da3c1d2cca11768f2e3f4edd8087a9b07e6d6698 (diff) | |
| parent | de21ef94cc0a529a8c7195994a56bb70772d9e4e (diff) | |
Merge branch 'master' of c3voc.de:streaming-website
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/relive.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 63 | ||||
| -rw-r--r-- | template/multiview.phtml | 3 | ||||
| -rw-r--r-- | template/relive-player.phtml | 4 |
4 files changed, 38 insertions, 34 deletions
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/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index b749e0b..b47f30d 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> - <? $scheduleRoom = Room::createIfExists($roomname) ?> - <h4><?=h(strftime('%H:%M', $event['start']))?> - – - <?=h(strftime('%H:%M', $event['end']))?> - in - <? if($scheduleRoom): ?> - <a href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"> - <?=h($scheduleRoom->getDisplay())?> - </a> - <? else: ?> - <?=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: ?> + <? else: ?> + + <h4><?=h(strftime('%H:%M', $event['start']))?> + – + <?=h(strftime('%H:%M', $event['end']))?> + in + <?=h($scheduleRoom->getDisplay()) ?> + </h4> + <h3> <?=h($event['title'])?> + </h3> + <? if($event['speaker']): ?> + <h5>by <?=h($event['speaker'])?></h5> <? endif ?> - </h3> - <? if($event['speaker']): ?> - <h5>by <?=h($event['speaker'])?></h5> <? endif ?> + + <? if($scheduleRoom): ?> + </a> + <? else: ?> + </div> <? endif ?> </div> 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> 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. |