Merge branch 'mandators'

8 files changed, 87 insertions, 37 deletions

diff --git a/template/about.phtml b/template/about.phtml
index 68aa2fb..eee4896 100644
--- a/template/about.phtml
+++ b/template/about.phtml
@@ -6,7 +6,7 @@
 	<p>
 		If you like what we're doing, you can flattr us:<br /><br />
 		<a href="https://flattr.com/thing/3755795/">
-			<img src="assets/img/flattrbutton.png" alt="Flattr this" />
+			<img src="<?=h($assets)?>/img/flattrbutton.png" alt="Flattr this" />
 		</a>
 	</p>
 
diff --git a/template/allclosed.phtml b/template/allclosed.phtml
new file mode 100644
index 0000000..31947a7
--- /dev/null
+++ b/template/allclosed.phtml
@@ -0,0 +1,14 @@
+<div class="container about">
+	<? if($next): ?>
+		<h2>See you soon at <?=h($next['name'])?></h2>
+		<span class="countdown" data-dt="<?=h($next['start_date'])?>"></span>
+	<? endif ?>
+
+	<p>
+		You can watch most of our Recordings at <a href="<?=h($conference->getReleasesUrl())?>"><?=h($conference->getReleasesUrl())?></a>.
+	</p>
+
+	<br><br><br>
+
+	<? include("$assemblies/upcoming.phtml") ?>
+</div>
diff --git a/template/allconferences.phtml b/template/allconferences.phtml
new file mode 100644
index 0000000..2d47b82
--- /dev/null
+++ b/template/allconferences.phtml
@@ -0,0 +1,33 @@
+<div class="container">
+	<h1><?=h($title)?></h1>
+	<p>We are currently active on multiple Conferences. Please choose which one you want access.</p>
+
+	<br><br>
+
+	<div class="row clearfix">
+		<? $count = count($conferences) ?>
+		<? foreach($conferences as $idx => $info): ?>
+			<?
+				// when we have more then 3 conferences, all but the last 3 will be displayed with 1/3 width
+				if($count - $idx <= ($count % 3))
+					$w = 12/($count%3);
+				else
+					$w = 12/3;
+			?>
+
+			<div class="
+				clearfix
+				conference
+				col-xs-12
+				col-md-<?=h($w)?>
+			">
+				<div class="panel panel-default">
+					<div class="panel-body">
+						<a href="<?=h($info['link'])?>"><?=h($info['title'])?></a>
+						<p><?=h($info['description'])?></p>
+					</div>
+				</div>
+			</div>
+		<? endforeach ?>
+	</div>
+</div>
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index f57054c..a213dd3 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -15,7 +15,7 @@
 				</a>
 			<? endif ?>
 
-			<? if(!$conference->hasEnded() && $feedback->isEnabled()): ?>
+			<? if(!$conference->hasEnded() && isset($feedback) && $feedback->isEnabled()): ?>
 				<a class="form-control btn btn-default" href="<?=h($feedback->getUrl())?>">
 					<span class="fa fa-bullhorn"></span>
 				</a>
diff --git a/template/assemblies/upcoming.phtml b/template/assemblies/upcoming.phtml
new file mode 100644
index 0000000..7d9ffac
--- /dev/null
+++ b/template/assemblies/upcoming.phtml
@@ -0,0 +1,21 @@
+<? foreach($events as $event): ?>
+	<div class="col-xs-10 col-xs-offset-1 col-md-6 col-md-offset-3">
+
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<? if($event['description']): ?>
+					<a href="<?=h($event['description'])?>">
+						<?=h($event['name'])?>
+					</a>
+				<? else: ?>
+					<?=h($event['name'])?>
+				<? endif ?>
+			</div>
+			<div class="panel-body">
+				<?=h($event['location'])?><br />
+				<?=h($event['start_date'])?> – <?=h($event['end_date'])?>
+			</div>
+		</div>
+
+	</div>
+<? endforeach ?>
diff --git a/template/closed.phtml b/template/closed.phtml
index 6ca7416..0b56e74 100644
--- a/template/closed.phtml
+++ b/template/closed.phtml
@@ -29,25 +29,5 @@
 
 	<br><br><br>
 
-	<? foreach($events as $event): ?>
-		<div class="col-xs-10 col-xs-offset-1 col-md-6 col-md-offset-3">
-
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<? if($event['description']): ?>
-						<a href="<?=h($event['description'])?>">
-							<?=h($event['name'])?>
-						</a>
-					<? else: ?>
-						<?=h($event['name'])?>
-					<? endif ?>
-				</div>
-				<div class="panel-body">
-					<?=h($event['location'])?><br />
-					<?=h($event['start_date'])?> – <?=h($event['end_date'])?>
-				</div>
-			</div>
-
-		</div>
-	<? endforeach ?>
+	<? include("$assemblies/upcoming.phtml") ?>
 </div>
diff --git a/template/embed.phtml b/template/embed.phtml
index dd8629a..f99ece1 100644
--- a/template/embed.phtml
+++ b/template/embed.phtml
@@ -1 +1 @@
-<? require('assemblies/player/'.$stream->getPlayerType().'.phtml') ?>
+<? require("$assemblies/player/".$stream->getPlayerType().'.phtml') ?>
diff --git a/template/page.phtml b/template/page.phtml
index bd73065..ac639a2 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -29,20 +29,20 @@
 		<base href="<?=h($baseurl)?>" />
 		<link href="<?=h($canonicalurl)?>" rel="canonical" />
 
-		<link href="assets/img/apple-touch-icon.png" rel="apple-touch-icon" />
-		<link href="assets/img/favicon.png" rel="icon" type="image/png" />
+		<link href="<?=h($assets)?>img/apple-touch-icon.png" rel="apple-touch-icon" />
+		<link href="<?=h($assets)?>img/favicon.png" rel="icon" type="image/png" />
 
-		<link type="text/css" rel="stylesheet" href="assets/mejs/mediaelementplayer.min.css" />
+		<link type="text/css" rel="stylesheet" href="<?=h($assets)?>mejs/mediaelementplayer.min.css" />
 		<link type="text/css" rel="stylesheet" href="gen/main.css" />
 
-		<script type="text/javascript" src="assets/js/lib/jquery.min.js"></script>
-		<script type="text/javascript" src="assets/js/lib/jquery.scrollTo.min.js"></script>
-		<script type="text/javascript" src="assets/js/lib/bootstrap.min.js"></script>
-		<script type="text/javascript" src="assets/js/lib/bootstrap-datepicker.min.js"></script>
-		<script type="text/javascript" src="assets/js/lib/moment.min.js"></script>
+		<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>
+		<script type="text/javascript" src="<?=h($assets)?>js/lib/bootstrap.min.js"></script>
+		<script type="text/javascript" src="<?=h($assets)?>js/lib/bootstrap-datepicker.min.js"></script>
+		<script type="text/javascript" src="<?=h($assets)?>js/lib/moment.min.js"></script>
 
-		<script type="text/javascript" src="assets/mejs/mediaelement-and-player.min.js"></script>
-		<script type="text/javascript" src="assets/js/lustiges-script.js"></script>
+		<script type="text/javascript" src="<?=h($assets)?>mejs/mediaelement-and-player.min.js"></script>
+		<script type="text/javascript" src="<?=h($assets)?>js/lustiges-script.js"></script>
 	</head>
 	<body class="<?=h(is_numeric($page[0]) ? 'e'.$page : $page)?>">
 		<? if(!@$naked): ?>
@@ -55,8 +55,10 @@
 			<? include("$assemblies/footer.phtml") ?>
 		<? endif ?>
 
-		<span class="js-settings"
-			data-scheduleoffset="<?=h($schedule->getSimulationOffset())?>"
-		></span>
+		<? if(isset($schedule)): ?>
+			<span class="js-settings"
+				data-scheduleoffset="<?=h($schedule->getSimulationOffset())?>"
+			></span>
+		<? endif ?>
 	</body>
 </html>