diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/allconferences.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/player/dash.phtml | 14 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/dash.phtml | 8 | ||||
| -rw-r--r-- | template/overview.phtml | 8 | ||||
| -rw-r--r-- | template/page.phtml | 6 | ||||
| -rw-r--r-- | template/room.phtml | 24 |
7 files changed, 41 insertions, 23 deletions
diff --git a/template/allconferences.phtml b/template/allconferences.phtml index bee21d7..014f6d6 100644 --- a/template/allconferences.phtml +++ b/template/allconferences.phtml @@ -1,6 +1,6 @@ <div class="container"> <h1><?=h($title)?></h1> - <p>We are currently active on multiple Conferences. Please choose which one you want access.</p> + <p>We are currently convering multiple events. Please choose which one you want access.</p> <br><br> diff --git a/template/assemblies/player/dash.phtml b/template/assemblies/player/dash.phtml index 8a70d25..7048006 100644 --- a/template/assemblies/player/dash.phtml +++ b/template/assemblies/player/dash.phtml @@ -1,4 +1,3 @@ -<script type="text/javascript" src="<?=h($assets)?>clapprio/clappr.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/dash-shaka-playback.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/level-selector.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/audio-selector.min.js"></script> @@ -12,21 +11,22 @@ interference with the new dash-player. --> <script type="text/javascript"> + var nativeHLS = document.createElement('video').canPlayType('application/vnd.apple.mpegURL') != ""; var player = new Clappr.Player({ - // source: "http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd", - source: '<?=h($room->getDashManifestUrl())?>', + source: nativeHLS ? '<?=h($room->getHLSPlaylistUrl())?>' : '<?=h($room->getDashManifestUrl())?>', width: "100%", plugins: [DashShakaPlayback, LevelSelector, AudioSelector], shakaConfiguration: { - preferredAudioLanguage: 'de-DE', - streaming: { - rebufferingGoal: 15 - } + abr: { + defaultBandwidthEstimate: 600000 + }, }, autoPlay: true, parentId: '#player' }); </script> + + <style type="text/css"> #player > [data-player] { padding-bottom: 56.25%; diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index ad58ce7..62eb077 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -3,6 +3,7 @@ <div class="now"><span>now</span></div> <? $rooms = $schedule->getSchedule() ?> <? foreach($rooms as $roomname => $events): ?> + <? $scheduleRoom = $schedule->getMappedRoom($roomname) ?> <div class="room <? if(isset($room) && $roomname == $room->getScheduleName()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px"> <? $fromstart = 0; ?> <? foreach($events as $event): ?> @@ -13,7 +14,6 @@ data-end="<?=intval($event['end'])?>" > <? $fromstart += $event['duration'] ?> - <? $scheduleRoom = $conference->getRoomIfExists($roomname) ?> <? if($scheduleRoom): ?> <a class="inner" diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml index 164af12..63b8381 100644 --- a/template/assemblies/switcher/dash.phtml +++ b/template/assemblies/switcher/dash.phtml @@ -22,6 +22,14 @@ </a> </div> + <div class="btn-group" role="group"> + <div class="btn btn-primary" disabled>HLS</div> + <a href="<?=h($room->GetHLSPlaylistUrl())?>" target="_blank" class="btn btn-default"> + <span class="fa fa-flask"></span> + Playlist + </a> + </div> + </div> </div> </div> diff --git a/template/overview.phtml b/template/overview.phtml index 5683cd0..e9cee8e 100644 --- a/template/overview.phtml +++ b/template/overview.phtml @@ -62,18 +62,22 @@ width="213" height="120" /> + <? else: ?> + + <h2><?=h($room->getDisplay())?></h2> + <? endif ?> <? if($room->hasSchedule()): ?> <? $upcoming = @$upcomingTalksPerRoom[ $room->getScheduleName() ] ?: [] ?> <div class="program-schedule"> <div class="talk current-talk" title="<?=h(@$upcoming['current']['title'] ?: 'none') ?>"> - <strong>Now:</strong> + <strong>Now (since <?=date('G:i', @$upcoming['current']['start']) ?>):</strong><br/> <span class="t"><?=h(@$upcoming['current']['title'] ?: 'none') ?></span> </div> <div class="talk next-talk" title="<?=h(@$upcoming['next']['title'] ?: 'none') ?>"> - <strong>Next Talk:</strong> + <strong>Next Talk (<?=date('G:i', @$upcoming['next']['start']) ?>):</strong><br/> <span class="t"><?=h(@$upcoming['next']['title'] ?: 'none') ?></span> </div> </div> diff --git a/template/page.phtml b/template/page.phtml index 016debf..a12c0e5 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -57,6 +57,7 @@ <script type="text/javascript" src="<?=h($assets)?>mejs/mediaelement-and-player.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr-thumbnails-plugin.js"></script> + <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr-playback-rate-plugin.js"></script> <script type="text/javascript" src="<?=h($assets)?>js/lustiges-script.js"></script> <? if(isset($subtitles) && $subtitles->isEnabled()): ?> @@ -85,5 +86,10 @@ data-frontend-url="<?=h($subtitles->getFrontendURL())?>" ></span> <? endif ?> + + + <? if($page != 'allconferences' && $conference->hasAdditionalHtml()): ?> + <?= $conference->getAdditionalHtml() ?> + <? endif ?> </body> </html> diff --git a/template/room.phtml b/template/room.phtml index 35e38a1..236ccc5 100644 --- a/template/room.phtml +++ b/template/room.phtml @@ -24,7 +24,12 @@ </div> <ul class="nav nav-functions nav-tabs nav-justified" role="tablist"> - <li class="active"> + <? if($room->hasSchedule()): ?> + <li class="active"> + <a href="#schedule" role="tab" data-toggle="tab">Fahrplan</a> + </li> + <? endif ?> + <li> <a href="#switcher" role="tab" data-toggle="tab">Formats</a> </li> <? if($room->hasChat()): ?> @@ -32,11 +37,6 @@ <a href="#chat" role="tab" data-toggle="tab">Chat</a> </li> <? endif ?> - <? if($room->hasSchedule()): ?> - <li> - <a href="#schedule" role="tab" data-toggle="tab">Fahrplan</a> - </li> - <? endif ?> <? if($room->hasFeedback()): ?> <li> <a href="#feedback" role="tab" data-toggle="tab">Feedback</a> @@ -50,7 +50,12 @@ </ul> <div class="functions-wrap tab-content"> - <div role="tabpanel" class="tab-pane active" id="switcher"> + <? if($room->hasSchedule()): ?> + <div role="tabpanel" class="tab-pane active" id="schedule"> + <? require("$assemblies/schedule.phtml") ?> + </div> + <? endif ?> + <div role="tabpanel" class="tab-pane" id="switcher"> <? require("$assemblies/switcher/".$stream->getPlayerType().".phtml") ?> </div> <? if($room->hasChat()): ?> @@ -58,11 +63,6 @@ <? require("$assemblies/chat.phtml") ?> </div> <? endif ?> - <? if($room->hasSchedule()): ?> - <div role="tabpanel" class="tab-pane" id="schedule"> - <? require("$assemblies/schedule.phtml") ?> - </div> - <? endif ?> <? if($room->hasFeedback()): ?> <div role="tabpanel" class="tab-pane" id="feedback"> <? require("$assemblies/feedback.phtml") ?> |