diff options
| author | MaZderMind | 2016-12-29 02:27:48 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-29 02:27:48 +0100 |
| commit | 5faaebf0454e2d35b5fccc55ef9685328680f780 (patch) | |
| tree | 1054d3ea270b749215b4d381020e4ae014b8e5e9 /template | |
| parent | b802ead38b52fa2306b480572518da20687d0d94 (diff) | |
| parent | ca2b184b87dba5c0f382332116b277d5ed156878 (diff) | |
Merge branch 'feature/relive-js' into events/33c3
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/relive.phtml | 22 | ||||
| -rw-r--r-- | template/page.phtml | 1 | ||||
| -rw-r--r-- | template/relive-player.phtml | 17 |
3 files changed, 8 insertions, 32 deletions
diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml index ae108b1..93b6c95 100644 --- a/template/assemblies/player/relive.phtml +++ b/template/assemblies/player/relive.phtml @@ -1,16 +1,8 @@ -<div style="max-width: <?=h($width)?>px; max-height: <?=h($height)?>px;" class="video-wrap"> - <video - autoplay="autoplay" - preload="auto" - width="<?=h($width)?>" - height="<?=h($height)?>" - style="width: 100%; height: 100%;" - class="relive mejs" - > - <source - src="<?=h(forceproto($talk['playlist']))?>" - title="h.264 (HLS)" - type="application/x-mpegURL" - /> - </video> +<div + style="max-width: <?=h($width)?>px; max-height: <?=h($height)?>px;" + class="video-wrap" + data-width="<?=h($width)?>" + data-height="<?=h($height)?>" + data-m3u8="<?=h(forceproto($talk['playlist']))?>" +> </div> diff --git a/template/page.phtml b/template/page.phtml index b3bad81..508b271 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -55,6 +55,7 @@ <script type="text/javascript" src="<?=h($assets)?>js/lib/bootstrap-datepicker.min.js"></script> <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)?>js/lustiges-script.js"></script> <? if(isset($subtitles) && $subtitles->isEnabled()): ?> diff --git a/template/relive-player.phtml b/template/relive-player.phtml index 0fdee88..f82d4da 100644 --- a/template/relive-player.phtml +++ b/template/relive-player.phtml @@ -34,21 +34,4 @@ </div> </div> </div> - - <div class="row"> - <div class="col-xs-12 col-md-8 col-md-offset-2"> - <div class="well"> - <div class="desktop-player-hint"> - <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(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. - <p> - </div> - </div> - </div> - </div> </div> |