From 7da876b75ee3307e400eab65e6206c8dca7cf56a Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 9 Nov 2014 22:53:16 +0100 Subject: minirooms (aka sendezentrum) --- .htaccess | 17 ++++++-- room.php | 4 ++ template/assemblies/switcher/miniroom-audio.phtml | 12 ++++++ template/assemblies/switcher/miniroom-video.phtml | 40 +++++++++++++++++ template/room.phtml | 52 ++++++++++++++--------- 5 files changed, 102 insertions(+), 23 deletions(-) create mode 100644 template/assemblies/switcher/miniroom-audio.phtml create mode 100644 template/assemblies/switcher/miniroom-video.phtml diff --git a/.htaccess b/.htaccess index 75851ea..2165afc 100644 --- a/.htaccess +++ b/.htaccess @@ -9,10 +9,10 @@ RewriteCond %{REQUEST_FILENAME} !-l DirectoryIndex index.php # /room/ -> room.php - native av-player in hq (with format switcher included) -RewriteRule ^(saal1|saal2|saalg|saal6)/?$ room.php?room=$1&format=hq&language=native& [L] +RewriteRule ^(saal1|saal2|saalg|saal6)/?$ room.php?room=$1&format=hq&language=native [L] -# /room/ -> room.php - translated av-player in hq (with format switcher included) -RewriteRule ^(saal1|saal2|saalg|saal6)/translated/?$ room.php?room=$1&format=hq&language=translated& [L] +# /room/translated -> room.php - translated av-player in hq (with format switcher included) +RewriteRule ^(saal1|saal2|saalg|saal6)/translated/?$ room.php?room=$1&format=hq&language=translated [L] # /room/format/ -> room.php - native av-player in $format (with format switcher included) RewriteRule ^(saal1|saal2|saalg|saal6)/(hd|lq|audio|slides)/?$ room.php?room=$1&format=$2&language=native [L] @@ -20,8 +20,17 @@ RewriteRule ^(saal1|saal2|saalg|saal6)/(hd|lq|audio|slides)/?$ room.php?room=$1& # /room/format/translated -> room.php - translated av-player in $format (with format switcher included) RewriteRule ^(saal1|saal2|saalg|saal6)/(hd|lq|audio|slides)/translated/?$ room.php?room=$1&format=$2&language=translated [L] + +# /miniroom/ -> room.php - native av-player in hq +RewriteRule ^(sendezentrum)/?$ room.php?room=$1&format=hq&language=native [L] + +# /miniroom/format/ -> room.php - native av-player in $format (no hd, no slides) +RewriteRule ^(sendezentrum)/(lq|audio)/?$ room.php?room=$1&format=$2&language=native [L] + + # /party/ -> player.php - simple audio-player for party -RewriteRule ^(lounge|ambient|sendezentrum)/?$ party.php?room=$1&format=audio [L] +RewriteRule ^(lounge|ambient)/?$ party.php?room=$1&format=audio [L] + # Show a known page in case of as miss ErrorDocument 404 404.php diff --git a/room.php b/room.php index 43bddcc..9d98f04 100644 --- a/room.php +++ b/room.php @@ -53,4 +53,8 @@ echo $tpl->render(array( 'language' => $language, 'translated' => ($language == 'translated'), 'format' => $format, + + // miniroom = no hd, no translation, no slides, no irc, no program + // -> sendezentrum, workshops + 'miniroom' => in_array($room, array('sendezentrum')=, )); diff --git a/template/assemblies/switcher/miniroom-audio.phtml b/template/assemblies/switcher/miniroom-audio.phtml new file mode 100644 index 0000000..f96fb71 --- /dev/null +++ b/template/assemblies/switcher/miniroom-audio.phtml @@ -0,0 +1,12 @@ +

Directlinks

+ diff --git a/template/assemblies/switcher/miniroom-video.phtml b/template/assemblies/switcher/miniroom-video.phtml new file mode 100644 index 0000000..619d50b --- /dev/null +++ b/template/assemblies/switcher/miniroom-video.phtml @@ -0,0 +1,40 @@ +

Formats

+ + +
+ + +

Directlinks ()

+ + + +

Directlinks (WebM)

+ diff --git a/template/room.phtml b/template/room.phtml index 6c26730..78d470d 100644 --- a/template/room.phtml +++ b/template/room.phtml @@ -2,7 +2,13 @@