From f7d9d592745d1cb5cb2de76ed6ae99be974f1807 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 30 Mar 2015 16:20:30 +0200
Subject: Implement MVT Pattern based on simple Config options
---
template/assemblies/chat.phtml | 13 ++++----
template/assemblies/player/audio.phtml | 26 +++++-----------
template/assemblies/player/music.phtml | 26 +++++-----------
template/assemblies/player/slides.phtml | 20 +++++-------
template/assemblies/player/video.phtml | 42 +++++++++----------------
template/assemblies/switcher/audio.phtml | 33 ++++++++++----------
template/assemblies/switcher/music.phtml | 23 +++++++-------
template/assemblies/switcher/slides.phtml | 52 ++++++++++++++++---------------
template/assemblies/switcher/video.phtml | 36 ++++++++++-----------
9 files changed, 117 insertions(+), 154 deletions(-)
(limited to 'template/assemblies')
diff --git a/template/assemblies/chat.phtml b/template/assemblies/chat.phtml
index 85245b2..8498c45 100644
--- a/template/assemblies/chat.phtml
+++ b/template/assemblies/chat.phtml
@@ -1,14 +1,15 @@
- if(room_has_irc($room)): ?>
+ if($room->hasIrc()): ?>
endif ?>
- if(room_has_twitter($room)): ?>
+
+ if($room->hasTwitter($room)): ?>
-
endif ?>
diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml
index e007ab3..f8ed579 100644
--- a/template/assemblies/player/audio.phtml
+++ b/template/assemblies/player/audio.phtml
@@ -3,22 +3,12 @@
preload="auto"
style="width: 230px;"
>
- if(in_array("audio-mp3", $formats)): ?>
-
- endif ?>
- if(in_array("audio-opus", $formats)): ?>
-
- endif ?>
- if(in_array("audio-ogg", $formats)): ?>
-
- endif ?>
+
+
diff --git a/template/assemblies/player/music.phtml b/template/assemblies/player/music.phtml
index 587d2d2..b1c804a 100644
--- a/template/assemblies/player/music.phtml
+++ b/template/assemblies/player/music.phtml
@@ -3,22 +3,12 @@
preload="auto"
style="width: 230px;"
>
- if(in_array("music-mp3", $formats)): ?>
-
- endif ?>
- if(in_array("music-opus", $formats)): ?>
-
- endif ?>
- if(in_array("music-ogg", $formats)): ?>
-
- endif ?>
+
+
diff --git a/template/assemblies/player/slides.phtml b/template/assemblies/player/slides.phtml
index c2720d6..7887aa0 100644
--- a/template/assemblies/player/slides.phtml
+++ b/template/assemblies/player/slides.phtml
@@ -1,28 +1,22 @@
-
+
-
-
-
\ No newline at end of file
+
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index 0861cf8..3ffc333 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -1,34 +1,22 @@
-
+
- if(in_array("webm-$selection", $formats)): ?>
-
- endif ?>
- if(in_array("hls-$selection", $formats)): ?>
-
- endif ?>
- if(in_array("rtmp-$selection", $formats)): ?>
-
- endif ?>
+
+
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index 53131d3..9f3ba76 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -1,5 +1,6 @@
- if($has_translation): ?>
+ $selection = $room->createSelectionObject('audio') ?>
+ if($room->hasTranslation()): ?>
Audio