diff options
Diffstat (limited to '')
| -rw-r--r-- | view/allconferences.php | 2 | ||||
| -rw-r--r-- | view/multiview.php | 2 | ||||
| -rw-r--r-- | view/streams-json-v1.php | 1 | ||||
| -rw-r--r-- | view/streams-json-v2.php | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/view/allconferences.php b/view/allconferences.php index 8cce073..89a3c5c 100644 --- a/view/allconferences.php +++ b/view/allconferences.php @@ -2,7 +2,7 @@ echo $tpl->render(array( 'page' => 'allconferences', - 'title' => 'Multiple Conferences', + 'title' => 'Multiple Events', 'conferences' => Conferences::getActiveConferences(), )); diff --git a/view/multiview.php b/view/multiview.php index eebf81e..6825911 100644 --- a/view/multiview.php +++ b/view/multiview.php @@ -4,6 +4,6 @@ echo $tpl->render(array( 'page' => 'multiview', 'title' => 'Stream-Übersicht', - 'rooms' => Room::rooms(), + 'rooms' => $conference->getRooms(), 'selection' => @$_GET['selection'], )); diff --git a/view/streams-json-v1.php b/view/streams-json-v1.php index 19f7b0d..055f6bc 100644 --- a/view/streams-json-v1.php +++ b/view/streams-json-v1.php @@ -2,6 +2,7 @@ header('Content-Type: application/json'); +$struct = []; foreach (Conferences::getActiveConferences() as $conference) { $overview = $conference->getOverview(); diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php index 1e4c89b..bc22868 100644 --- a/view/streams-json-v2.php +++ b/view/streams-json-v2.php @@ -2,6 +2,7 @@ header('Content-Type: application/json'); +$struct = []; foreach (Conferences::getActiveConferences() as $conference) { $overview = $conference->getOverview(); @@ -66,7 +67,7 @@ foreach (Conferences::getActiveConferences() as $conference) case 'dash': $urls['dash'] = array( - 'display' => $display, + 'display' => 'DASH, baby', 'tech' => $room->getDashTech(), 'url' => $room->getDashManifestUrl(), ); |