From e0b4c5605344633be01884f8cf69aa0634bec0d8 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Tue, 31 Mar 2015 07:00:10 +0200
Subject: Implement Feedback-Form based on MVT Pattern

---
 template/assemblies/feedback.phtml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'template/assemblies/feedback.phtml')

diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml
index 80df984..246bc69 100644
--- a/template/assemblies/feedback.phtml
+++ b/template/assemblies/feedback.phtml
@@ -52,12 +52,21 @@
 			<label for="stream">Stream</label>
 			<select class="form-control" name="stream" id="stream">
 				<option></option>
-				<? foreach(get('ROOMS') as $roomSlug => $roomInfo): ?>
-					<? if(!has("ROOMS.$roomSlug.FEEDBACK")) continue ?>
-					<? foreach(room_get_possible_selections($roomSlug) as $selectionIter): ?>
+				<? foreach(Room::rooms() as $roomiter): ?>
+					<? if(!$room->hasFeedback()) continue ?>
+					<? foreach($roomiter->getSelections() as $selection): ?>
 						<option
-							<? if($roomSlug == $room && $selectionIter == @$selection): ?>selected<? endif ?>
-						value="<?=h("$roomSlug-$selectionIter")?>"><?=h(get("ROOMS.$roomSlug.DISPLAY", $roomSlug))?> – <?=h($selectionIter)?></option>
+							<? if(
+								$roomiter->getSlug() == $room->getSlug() &&
+								(
+									!isset($stream) ||
+									($selection->getSelection() == $stream->getSelection())
+								)
+							): ?>selected<? endif ?>
+							value="<?=h($roomiter->getSlug().'-'.$selection->getSelection())?>"
+						>
+							<?=h($roomiter->getDisplay())?> – <?=h($selection->getDisplay())?>
+						</option>
 					<? endforeach ?>
 				<? endforeach ?>
 			</select>
-- 
cgit v1.2.3