From 7b7860d3416ae2ccdfeacb4f2c444f329e939641 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Fri, 26 Dec 2014 20:55:08 +0100
Subject: no webm hd atm

---
 template/assemblies/player/video.phtml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'template')

diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index b6036a5..73ff4ad 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -7,12 +7,14 @@
 		style="width: 100%; height: 100%;"
 		class="<?=h($miniroom ? 'nosubs' : 'subs')?>"
 	>
+		<? if($format != 'hd'): ?>
 		<source
 			data-plugin-type="native"
 			src="<?=h(link_stream('webm', $room, $format, $translated))?>"
 			title="WebM (Icecast)"
 			type="video/webm"
 		/>
+		<? endif ?>
 		<source
 			data-plugin-type="flash"
 			src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
-- 
cgit v1.2.3


From 8450b9954bb8356f2ce294e7c80ae3ecd28a97e5 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 00:19:04 +0100
Subject: new room urls

---
 template/rooms.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/rooms.phtml b/template/rooms.phtml
index 3b6a1bb..180d1d0 100644
--- a/template/rooms.phtml
+++ b/template/rooms.phtml
@@ -10,7 +10,7 @@
 			<? foreach(array('saal1', 'saal2', 'saalg', 'saal6') as $room): ?>
 				<li class="<?=h($room)?> col-md-6 col-sm-12">
 					<a href="<?=h(link_room($room))?>">
-						<img class="teaser" src="assets/img/rooms/<?=h($room)?>.png" alt="" width="213" height="120" />
+						<img class="teaser" src="thumbs/rooms/<?=h($room)?>.png" alt="" width="213" height="120" />
 						<div class="title"><?=h($rooms[$room])?></div>
 
 						<div class="program-teaser">
-- 
cgit v1.2.3


From 78ea394513f27cdab05e73d12818ca3566d2d319 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 00:27:21 +0100
Subject: sendezentrum img

---
 template/rooms.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/rooms.phtml b/template/rooms.phtml
index 180d1d0..ac5e53f 100644
--- a/template/rooms.phtml
+++ b/template/rooms.phtml
@@ -53,7 +53,10 @@
 		<ul class="row">
 			<? foreach(array('sendezentrum') as $room): ?>
 				<li class="<?=h($room)?> col-sm-12">
-					<a href="<?=h(link_room($room))?>" class="title"><?=h($rooms[$room])?></a>
+					<a href="<?=h(link_room($room))?>">
+						<img class="teaser" src="thumbs/rooms/<?=h($room)?>.png" alt="" width="213" height="120" />
+						<div class="title"><?=h($rooms[$room])?></div>
+					</a>
 				</li>
 			<? endforeach ?>
 		</ul>
-- 
cgit v1.2.3


From c264ac62b4a5c136023a638ca010fe4d8a5d74aa Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 00:58:13 +0100
Subject: disable webm

---
 template/assemblies/player/video.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index 73ff4ad..943e0db 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -7,14 +7,14 @@
 		style="width: 100%; height: 100%;"
 		class="<?=h($miniroom ? 'nosubs' : 'subs')?>"
 	>
-		<? if($format != 'hd'): ?>
+		<? /*if($format != 'hd'): ?>
 		<source
 			data-plugin-type="native"
 			src="<?=h(link_stream('webm', $room, $format, $translated))?>"
 			title="WebM (Icecast)"
 			type="video/webm"
 		/>
-		<? endif ?>
+		<? endif*/ ?>
 		<source
 			data-plugin-type="flash"
 			src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
-- 
cgit v1.2.3


From a0b7031f99992662243cf50de23c0338f0896361 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 09:48:06 +0100
Subject: change stream notification

---
 template/assemblies/desktop-player.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/assemblies/desktop-player.phtml b/template/assemblies/desktop-player.phtml
index f08e8da..5836f90 100644
--- a/template/assemblies/desktop-player.phtml
+++ b/template/assemblies/desktop-player.phtml
@@ -1,2 +1,2 @@
 <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 <strong>please</strong> use a Desktop-Player like <a href="http://www.videolan.org/vlc/">VLC</a>.</p>
+<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.</p>
-- 
cgit v1.2.3


From 77d3c10bd8c7231003ae60ddd5d0a09b0b0d2204 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 10:01:33 +0100
Subject: enable webm stresms for native

---
 template/assemblies/player/video.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template')

diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index 943e0db..0955492 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -7,14 +7,14 @@
 		style="width: 100%; height: 100%;"
 		class="<?=h($miniroom ? 'nosubs' : 'subs')?>"
 	>
-		<? /*if($format != 'hd'): ?>
+		<? if(!$translated): ?>
 		<source
 			data-plugin-type="native"
 			src="<?=h(link_stream('webm', $room, $format, $translated))?>"
 			title="WebM (Icecast)"
 			type="video/webm"
 		/>
-		<? endif*/ ?>
+		<? endif ?>
 		<source
 			data-plugin-type="flash"
 			src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
-- 
cgit v1.2.3


From 5a67e025f491dda57dd841bb7fc49a39946d0949 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 13:02:34 +0100
Subject: link ReLive

---
 template/rooms.phtml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/rooms.phtml b/template/rooms.phtml
index ac5e53f..7a348ec 100644
--- a/template/rooms.phtml
+++ b/template/rooms.phtml
@@ -65,7 +65,18 @@
 
 
 	<div class="room-group recordings">
-		<a href="//media.ccc.de/browse/congress/2014/index.html"><span class="fa fa-video-camera"></span> Recordings</a>
+		<h2>Recordings</h2>
+
+		<ul class="row">
+			<li class="col-sm-6">
+				<div class="title">
+					<a href="http://media.ccc.de/browse/congress/2014/index.html"><span class="fa fa-video-camera"></span> Releases</a>
+				</div>
+			</li>
+			<li class="col-sm-6">
+				<a href="http://vod.c3voc.de/relive/"><span class="fa fa-play-circle"></span> ReLive</a>
+			</li>
+		</ul>
 	</div>
 
 </div>
-- 
cgit v1.2.3


From 03d3f65e9cdc7100628fb8dde20f97f503e09c57 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 13:26:08 +0100
Subject: show speaker in program view

---
 template/assemblies/program.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/assemblies/program.phtml b/template/assemblies/program.phtml
index 32fc4c8..496fa83 100644
--- a/template/assemblies/program.phtml
+++ b/template/assemblies/program.phtml
@@ -43,7 +43,7 @@ foreach(reset($program) as $event)
 									title="Switch to <?=h($GLOBALS['CONFIG']['ROOMS'][$name])?>"
 								><?=h($event['title'])?></a>
 							</h3>
-
+							<h5>by&nbsp;<?=h($event['speaker'])?></h5>
 						<? endif ?>
 					</div>
 
-- 
cgit v1.2.3