diff options
| author | MaZderMind | 2017-01-03 14:12:00 +0100 |
|---|---|---|
| committer | MaZderMind | 2017-01-03 14:12:00 +0100 |
| commit | f3b2736977cf61e41956da8abae7f93c898c71d2 (patch) | |
| tree | 59073c508b6bb7f3b0a1c6ac8b9ac1ee94416a0d /template | |
| parent | 4fc63c327a95a70ddd924ec01651c295056456e2 (diff) | |
| parent | 00990497857e5ec27405e2b795310fa0dc925545 (diff) | |
Merge branch 'feature/relive-scrub-thumbs' of git://github.com/florolf/streaming-website
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/relive.phtml | 6 | ||||
| -rw-r--r-- | template/page.phtml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml index 93b6c95..361e1bb 100644 --- a/template/assemblies/player/relive.phtml +++ b/template/assemblies/player/relive.phtml @@ -4,5 +4,11 @@ data-width="<?=h($width)?>" data-height="<?=h($height)?>" data-m3u8="<?=h(forceproto($talk['playlist']))?>" + <? if(array_key_exists('sprites', $talk)): ?> + data-sprites="<?= h($talk['sprites']['url']) ?>" + data-sprites-n="<?= h($talk['sprites']['n']) ?>" + data-sprites-cols="<?= h($talk['sprites']['cols']) ?>" + data-sprites-interval="<?= h($talk['sprites']['interval']) ?>" + <? endif ?> > </div> diff --git a/template/page.phtml b/template/page.phtml index 508b271..016debf 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -56,6 +56,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)?>js/lustiges-script.js"></script> <? if(isset($subtitles) && $subtitles->isEnabled()): ?> |