aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2014-10-01 14:58:31 +0200
committerMaZderMind2014-10-01 14:58:31 +0200
commit1e9f8cd6bfb7e5850a05615044de2fe7771aba08 (patch)
tree485922bdb843ba8be43defc1d79408b949527be0
parentbf4c140f5438101d87dcb0395c7c778585b7fe09 (diff)
display naming
-rw-r--r--.htaccess4
-rw-r--r--formats.php (renamed from room.php)8
-rw-r--r--index.php9
-rw-r--r--template/formats.phtml8
-rw-r--r--template/rooms.phtml8
5 files changed, 29 insertions, 8 deletions
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/room.php b/formats.php
index 8f4db1f..1908680 100644
--- a/room.php
+++ b/formats.php
@@ -14,5 +14,11 @@ echo $tpl->render(array(
'subtitle' => ucfirst($room),
'room' => $room,
- 'formats' => array('hd','hq','lq','audio','slides'),
+ '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/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>