Merge branch 'feature/27-unwind-global-config'

6 files changed, 10 insertions, 10 deletions

diff --git a/template/allconferences.phtml b/template/allconferences.phtml
index e1fb5e3..bee21d7 100644
--- a/template/allconferences.phtml
+++ b/template/allconferences.phtml
@@ -6,7 +6,7 @@
 
 	<div class="row clearfix">
 		<? $count = count($conferences) ?>
-		<? foreach($conferences as $idx => $info): ?>
+		<? foreach($conferences as $idx => $conference): ?>
 			<?
 				// when we have more then 3 conferences, all but the last 3 will be displayed with 1/3 width
 				if($count - $idx <= ($count % 3))
@@ -24,8 +24,8 @@
 			">
 				<div class="panel panel-default">
 					<div class="panel-body">
-						<a href="<?=h($info['link'])?>"><?=h($info['title'])?></a>
-						<p><?=h($info['description'])?></p>
+						<a href="<?=h($conference->getLink())?>"><?=h($conference->getTitle())?></a>
+						<p><?=h($conference->getDescription())?></p>
 					</div>
 				</div>
 			</div>
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/feedback-read.phtml b/template/feedback-read.phtml
index 0c42d37..8dc9cc7 100644
--- a/template/feedback-read.phtml
+++ b/template/feedback-read.phtml
@@ -1,6 +1,6 @@
 <div class="container">
 	<h1><?=h($title)?></h1>
-	<form action="feedback/read/" method="POST">
+	<form action="<?=h($conference->getFeedbackReadUrl())?>" method="POST">
 
 		<div class="row">
 			<div class="col-xs-12">
diff --git a/template/overview.phtml b/template/overview.phtml
index c23320e..02f0b5f 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -1,6 +1,6 @@
 <? include("$assemblies/banner.phtml") ?>
 
-<div class="container">
+<div class="container" data-schedule-url="<?=h($conference->getScheduleJsonUrl())?>">
 	<div class="row headline">
 		<div class="col-xs-12">
 			<h1><?=h($title)?></h1>
diff --git a/template/page.phtml b/template/page.phtml
index b62f372..b3bad81 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -47,7 +47,7 @@
 		<link href="<?=h($assets)?>img/favicon.png" rel="icon" type="image/png" />
 
 		<link type="text/css" rel="stylesheet" href="<?=h($assets)?>mejs/mediaelementplayer.min.css" />
-		<link type="text/css" rel="stylesheet" href="gen/main.css" />
+		<link type="text/css" rel="stylesheet" href="<?=h($conference_assets)?>gen/main.css" />
 
 		<script type="text/javascript" src="<?=h($assets)?>js/lib/jquery.min.js"></script>
 		<script type="text/javascript" src="<?=h($assets)?>js/lib/jquery.scrollTo.min.js"></script>