diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_add_catalog.inc.php | 8 | ||||
| -rw-r--r-- | templates/show_edit_catalog.inc.php | 29 | ||||
| -rw-r--r-- | templates/show_install_lang.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_tv_adminctl.inc.php | 18 |
4 files changed, 36 insertions, 22 deletions
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 2bf02283..a58d3a37 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -79,15 +79,15 @@ $default_sort = "%a/%A"; <td><input type="checkbox" onclick="flipField('artextra1');flipField('artextra2');flipField('artextra3');" name="gather_art" value="1" /><br /> <table border="0" width="100%" cellpadding="0" cellspacing="0"> <tr class="even"> - <td><?php echo _("ID3V2 Tags"); ?>:</td> + <td><?php echo _('ID3V2 Tags'); ?>:</td> <td><input id="artextra1" disabled="disabled" type="checkbox" name="art_id3v2" value="1" /></td> </tr> <tr class="even"> - <td><?php echo _("Amazon"); ?>:</td> + <td><?php echo _('Amazon'); ?>:</td> <td><input id="artextra2" disabled="disabled" type="checkbox" name="art_amazon" value="1" /></td> </tr> <tr class="even"> - <td><?php echo _("File Folder"); ?>:</td> + <td><?php echo _('File Folder'); ?>:</td> <td><input id="artextra3" disabled="disabled" type="checkbox" name="art_folder" value="1" /></td> </tr> </table> @@ -95,7 +95,7 @@ $default_sort = "%a/%A"; </td> </tr> <tr> - <td valign="top"><?php echo _("Build Playlists from m3u Files"); ?>:</td> + <td valign="top"><?php echo _('Build Playlists from m3u Files'); ?>:</td> <td><input type="checkbox" name="parse_m3u" value="1" /></td> </tr> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index 7a31de6a..aaa3e950 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -5,9 +5,8 @@ All rights reserved. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,19 +26,21 @@ <td><?php echo _('Name'); ?>:</td> <td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td> <td style="vertical-align:top; font-family: monospace;" rowspan="5"> - <strong><?php echo _("Auto-inserted Fields"); ?>:</strong><br /> - %A = <?php echo _("album name"); ?><br /> - %a = <?php echo _("artist name"); ?><br /> - %C = <?php echo _("catalog path"); ?><br /> - %c = <?php echo _("id3 comment"); ?><br /> - %g = <?php echo _("genre"); ?><br /> - %T = <?php echo _("track number (padded with leading 0)"); ?><br /> - %t = <?php echo _("song title"); ?><br /> - %y = <?php echo _("year"); ?><br /> - %o = <?php echo _("other"); ?><br /> + <strong><?php echo _('Auto-inserted Fields'); ?>:</strong><br /> + %A = <?php echo _('album name'); ?><br /> + %a = <?php echo _('artist name'); ?><br /> + %c = <?php echo _('id3 comment'); ?><br /> + %g = <?php echo _('genre'); ?><br /> + %T = <?php echo _('track number (padded with leading 0)'); ?><br /> + %t = <?php echo _('song title'); ?><br /> + %y = <?php echo _('year'); ?><br /> + %o = <?php echo _('other'); ?><br /> </td> </tr> <tr> + <td><?php echo _('Catalog Type'); ?></td> + <td><?php echo scrub_out(ucfirst($catalog->catalog_type)); ?></td> +<tr> <td><?php echo _('XML-RPC Key'); ?>:</td> <td> <input size="30" type="text" name="key" value="<?php echo scrub_out($catalog->key); ?>" />*<span class="error">Required for Remote Catalogs</span> @@ -62,7 +63,7 @@ <tr> <td> </td> <td> - <input type="hidden" name="catalog_id" value="<?php echo $catalog->id; ?>" /> + <input type="hidden" name="catalog_id" value="<?php echo scrub_out($catalog->id); ?>" /> <input type="hidden" name="action" value="update_catalog_settings" /> <input type="submit" value="<?php echo _('Save Catalog Settings'); ?>" /> </td> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 253dee6e..330560a7 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -1,4 +1,5 @@ -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"> <head> <title>Ampache :: Pour l'Amour de la Musique - Install</title> </head> diff --git a/templates/show_tv_adminctl.inc.php b/templates/show_tv_adminctl.inc.php index 10dd004a..b71c82fc 100644 --- a/templates/show_tv_adminctl.inc.php +++ b/templates/show_tv_adminctl.inc.php @@ -5,9 +5,8 @@ All rights reserved. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -34,6 +33,19 @@ else { ?> <?php echo _('Democratic Play Active'); ?> +<form method="post" style="Display:inline;" action="<?php echo conf('web_path'); ?>/tv.php?action=send_playlist&tmp_playlist_id=<?php echo scrub_out($tmp_playlist->id); ?>" enctype="multipart/form-data"> +<select name="play_type"> + <?php + $controllers = get_localplay_controllers(); + foreach ($controllers as $controller) { + ?> + <option value="__<?php echo $controller; ?>"><?php echo ucfirst($controller); ?></option> + <?php } // end foreach ?> + <option value="stream"><?php echo _('Stream'); ?></option> + <option value="downsample"><?php echo _('Downsample'); ?></option> +</select> +<input type="submit" value="<?php echo _('Play'); ?>" /> +</form> <a href="<?php echo $tmp_playlist->get_vote_url(); ?>"><?php echo _('Play'); ?></a><br /> <?php echo _('Base Playlist'); ?>: <form method="post" style="Display:inline;" action="<?php echo conf('web_path'); ?>/tv.php?action=update_playlist&playlist_id=<?php echo $tmp_playlist->base_playlist; ?>" enctype="multipart/form-data"> |