diff options
| author | MaZderMind | 2016-12-10 18:26:10 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-10 18:26:10 +0100 |
| commit | 51ee8234fa7d8c2fbda0705563ab724746dfe9ce (patch) | |
| tree | f0da1effc9f55f2f75dc57fe1ba17419d559b45b /template/assemblies | |
| parent | e4141027ad16565b95d64ea262e6909a64cd6e1f (diff) | |
| parent | f6c0270d40f6730fe1e1820f2866b08792df1db6 (diff) | |
Merge branch 'feature/27-unwind-global-config'
Diffstat (limited to 'template/assemblies')
| -rw-r--r-- | template/assemblies/feedback.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/header.phtml | 4 |
2 files changed, 4 insertions, 4 deletions
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 ?> |