diff options
| -rw-r--r-- | assets/css/_multiview.less | 1 | ||||
| -rw-r--r-- | assets/css/_schedule.less | 14 | ||||
| -rw-r--r-- | configs/conferences/32c3/config.php | 7 | ||||
| -rw-r--r-- | configs/conferences/32c3/main.less | 4 | ||||
| -rw-r--r-- | index.php | 6 | ||||
| -rw-r--r-- | lib/helper.php | 8 | ||||
| -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 | ||||
| -rw-r--r-- | view/multiview.php | 1 |
11 files changed, 74 insertions, 39 deletions
diff --git a/assets/css/_multiview.less b/assets/css/_multiview.less index 59b8e37..66dc25d 100644 --- a/assets/css/_multiview.less +++ b/assets/css/_multiview.less @@ -1,6 +1,7 @@ body.multiview { .cell { background-color: white; + margin-top: 15px; h2 { font-size: 14px; diff --git a/assets/css/_schedule.less b/assets/css/_schedule.less index 0151154..72ea294 100644 --- a/assets/css/_schedule.less +++ b/assets/css/_schedule.less @@ -40,8 +40,16 @@ height: 75px; } + a:hover { + text-decoration: none; + } + + .inner { + display: block; + padding: 10px; + height: 100%; + } - padding: 10px; border: 1px solid @schedule-border; h3 { @@ -64,10 +72,6 @@ @media (max-width: @screen-xs-max) { font-size: 15px; } - - a { - color: @schedule-room; - } } h5 { diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php index f3556a8..9ec84a5 100644 --- a/configs/conferences/32c3/config.php +++ b/configs/conferences/32c3/config.php @@ -121,6 +121,7 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array( 'ambient', 'dome', 'chaos-west', + 'radio', ), 'Live Podcasts' => array( 'sendezentrum', @@ -505,6 +506,12 @@ $GLOBALS['CONFIG']['ROOMS'] = array( 'MUSIC' => true, 'EMBED' => true, ), + 'radio' => array( + 'DISPLAY' => 'Radio Fairydust', + 'STREAM' => 'radio', + 'MUSIC' => true, + 'EMBED' => true, + ), ); diff --git a/configs/conferences/32c3/main.less b/configs/conferences/32c3/main.less index 1f9f6fa..012b8a4 100644 --- a/configs/conferences/32c3/main.less +++ b/configs/conferences/32c3/main.less @@ -152,3 +152,7 @@ nav .button-wrapper > .about { color: @state-danger-text; } } + +body.multiview .cell { + color: black; +} @@ -210,6 +210,12 @@ try { require('view/multiview.php'); } + else if($route == 'multiview/audio') + { + $_GET['selection'] = 'audio'; + require('view/multiview.php'); + } + else if($route == 'feedback') { require('view/feedback.php'); diff --git a/lib/helper.php b/lib/helper.php index 6635fb1..c23d211 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -37,6 +37,14 @@ function forceslash($url) return $url; } +function forceproto($url) +{ + if(startswith('//', $url)) + $url = proto().':'.$url; + + return $url; +} + function startswith($needle, $haystack) { return substr($haystack, 0, strlen($needle)) == $needle; 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. diff --git a/view/multiview.php b/view/multiview.php index 5951ff1..eebf81e 100644 --- a/view/multiview.php +++ b/view/multiview.php @@ -5,4 +5,5 @@ echo $tpl->render(array( 'title' => 'Stream-Übersicht', 'rooms' => Room::rooms(), + 'selection' => @$_GET['selection'], )); |