From f652ae2be38e74796ed63ba72e23fcb632818118 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 19 Oct 2014 12:12:20 +0200
Subject: restructure room site to produce a unique room/player/formats page

---
 template/assemblies/banner-small.phtml    |  4 ++++
 template/assemblies/switcher/audio.phtml  | 14 ++++++++++++
 template/assemblies/switcher/slides.phtml | 14 ++++++++++++
 template/assemblies/switcher/video.phtml  | 16 +++++++++++++
 template/formats.phtml                    |  8 -------
 template/page.phtml                       |  8 ++++---
 template/player.phtml                     |  2 --
 template/players/audio.phtml              | 38 +++++++++++++++++++++++++++++++
 template/players/slides.phtml             | 38 +++++++++++++++++++++++++++++++
 template/players/video.phtml              |  8 +++++++
 template/room.phtml                       | 23 +++++++++++++++++++
 11 files changed, 160 insertions(+), 13 deletions(-)
 create mode 100644 template/assemblies/banner-small.phtml
 create mode 100644 template/assemblies/switcher/audio.phtml
 create mode 100644 template/assemblies/switcher/slides.phtml
 create mode 100644 template/assemblies/switcher/video.phtml
 delete mode 100644 template/formats.phtml
 delete mode 100644 template/player.phtml
 create mode 100644 template/players/audio.phtml
 create mode 100644 template/players/slides.phtml
 create mode 100644 template/room.phtml

(limited to 'template')

diff --git a/template/assemblies/banner-small.phtml b/template/assemblies/banner-small.phtml
new file mode 100644
index 0000000..a54bc24
--- /dev/null
+++ b/template/assemblies/banner-small.phtml
@@ -0,0 +1,4 @@
+<div class="banner">
+	<img src="http://placehold.it/340x190" height="190" width="340" />
+	<div class="titlebar title">Motto Here &ndash; Lorem ipsum dolor</div>
+</div>
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
new file mode 100644
index 0000000..31bb3f0
--- /dev/null
+++ b/template/assemblies/switcher/audio.phtml
@@ -0,0 +1,14 @@
+<h3>Audio</h3>
+<ul>
+	<li>
+		<span class="label filetype">MP3</span>
+		<a href="<?=h(link_player($room, 'audio'))?>">
+			<span class="fa fa-download"></span>
+			native
+		</a>
+		<a href="<?=h(link_player($room, 'audio', true))?>">
+			<span class="fa fa-download"></span>
+			translated
+		</a>
+	</li>
+</ul>
diff --git a/template/assemblies/switcher/slides.phtml b/template/assemblies/switcher/slides.phtml
new file mode 100644
index 0000000..42573fa
--- /dev/null
+++ b/template/assemblies/switcher/slides.phtml
@@ -0,0 +1,14 @@
+<h3>Slides</h3>
+<ul>
+	<li>
+		<span class="label filetype">JPG &amp; MP3</span>
+		<a href="<?=h(link_player($room, 'slides'))?>">
+			<span class="fa fa-download"></span>
+			native
+		</a>
+		<a href="<?=h(link_player($room, 'slides', true))?>">
+			<span class="fa fa-download"></span>
+			translated
+		</a>
+	</li>
+</ul>
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
new file mode 100644
index 0000000..bceb93c
--- /dev/null
+++ b/template/assemblies/switcher/video.phtml
@@ -0,0 +1,16 @@
+<h3>Video</h3>
+<ul>
+	<? foreach(array('hd', 'hq', 'lq') as $iter): ?>
+		<li>
+			<span class="label filetype"><?=h(strtoupper($iter))?></span>
+			<a href="<?=h(link_player($room, $iter))?>">
+				<span class="fa fa-download"></span>
+				native
+			</a>
+			<a href="<?=h(link_player($room, $iter, true))?>">
+				<span class="fa fa-download"></span>
+				translated
+			</a>
+		</li>
+	<? endforeach ?>
+</ul>
diff --git a/template/formats.phtml b/template/formats.phtml
deleted file mode 100644
index d03913d..0000000
--- a/template/formats.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ul>
-	<? foreach($formats as $format => $display): ?>
-		<li class="<?=h($format)?>">
-			<a href="<?=h(link_player($room, $format))?>"><?=h($display)?></a>
-			(<a href="<?=h(link_player($room, $format, true))?>">translated</a>)
-		</li>
-	<? endforeach ?>
-</ul>
diff --git a/template/page.phtml b/template/page.phtml
index 7c3d8ae..99fceea 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -7,7 +7,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv='X-UA-Compatible' content='IE=edge'>
 
-		<title><?=h($title)?> - 31C3 Streaming</title>
+		<title><?=h($title)?> – 31C3 Streaming</title>
 
 		<meta name="robots" content="index,follow" />
 		<meta name="author" content="CCC" />
@@ -32,8 +32,10 @@
 		<link type="text/css" rel="stylesheet" href="assets/css/lib/font-awesome.min.css" />
 		<link type="text/css" rel="stylesheet" href="assets/css/lib/mediaelementplayer.min.css" />
 
-		<script type="text/javascript" src="assets/js/jquery-1.8.3.min.js"></script>
-		<script type="text/javascript" src="assets/js/lustiger-player.js"></script>
+		<script type="text/javascript" src="assets/js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="assets/js/lib/bootstrap.min.js"></script>
+		<script type="text/javascript" src="assets/js/lib/mediaelement-and-player.min.js"></script>
+		<script type="text/javascript" src="assets/js/lustiges-script.js"></script>
 	</head>
 	<body>
 		<? include('assemblies/header.phtml') ?>
diff --git a/template/player.phtml b/template/player.phtml
deleted file mode 100644
index 9fe7bfb..0000000
--- a/template/player.phtml
+++ /dev/null
@@ -1,2 +0,0 @@
-A Player:<br />
-<? include("players/$playertype.phtml") ?>
\ No newline at end of file
diff --git a/template/players/audio.phtml b/template/players/audio.phtml
new file mode 100644
index 0000000..e3c85c9
--- /dev/null
+++ b/template/players/audio.phtml
@@ -0,0 +1,38 @@
+<pre><?=print_r(array(
+	'room' => $room,
+	'language' => $language,
+	'format' => $format
+), true)?></pre>
+
+<?/*
+<video
+	autoplay="autoplay"
+	controls="controls"
+	id="video-tag"
+	preload="auto"
+	width="<?=h($width)?>"
+	height="<?=h($height)?>"
+>
+	<source
+		data-plugin-type="flash"
+		src="rtmp://rtmp.streaming.media.ccc.de:1935/stream/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>"
+		title="h.H264 (RTMP)"
+		type="video/rtmp"
+	/>
+	<source
+		data-plugin-type="native"
+		src="http://hls.streaming.media.ccc.de/hls/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>.m3u8"
+		title="h.264 (HLS)"
+		type="application/vnd.apple.mpegURL"
+	/>
+
+	<object
+		data="static/flashmediaelement.swf"
+		type="application/x-shockwave-flash"
+		width="<?=h($width)?>"
+		height="<?=h($height)?>"
+	>
+		<param name="allowFullScreen" value="true">
+	</object>
+</video>
+*/?>
diff --git a/template/players/slides.phtml b/template/players/slides.phtml
new file mode 100644
index 0000000..e3c85c9
--- /dev/null
+++ b/template/players/slides.phtml
@@ -0,0 +1,38 @@
+<pre><?=print_r(array(
+	'room' => $room,
+	'language' => $language,
+	'format' => $format
+), true)?></pre>
+
+<?/*
+<video
+	autoplay="autoplay"
+	controls="controls"
+	id="video-tag"
+	preload="auto"
+	width="<?=h($width)?>"
+	height="<?=h($height)?>"
+>
+	<source
+		data-plugin-type="flash"
+		src="rtmp://rtmp.streaming.media.ccc.de:1935/stream/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>"
+		title="h.H264 (RTMP)"
+		type="video/rtmp"
+	/>
+	<source
+		data-plugin-type="native"
+		src="http://hls.streaming.media.ccc.de/hls/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>.m3u8"
+		title="h.264 (HLS)"
+		type="application/vnd.apple.mpegURL"
+	/>
+
+	<object
+		data="static/flashmediaelement.swf"
+		type="application/x-shockwave-flash"
+		width="<?=h($width)?>"
+		height="<?=h($height)?>"
+	>
+		<param name="allowFullScreen" value="true">
+	</object>
+</video>
+*/?>
diff --git a/template/players/video.phtml b/template/players/video.phtml
index 824a776..e3c85c9 100644
--- a/template/players/video.phtml
+++ b/template/players/video.phtml
@@ -1,3 +1,10 @@
+<pre><?=print_r(array(
+	'room' => $room,
+	'language' => $language,
+	'format' => $format
+), true)?></pre>
+
+<?/*
 <video
 	autoplay="autoplay"
 	controls="controls"
@@ -28,3 +35,4 @@
 		<param name="allowFullScreen" value="true">
 	</object>
 </video>
+*/?>
diff --git a/template/room.phtml b/template/room.phtml
new file mode 100644
index 0000000..9574d59
--- /dev/null
+++ b/template/room.phtml
@@ -0,0 +1,23 @@
+<div class="container-fluid rooms">
+	<h1><?=h($title)?></h1>
+
+	<ul class="nav nav-tabs nav-justified">
+		<? foreach(array('video', 'audio', 'slides') as $iter): ?>
+			<li
+				<? if($type == $iter):?>class="active"<? endif ?>
+			>
+				<a href="<?=h(link_player($room, $iter))?>">
+					<?=h(ucfirst($iter))?>
+				</a>
+			</li>
+		<? endforeach ?>
+	</ul>
+
+
+	<div class="tab-content">
+		<? include("players/$type.phtml") ?>
+		<div class="switcher">
+			<? include("assemblies/switcher/$type.phtml") ?>
+		</div>
+	</div>
+</div>
-- 
cgit v1.2.3