aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2015-04-05 19:24:19 +0200
committerMaZderMind2015-04-05 19:24:19 +0200
commitec2adb71823b2eff0912297d7b7376021dcbda70 (patch)
tree717eedb1020060e4035133ce33d6a6b79b41059e
parentc28560754e2e4f7bb79f32c97edbe36dbaed6d54 (diff)
Show Tech-String in Switcher
-rw-r--r--template/assemblies/switcher/audio.phtml5
-rw-r--r--template/assemblies/switcher/music.phtml5
-rw-r--r--template/assemblies/switcher/slides.phtml5
-rw-r--r--template/assemblies/switcher/video.phtml5
4 files changed, 12 insertions, 8 deletions
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index 9f3ba76..271191e 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -30,8 +30,9 @@
<? foreach(Stream::getAudioProtos() as $proto => $display): ?>
<h3>Directlinks (<?=h($display)?>)</h3>
<div class="row">
+ <? $stream = $room->createStreamObject('music') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group">
+ <div class="btn-group" role="group" title="<?=h($stream->getAudioTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@@ -46,7 +47,7 @@
<? else: ?>
- <a href="<?=h($room->createStreamObject('audio')->getAudioUrl($proto))?>" class="btn btn-default">
+ <a href="<?=h($stream->getAudioUrl($proto))?>" class="btn btn-default">
<span class="fa fa-volume-up"></span>
video
</a>
diff --git a/template/assemblies/switcher/music.phtml b/template/assemblies/switcher/music.phtml
index a6b3ffc..6f5f218 100644
--- a/template/assemblies/switcher/music.phtml
+++ b/template/assemblies/switcher/music.phtml
@@ -3,11 +3,12 @@
<div class="directlinks">
<div class="row">
<? foreach(Stream::getMusicProtos() as $proto => $display): ?>
+ <? $stream = $room->createStreamObject('music') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group">
+ <div class="btn-group" role="group" title="<?=h($stream->getMusicTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($display)?></div>
- <a href="<?=h($room->createStreamObject('music')->getMusicUrl($proto))?>" class="btn btn-default">
+ <a href="<?=h($stream->getMusicUrl($proto))?>" class="btn btn-default">
<span class="fa fa-music"></span>
live music
</a>
diff --git a/template/assemblies/switcher/slides.phtml b/template/assemblies/switcher/slides.phtml
index a5f5082..f3281b9 100644
--- a/template/assemblies/switcher/slides.phtml
+++ b/template/assemblies/switcher/slides.phtml
@@ -30,8 +30,9 @@
<? foreach(Stream::getSlidesProtos() as $proto => $display): ?>
<h3>Directlinks (<?=h($display)?>)</h3>
<div class="row">
+ <? $stream = $room->createStreamObject('slides') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group" title="<?=h(get("FORMAT.slides"))?>">
+ <div class="btn-group" role="group" title="<?=h($stream->getSlidesTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@@ -46,7 +47,7 @@
<? else: ?>
- <a href="<?=h($room->createStreamObject('slides')->getSlidesUrl($proto))?>" class="btn btn-default">
+ <a href="<?=h($stream->getSlidesUrl($proto))?>" class="btn btn-default">
<span class="fa fa-picture-o"></span>
slides
</a>
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
index c0429d3..3214212 100644
--- a/template/assemblies/switcher/video.phtml
+++ b/template/assemblies/switcher/video.phtml
@@ -43,8 +43,9 @@
<div class="row">
<? foreach($room->getVideoResolutions() as $res): ?>
<? $selection = $room->createSelectionObject($res) ?>
+ <? $stream = $room->createStreamObject($res) ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group">
+ <div class="btn-group" role="group" title="<?=h($stream->getVideoTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@@ -59,7 +60,7 @@
<? else: ?>
- <a href="<?=h($room->createStreamObject($res)->getVideoUrl($proto))?>" class="btn btn-default">
+ <a href="<?=h($stream->getVideoUrl($proto))?>" class="btn btn-default">
<span class="fa fa-video-camera"></span>
video
</a>