diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/video.phtml | 43 | ||||
| -rw-r--r-- | template/room.phtml | 16 |
2 files changed, 31 insertions, 28 deletions
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index 1508aba..0861cf8 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -5,27 +5,30 @@ width="<?=h($width)?>" height="<?=h($height)?>" style="width: 100%; height: 100%;" - class="<?=h($miniroom ? 'nosubs' : 'subs')?>" > - <? if(!$translated): ?> - <source - data-plugin-type="native" - src="<?=h(link_stream('webm', $room, $format, $translated))?>" - title="WebM (Icecast)" - type="video/webm" - /> + <? if(in_array("webm-$selection", $formats)): ?> + <source + data-plugin-type="native" + src="<?=h(link_stream('webm', $room, $selection, $translated))?>" + title="WebM (Icecast)" + type="video/webm" + /> + <? endif ?> + <? if(in_array("hls-$selection", $formats)): ?> + <source + data-plugin-type="native" + src="<?=h(link_stream('hls', $room, $hlsformat, $translated))?>" + title="h.264 (HLS)" + type="application/vnd.apple.mpegURL" + /> + <? endif ?> + <? if(in_array("rtmp-$selection", $formats)): ?> + <source + data-plugin-type="flash" + src="<?=h(link_stream('rtmp', $room, $selection, $translated))?>" + title="h.264 (RTMP)" + type="video/rtmp" + /> <? endif ?> - <source - data-plugin-type="flash" - src="<?=h(link_stream('rtmp', $room, $format, $translated))?>" - title="h.264 (RTMP)" - type="video/rtmp" - /> - <source - data-plugin-type="native" - src="<?=h(link_stream('hls', $room, $hlsformat, $translated))?>" - title="h.264 (HLS)" - type="application/vnd.apple.mpegURL" - /> </video> </div> diff --git a/template/room.phtml b/template/room.phtml index e337eda..92f69b2 100644 --- a/template/room.phtml +++ b/template/room.phtml @@ -1,14 +1,14 @@ -<div class="container <?=h($type)?> <?=h($selection)?> <?=h($language)?>"> +<div class="container <?=h($tab)?> <?=h($selection)?> <?=h($language)?>"> <div class="row headline"> <div class="col-xs-12"> <h1 data-room="<?=h(get("ROOMS.$room.DISPLAY"))?>"><?=h($title)?></h1> </div> </div> - <ul class="nav nav-tabs nav-justified"> - <? foreach($types as $iter): ?> + <ul class="nav nav-player nav-tabs nav-justified"> + <? foreach($tabs as $iter): ?> <li - <? if($type == $iter):?>class="active"<? endif ?> + <? if($tab == $iter):?>class="active"<? endif ?> > <a href="<?=h(link_player($room, $iter))?>"> <?=h(ucfirst($iter))?> @@ -19,11 +19,11 @@ <div class="player-wrap tab-content"> <div class="tab-pane active"> - <? include("$assemblies/player/$type.phtml") ?> + <? include("$assemblies/player/$tab.phtml") ?> </div> </div> - <ul class="nav nav-tabs nav-justified" role="tablist"> + <ul class="nav nav-functions nav-tabs nav-justified" role="tablist"> <li class="active"> <a href="#switcher" role="tab" data-toggle="tab">Formats</a> </li> @@ -44,9 +44,9 @@ <? endif ?> </ul> - <div class="tab-content"> + <div class="functions-wrap tab-content"> <div class="tab-pane active" id="switcher"> - <? include("$assemblies/switcher/$type.phtml") ?> + <? include("$assemblies/switcher/$tab.phtml") ?> </div> <? if(get("ROOMS.$room.SCHEDULE") && has("SCHEDULE")): ?> <div class="tab-pane" id="irc"> |