From 40c699e1a307919f65a52632ddf816a735dde8a0 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 2 Mar 2015 16:38:50 +0100
Subject: Relive

---
 template/assemblies/player/relive.phtml |  6 ++--
 template/overview.phtml                 |  8 +++--
 template/relive-player.phtml            | 35 +++++++++++++++-------
 template/relive.phtml                   | 52 ++++++++++++++++++++-------------
 4 files changed, 63 insertions(+), 38 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml
index c37fd87..718b249 100644
--- a/template/assemblies/player/relive.phtml
+++ b/template/assemblies/player/relive.phtml
@@ -1,14 +1,14 @@
-<div style="width: 100%; height: 100%; max-width: <?=h($width)?>px; margin: 0 auto;">
+<div style="max-width: <?=h($width)?>px; max-height: <?=h($height)?>px;" class="video-wrap">
 	<video
 		autoplay="autoplay"
 		preload="auto"
 		width="<?=h($width)?>"
 		height="<?=h($height)?>"
 		style="width: 100%; height: 100%;"
-		class="nosubs relive"
+		class="relive"
 	>
 		<source
-			src="http://vod.c3voc.de/relive/<?=h($talk['playlist'])?>"
+			src="<?=h($talk['playlist'])?>"
 			title="h.264 (HLS)"
 			type="application/x-mpegURL"
 		/>
diff --git a/template/overview.phtml b/template/overview.phtml
index 9210d47..ad102f8 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -40,9 +40,11 @@
 				">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<a href="<?=h(link_room($room))?>">
-								<?=h(get("ROOMS.$room.DISPLAY"))?>
-							</a>
+							<div class="panel-title">
+								<a href="<?=h(link_room($room))?>">
+									<?=h(get("ROOMS.$room.DISPLAY"))?>
+								</a>
+							</div>
 						</div>
 
 						<div class="panel-body">
diff --git a/template/relive-player.phtml b/template/relive-player.phtml
index 2a488d6..0e02c13 100644
--- a/template/relive-player.phtml
+++ b/template/relive-player.phtml
@@ -1,15 +1,28 @@
-<div class="container-fluid">
-	<h1><?=h($title)?></h1>
-	<h2><?=h($talk['title'])?></h2>
-	<? include("$assemblies/player/relive.phtml") ?>
+<div class="container">
+	<div class="row headline">
+		<div class="col-xs-12">
+			<h1><?=h($title)?></h1>
+		</div>
+	</div>
+
+	<div class="row">
+		<div class="col-xs-12">
+			<div class="player-wrap">
+				<? include("$assemblies/player/relive.phtml") ?>
+			</div>
+		</div>
+	</div>
 
-	<div class="text">
-		<h3>Use a Desktop-Player!</h3>
-		<p>Browsers and Video doesn't go together well, even in 2014 and especially when it's live. So for your best viewing-experience please use a Desktop-Player like VLC or mplayer: <a href="http://vod.c3voc.de/relive/<?=h($talk['playlist'])?>">HLS-Playlist</a></p>
+	<div class="row">
+		<div class="col-xs-12 col-md-8 col-md-offset-2">
+			<div class="well">
+				<? include("$assemblies/desktop-player.phtml") ?>
 
-		<? if($talk['status'] == 'released'): ?>
-			<h3>Released</h3>
-			<p>This talk is already released! Take a look at <a href="<?=h($talk['release_url'])?>">media.ccc.de</a>.</p>
-		<? endif ?>
+				<? if($talk['status'] == 'released'): ?>
+					<h3>Released</h3>
+					<p>This talk is already released! Take a look at <a href="<?=h($talk['release_url'])?>">media.ccc.de</a>.</p>
+				<? endif ?>
+			</div>
+		</div>
 	</div>
 </div>
diff --git a/template/relive.phtml b/template/relive.phtml
index 86b5b3f..aa605d8 100644
--- a/template/relive.phtml
+++ b/template/relive.phtml
@@ -2,24 +2,35 @@
 	<h1><?=h($title)?></h1>
 
 	<div class="row">
-		<div class="alert alert-danger" role="alert">
-			<i class="fa fa-exclamation-circle"></i>
-			<strong>Danger!</strong> Extreme Beta!!!
+		<div class="col-xs-12">
+			<div class="alert alert-danger" role="alert">
+				<i class="fa fa-exclamation-circle"></i>
+				<strong>Danger!</strong> Extreme Beta!!!
+			</div>
 		</div>
 	</div>
 
-	<div class="event-previews relive">
-
-		<? foreach ($talks as $talk): ?>
-			<a class="event-preview <?=h($talk['status'])?>"
-				<? if($talk['status'] == 'released'): ?>
-					href="<?=h($talk['release_url'])?>"
-				<? else: ?>
-					href="<?=h(link_vod($talk['id']))?>"
-				<? endif ?>
-			>
-				<img alt="<?=h($talk['title'])?>" class="video-thumbnail" src="http://vod.c3voc.de/relive/<?=h($talk['thumbnail'])?>">
-				<div class="caption">
+	<div class="row">
+
+	<? foreach ($talks as $talk): ?>
+		<? $url = ($talk['status'] == 'released') ? $talk['release_url'] : link_vod($talk['id']) ?>
+		<div class="col-xs-12 recording">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+
+					<h3 class="panel-title">
+						<a href="<?=h($url)?>">
+							<?=h($talk['title'])?>
+						</a>
+					</h3>
+
+				</div>
+				<div class="panel-body">
+					<a href="<?=h($url)?>">
+						<img class="preview" alt="<?=h($talk['title'])?>" class="video-thumbnail" src="<?=h($talk['thumbnail'])?>" width="213" height="120" />
+					</a>
+
+
 					<ul class="metadata">
 						<li>
 							<span class="fa fa-clock-o"></span>
@@ -34,12 +45,11 @@
 							<?=h($talk['room'])?>
 						</li>
 					</ul>
-					<h3><?=h($talk['title'])?>
-						<? if($talk['status'] == 'live'): ?>&nbsp;(Currently Live!)<? endif ?>
-					</h3>
+
+
 				</div>
-			</a>
-		<? endforeach ?>
+			</div>
+		</div>
+	<? endforeach ?>
 
-	</div>
 </div>
-- 
cgit v1.2.3