diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/embed-form.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/feedback.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/header.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/template/assemblies/embed-form.phtml b/template/assemblies/embed-form.phtml index 424d63a..721d886 100644 --- a/template/assemblies/embed-form.phtml +++ b/template/assemblies/embed-form.phtml @@ -10,11 +10,11 @@ <select id="size" class="form-control"> <option value="512,288">512×288</option> <option value="800,450">800×450</option> - <option <? if($stream->getSelection() == 'sd'): ?>selected<? endif ?> value="1024,576">1024×576</option> + <option selected value="1024,576">1024×576</option> <? if($stream->getSelection() == 'hd'): ?> <option value="1280,720">1280×720</option> - <option selected value="1920,1080">1920×1080</option> + <option value="1920,1080">1920×1080</option> <? endif ?> </select> diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml index a33cc31..6df80cc 100644 --- a/template/assemblies/feedback.phtml +++ b/template/assemblies/feedback.phtml @@ -1,4 +1,4 @@ -<form action="feedback/" target="feedback-target" method="post" role="form" class="feedback-form"> +<form action="<?=h($conference->getFeedbackURl())?>" target="feedback-target" method="post" role="form" class="feedback-form"> <div class="col-sm-4 col"> <div class="form-group"> <label for="net">Network Connection</label> @@ -52,7 +52,7 @@ <label for="stream">Stream</label> <select class="form-control" name="stream" id="stream"> <option></option> - <? foreach(Room::rooms() as $roomiter): ?> + <? foreach($conference->getRooms() as $roomiter): ?> <? if(!$roomiter->hasFeedback()) continue ?> <? foreach($roomiter->getSelections() as $selection): ?> <option diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml index c4d92e7..6791bfe 100644 --- a/template/assemblies/header.phtml +++ b/template/assemblies/header.phtml @@ -15,8 +15,8 @@ </a> <? endif ?> - <? if(!$conference->hasEnded() && isset($feedback) && $feedback->isEnabled()): ?> - <a class="form-control btn btn-default feedback" title="Feedback" href="<?=h($feedback->getUrl())?>"> + <? if(!$conference->hasEnded() && $conference->hasFeedback()): ?> + <a class="form-control btn btn-default feedback" title="Feedback" href="<?=h($conference->getFeedbackUrl())?>"> <span class="fa fa-bullhorn"></span> </a> <? endif ?> diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index b804196..90ec1b9 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -13,7 +13,7 @@ data-end="<?=intval($event['end'])?>" > <? $fromstart += $event['duration'] ?> - <? $scheduleRoom = Room::createIfExists($roomname) ?> + <? $scheduleRoom = $conference->getRoomIfExists($roomname) ?> <? if($scheduleRoom): ?> <a class="inner" |