Work on Room-Page

5 files changed, 43 insertions, 103 deletions

diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml
index 0ca00e3..6633d32 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-horizontal row">
+<form action="feedback/" target="feedback-target" method="post" role="form" class="feedback-form form-horizontal">
 	<div class="col-sm-4 col">
 		<div class="form-group">
 			<label for="net">Network Connection</label>
diff --git a/template/assemblies/switcher/miniroom-audio.phtml b/template/assemblies/switcher/miniroom-audio.phtml
deleted file mode 100644
index 12a7921..0000000
--- a/template/assemblies/switcher/miniroom-audio.phtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<h3>Directlinks</h3>
-<ul>
-	<? foreach(array('mp3', 'opus') as $iter): ?>
-		<li>
-			<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
-			<a href="<?=h(link_stream('audio', $room, $iter))?>">
-				<span class="fa fa-flag-o"></span>
-				audio
-			</a>
-		</li>
-	<? endforeach ?>
-</ul>
diff --git a/template/assemblies/switcher/miniroom-video.phtml b/template/assemblies/switcher/miniroom-video.phtml
deleted file mode 100644
index e2f807f..0000000
--- a/template/assemblies/switcher/miniroom-video.phtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<h3>Formats</h3>
-<ul>
-	<? foreach(array('hd', 'sd') as $iter): ?>
-		<li>
-			<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
-			<a href="<?=h(link_player($room, $iter))?>">
-				<span class="fa fa-flag-o"></span>
-				video
-			</a>
-		</li>
-	<? endforeach ?>
-</ul>
-
-<hr />
-
-<? include("$assemblies/desktop-player.phtml") ?>
-
-<hr />
-
-<? foreach(array('rtmp', 'hls') as $protocol): ?>
-	<h3>Directlinks (<?=h(strtoupper($protocol))?>)</h3>
-	<ul>
-		<?
-			if($protocol == 'hls')
-				$formats = array('hd', 'sd', 'auto');
-			else
-				$formats = array('hd', 'sd');
-		?>
-		<? foreach($formats as $iter): ?>
-			<li>
-				<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
-				<a href="<?=h(link_stream($protocol, $room, $iter))?>">
-					<span class="fa fa-flag-o"></span>
-					video
-				</a>
-			</li>
-		<? endforeach ?>
-	</ul>
-<? endforeach ?>
-
-<h3>Directlinks (WebM)</h3>
-<ul>
-	<? foreach(array('hd', 'sd') as $iter): ?>
-		<li>
-			<span class="label filetype" title="<?=h(format_text('webm'))?>"><?=h(strtoupper($iter))?></span>
-			<a href="<?=h(link_stream('webm', $room, $iter))?>">
-				<span class="fa fa-flag-o"></span>
-				video
-			</a>
-		</li>
-	<? endforeach ?>
-</ul>
diff --git a/template/overview.phtml b/template/overview.phtml
index 95dceeb..fc9e80b 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -1,9 +1,9 @@
 <? include("$assemblies/banner.phtml") ?>
 
-<div class="container overview">
+<div class="container">
 	<div class="row headline">
 		<div class="col-xs-12">
-			<h1>Live-Streams</h1>
+			<h1><?=h($title)?></h1>
 		</div>
 	</div>
 
@@ -14,9 +14,9 @@
 			</div>
 
 			<? $count = count($rooms); ?>
-			<? foreach($rooms as $idx => $slug): ?>
+			<? foreach($rooms as $idx => $room): ?>
 				<div class="
-					room room-<?=h($slug)?>
+					room room-<?=h($room)?>
 
 					<? /* when the count is odd and this is the last item - make it full width */ ?>
 					<? if($count % 2 == 1 && $idx == $count - 1): ?>
@@ -25,33 +25,33 @@
 						col-md-6 col-sm-12 narrow
 					<? endif ?>
 
-					<? if(get("ROOMS.$slug.PREVIEW")): ?>
+					<? if(get("ROOMS.$room.PREVIEW")): ?>
 						has-preview
 					<? endif ?>
 
-					<? if(get("ROOMS.$slug.SCHEDULE") && has("SCHEDULE")): ?>
+					<? if(get("ROOMS.$room.SCHEDULE") && has("SCHEDULE")): ?>
 						has-schedule
 					<? endif ?>
 				">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<a href="<?=h(link_room($slug))?>">
-								<?=h(get("ROOMS.$slug.DISPLAY"))?>
+							<a href="<?=h(link_room($room))?>">
+								<?=h(get("ROOMS.$room.DISPLAY"))?>
 							</a>
 						</div>
 
 						<div class="panel-body">
-							<? if(get("ROOMS.$slug.PREVIEW")): ?>
-								<a href="<?=h(link_room($slug))?>">
-									<img class="preview" src="thumbs/<?=h(get("ROOMS.$slug.STREAM"))?>.png" alt="" width="213" height="120" />
+							<? if(get("ROOMS.$room.PREVIEW")): ?>
+								<a href="<?=h(link_room($room))?>">
+									<img class="preview" src="thumbs/<?=h(get("ROOMS.$room.STREAM"))?>.png" alt="" width="213" height="120" />
 								</a>
 							<? endif ?>
 
-							<a href="<?=h(link_room($slug))?>" class="title">
-								<?=h(get("ROOMS.$slug.DISPLAY"))?>
+							<a href="<?=h(link_room($room))?>" class="title">
+								<?=h(get("ROOMS.$room.DISPLAY"))?>
 							</a>
 
-							<? if(get("ROOMS.$slug.SCHEDULE") && has("SCHEDULE")): ?>
+							<? if(get("ROOMS.$room.SCHEDULE") && has("SCHEDULE")): ?>
 								<div class="program-schedule">
 									<div class="talk current-talk">
 										<strong>Now:</strong>
diff --git a/template/room.phtml b/template/room.phtml
index 1a057f2..e337eda 100644
--- a/template/room.phtml
+++ b/template/room.phtml
@@ -1,14 +1,12 @@
-<div class="container-fluid room <?=h($type)?> <?=h($format)?> <?=h($language)?>" data-room="<?=h($GLOBALS['CONFIG']['ROOMS'][$room])?>">
-	<h1><?=h($title)?></h1>
+<div class="container <?=h($type)?> <?=h($selection)?> <?=h($language)?>">
+	<div class="row headline">
+		<div class="col-xs-12">
+			<h1 data-room="<?=h(get("ROOMS.$room.DISPLAY"))?>"><?=h($title)?></h1>
+		</div>
+	</div>
 
 	<ul class="nav nav-tabs nav-justified">
-		<?
-			if($miniroom || $room == 'saal6')
-				$tabs = array('video', 'audio');
-			else
-				$tabs = array('video', 'audio', 'slides');
-		?>
-		<? foreach($tabs as $iter): ?>
+		<? foreach($types as $iter): ?>
 			<li
 				<? if($type == $iter):?>class="active"<? endif ?>
 			>
@@ -19,45 +17,51 @@
 		<? endforeach ?>
 	</ul>
 
-	<div class="player-wrap">
-		<? include("$assemblies/player/$type.phtml") ?>
+	<div class="player-wrap tab-content">
+		<div class="tab-pane active">
+			<? include("$assemblies/player/$type.phtml") ?>
+		</div>
 	</div>
 
 	<ul class="nav nav-tabs nav-justified" role="tablist">
 		<li class="active">
 			<a href="#switcher" role="tab" data-toggle="tab">Formats</a>
 		</li>
-		<? if(!$miniroom): ?>
+		<? if(get("ROOMS.$room.IRC") && has("IRC")): ?>
 			<li>
 				<a href="#irc" role="tab" data-toggle="tab">IRC</a>
 			</li>
+		<? endif ?>
+		<? if(get("ROOMS.$room.SCHEDULE") && has("SCHEDULE")): ?>
 			<li>
 				<a href="#program" role="tab" data-toggle="tab">Program</a>
 			</li>
 		<? endif ?>
-		<li>
-			<a href="#feedback" role="tab" data-toggle="tab">Feedback</a>
-		</li>
+		<? if(get("ROOMS.$room.FEEDBACK") && has("FEEDBACK")): ?>
+			<li>
+				<a href="#feedback" role="tab" data-toggle="tab">Feedback</a>
+			</li>
+		<? endif ?>
 	</ul>
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="switcher">
-			<? if($miniroom): ?>
-				<? include("$assemblies/switcher/miniroom-$type.phtml") ?>
-			<? else: ?>
-				<? include("$assemblies/switcher/$type.phtml") ?>
-			<? endif ?>
+			<? include("$assemblies/switcher/$type.phtml") ?>
 		</div>
-		<? if(!$miniroom): ?>
+		<? if(get("ROOMS.$room.SCHEDULE") && has("SCHEDULE")): ?>
 			<div class="tab-pane" id="irc">
 				<? include("$assemblies/irc.phtml") ?>
 			</div>
+		<? endif ?>
+		<? if(get("ROOMS.$room.FEEDBACK") && has("FEEDBACK")): ?>
 			<div class="tab-pane" id="program">
 				<? include("$assemblies/program.phtml") ?>
 			</div>
 		<? endif ?>
-		<div class="tab-pane" id="feedback">
-			<? include("$assemblies/feedback.phtml") ?>
-		</div>
+		<? if(get("ROOMS.$room.FEEDBACK") && has("FEEDBACK")): ?>
+			<div class="tab-pane" id="feedback">
+				<? include("$assemblies/feedback.phtml") ?>
+			</div>
+		<? endif ?>
 	</div>
 </div>