From be515f5150f20c773371f680efad58f2d0fcaaf0 Mon Sep 17 00:00:00 2001
From: Benjamin Peter
Date: Sat, 9 Dec 2017 23:44:47 +0100
Subject: Added multple translation tracks with configurable endpoints and
 labels

---
 template/assemblies/switcher/audio.phtml  | 20 ++++++++++++--------
 template/assemblies/switcher/slides.phtml | 12 +++++++-----
 template/assemblies/switcher/video.phtml  | 28 ++++++++++++++++------------
 3 files changed, 35 insertions(+), 25 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index 182572e..eab77fb 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -10,12 +10,14 @@
 
 					<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
 						<span class="fa fa-flag-o"></span>
-						native
+						Native
 					</a>
-					<a href="<?=h($selection->getTranslatedLink())?>" class="btn btn-primary">
+          <? foreach($room->getTranslations() as $translation): ?>
+					<a href="<?=h($selection->getTranslatedLink($translation['endpoint']))?>" class="btn btn-primary">
 						<span class="fa fa-flag"></span>
-						translated
+            <?=h(ucfirst($translation['label']))?>
 					</a>
+		      <? endforeach ?>
 
 				</div>
 			</div>
@@ -39,12 +41,14 @@
 
 							<a href="<?=h($room->createStreamObject('audio', 'native')->getAudioUrl($proto))?>" class="btn btn-default">
 								<span class="fa fa-flag-o"></span>
-								native
-							</a>
-							<a href="<?=h($room->createStreamObject('audio', 'translated')->getAudioUrl($proto))?>" class="btn btn-default">
-								<span class="fa fa-flag"></span>
-								translated
+								Native
 							</a>
+              <? foreach($room->getTranslations() as $translation): ?>
+							  <a href="<?=h($room->createStreamObject('audio', $translation['endpoint'])->getAudioUrl($proto))?>" class="btn btn-default">
+							  	<span class="fa fa-flag"></span>
+                  <?=h(ucfirst($translation['label']))?>
+							  </a>
+		          <? endforeach ?>
 
 						<? else: ?>
 
diff --git a/template/assemblies/switcher/slides.phtml b/template/assemblies/switcher/slides.phtml
index dfbc26d..ba70c5f 100644
--- a/template/assemblies/switcher/slides.phtml
+++ b/template/assemblies/switcher/slides.phtml
@@ -10,12 +10,14 @@
 
 					<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
 						<span class="fa fa-flag-o"></span>
-						native
-					</a>
-					<a href="<?=h($selection->getTranslatedLink())?>" class="btn btn-primary">
-						<span class="fa fa-flag"></span>
-						translated
+						Native
 					</a>
+          <? foreach($room->getTranslations() as $translation): ?>
+					  <a href="<?=h($selection->getTranslatedLink($translation['endpoint']))?>" class="btn btn-primary">
+					  	<span class="fa fa-flag"></span>
+              <?=h(ucfirst($translation['label']))?>
+					  </a>
+		      <? endforeach ?>
 
 				</div>
 			</div>
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
index 3877128..ae2815f 100644
--- a/template/assemblies/switcher/video.phtml
+++ b/template/assemblies/switcher/video.phtml
@@ -12,18 +12,20 @@
 
 						<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
 							<span class="fa fa-flag-o"></span>
-							native
-						</a>
-						<a href="<?=h($selection->getTranslatedLink())?>" class="btn btn-primary">
-							<span class="fa fa-flag"></span>
-							translated
+							Native
 						</a>
+            <? foreach($room->getTranslations() as $translation): ?>
+						  <a href="<?=h($selection->getTranslatedLink($translation['endpoint']))?>" class="btn btn-primary">
+						  	<span class="fa fa-flag"></span>
+                <?=h(ucfirst($translation['label']))?>
+						  </a>
+		        <? endforeach ?>
 
 					<? else: ?>
 
 						<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
 							<span class="fa fa-video-camera"></span>
-							video
+							Video
 						</a>
 
 					<? endif ?>
@@ -51,18 +53,20 @@
 
 								<a href="<?=h($room->createStreamObject($res, 'native')->getVideoUrl($proto))?>" class="btn btn-default">
 									<span class="fa fa-flag-o"></span>
-									native
-								</a>
-								<a href="<?=h($room->createStreamObject($res, 'translated')->getVideoUrl($proto))?>" class="btn btn-default">
-									<span class="fa fa-flag"></span>
-									translated
+									Native
 								</a>
+				        <? foreach($room->getTranslations() as $translation): ?>
+								  <a href="<?=h($room->createStreamObject($res, $translation['endpoint'])->getVideoUrl($proto))?>" class="btn btn-default">
+								  	<span class="fa fa-flag"></span>
+                    <?=h(ucfirst($translation['label']))?>
+								  </a>
+        				<? endforeach ?>
 
 							<? else: ?>
 
 								<a href="<?=h($switcherstream->getVideoUrl($proto))?>" class="btn btn-default">
 									<span class="fa fa-video-camera"></span>
-									video
+									Video
 								</a>
 
 							<? endif ?>
-- 
cgit v1.2.3


From eed207f8dfd68117715518c83fc32d3ae9e1e094 Mon Sep 17 00:00:00 2001
From: dedeibel
Date: Sun, 10 Dec 2017 18:02:48 +0100
Subject: Allowed multi translation for embedding, fixed autoplay option

---
 template/assemblies/embed-form.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/assemblies/embed-form.phtml b/template/assemblies/embed-form.phtml
index 721d886..020a22f 100644
--- a/template/assemblies/embed-form.phtml
+++ b/template/assemblies/embed-form.phtml
@@ -20,7 +20,7 @@
 
 			<div class="checkbox">
 				<label>
-					<input checked="checked" type="checkbox" id="autoplay"> Autoplay
+					<input checked="checked" type="checkbox" id="autoplay">Autoplay
 				</label>
 			</div>
 		</div>
-- 
cgit v1.2.3