From d020ecc1b5aef94bc1457661b8073df46e39eb6b Mon Sep 17 00:00:00 2001 From: Benjamin Southall Date: Fri, 28 Apr 2017 01:14:58 +0900 Subject: [PATCH] Updates to radio theme / extension in order to support channel selection dropdown and the various other new radio features. Uses both twig variables and JavaScript in attempt to failback correctly when javascript isn't loaded. Adding support for the Options css theme selector from radio page. --- templates/themes/radio/info.php | 34 ++++++---- templates/themes/radio/radio.html | 107 +++++++++++++++++++++++------- 2 files changed, 105 insertions(+), 36 deletions(-) diff --git a/templates/themes/radio/info.php b/templates/themes/radio/info.php index 06dffd86..70be5c59 100644 --- a/templates/themes/radio/info.php +++ b/templates/themes/radio/info.php @@ -19,30 +19,40 @@ $theme = array( 'type' => 'text', 'default' => 'radio.html'), + array('title' => 'HTTP Prefix', + 'name' => 'httpprefix', + 'type' => 'text', + 'default' => ''), + array('title' => 'Radio Status URL', 'name' => 'radiostatus', 'type' => 'text', 'default' => '/radio_assets/status.xsl'), - array('title' => 'Radio MP3 Playlist', - 'name' => 'radiomp3playlist', + array('title' => 'Radio Prefix', + 'name' => 'radioprefix', 'type' => 'text', 'default' => ''), - array('title' => 'Radio OGG Playlist', - 'name' => 'radiooggplaylist', - 'type' => 'text', - 'default' => ''), - - array('title' => 'Radio MP3 Source', - 'name' => 'radiomp3source', + array('title' => 'Filelist Prefix', + 'name' => 'filelistprefix', 'type' => 'text', 'default' => ''), - array('title' => 'Radio OGG Source', - 'name' => 'radiooggsource', + array('title' => 'Channels', + 'name' => 'channels', 'type' => 'text', - 'default' => ''), + 'default' => 'everything cyberia swing'), + + array('title' => 'Default Channel', + 'name' => 'defaultchannel', + 'type' => 'text', + 'default' => 'everything'), + + array('title' => 'formats', + 'name' => 'formats', + 'type' => 'text', + 'default' => 'mp3 ogg'), ), 'build_function' => 'radio_build'); ?> diff --git a/templates/themes/radio/radio.html b/templates/themes/radio/radio.html index d753dc29..3ad55e29 100644 --- a/templates/themes/radio/radio.html +++ b/templates/themes/radio/radio.html @@ -1,29 +1,63 @@ -{% filter remove_whitespace %} {{ settings.title }} - - + + {% include 'header.html' %} + -
-

WELCOME TO CYBERIA

+

WELCOME TO CYBERIA

-

Welcome to lainchan's radio stream. +

Welcome to lainchan's radio stream.

- + +

Channel: +

+ +

File list is is here

+ -

Now playing: +

Now playing:

-

Current listeners: +

Current listeners:

-
+
+ -{% endfilter %}