From 1e9f8cd6bfb7e5850a05615044de2fe7771aba08 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Wed, 1 Oct 2014 14:58:31 +0200
Subject: display naming

---
 .htaccess              |  4 ++--
 formats.php            | 24 ++++++++++++++++++++++++
 index.php              |  9 ++++++++-
 room.php               | 18 ------------------
 template/formats.phtml |  8 ++++++++
 template/rooms.phtml   |  8 ++++----
 6 files changed, 46 insertions(+), 25 deletions(-)
 create mode 100644 formats.php
 delete mode 100644 room.php
 create mode 100644 template/formats.phtml

diff --git a/.htaccess b/.htaccess
index 7b25039..c668902 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,8 +7,8 @@ RewriteCond %{REQUEST_FILENAME} !-l
 
 # / -> index.php - room/streams list
 
-# /room/ -> room.php - list of qualities/formats
-RewriteRule ^(saal1|saal2|saalg|saalz)/?$ room.php?room=$1 [L]
+# /room/ -> formats.php - list of qualities/formats
+RewriteRule ^(saal1|saal2|saalg|saalz)/?$ formats.php?room=$1 [L]
 
 # /room/format/ -> player.php - native av-player for room
 RewriteRule ^(saal1|saal2|saalg|saalz)/(hd|hq|lq|audio|slides)/?$ player.php?room=$1&format=$2&language=native [L]
diff --git a/formats.php b/formats.php
new file mode 100644
index 0000000..1908680
--- /dev/null
+++ b/formats.php
@@ -0,0 +1,24 @@
+<?php
+
+require_once('lib/PhpTemplate.php');
+require_once('lib/helper.php');
+require_once('config.php');
+
+$room = $_GET['room'];
+
+$tpl = new PhpTemplate('template/page.phtml');
+echo $tpl->render(array(
+	'page' => 'rooms',
+	'baseurl' => baseurl(),
+	'title' => 'Stream-Formats',
+	'subtitle' => ucfirst($room),
+
+	'room' => $room,
+	'formats' => array(
+		'hd' => 'FullHD',
+		'hq' => 'High Quality',
+		'lq' => 'Low Quality',
+		'audio' => 'Audio-Only',
+		'slides' => 'Slide-Images + Audio',
+	),
+));
diff --git a/index.php b/index.php
index 46585a8..ccd2abd 100644
--- a/index.php
+++ b/index.php
@@ -10,5 +10,12 @@ echo $tpl->render(array(
 	'baseurl' => baseurl(),
 	'title' => 'Rooms',
 
-	'rooms' => array('saal1','saal2','saalg','saalz','launge','sendezentrum'),
+	'rooms' => array(
+		'saal1' => 'Saal 1',
+		'saal2' => 'Saal 2',
+		'saalg' => 'Saal G',
+		'saalz' => 'Saal Z',
+		'launge' => 'Launge',
+		'sendezentrum' => 'Sendezentrum',
+	),
 ));
diff --git a/room.php b/room.php
deleted file mode 100644
index 8f4db1f..0000000
--- a/room.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once('lib/PhpTemplate.php');
-require_once('lib/helper.php');
-require_once('config.php');
-
-$room = $_GET['room'];
-
-$tpl = new PhpTemplate('template/page.phtml');
-echo $tpl->render(array(
-	'page' => 'rooms',
-	'baseurl' => baseurl(),
-	'title' => 'Stream-Formats',
-	'subtitle' => ucfirst($room),
-
-	'room' => $room,
-	'formats' => array('hd','hq','lq','audio','slides'),
-));
diff --git a/template/formats.phtml b/template/formats.phtml
new file mode 100644
index 0000000..d03913d
--- /dev/null
+++ b/template/formats.phtml
@@ -0,0 +1,8 @@
+<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/rooms.phtml b/template/rooms.phtml
index e4e7227..e4d5f32 100644
--- a/template/rooms.phtml
+++ b/template/rooms.phtml
@@ -1,8 +1,8 @@
 <ul>
-	<? foreach($formats as $format): ?>
-		<li class="<?=h($format)?>">
-			<a href="<?=h(link_player($room, $format))?>"><?=h(ucfirst($format))?></a>
-			(<a href="<?=h(link_player($room, $format, true))?>">translated</a>)
+	<? foreach($rooms as $room => $display): ?>
+		<li class="<?=h($room)?>">
+			<a href="<?=h(link_room($room))?>"><?=h($display)?></a>
+			(<a href="<?=h(link_room($room, true))?>">translated</a>)
 		</li>
 	<? endforeach ?>
 </ul>
-- 
cgit v1.2.3