diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-08-22 05:45:15 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-08-22 05:45:15 +0000 |
commit | 185630d92c74356946a2a0fe19748b41c9ba57de (patch) | |
tree | 9350caa11a10b59be8a5a720a4910242f5078a01 | |
parent | df348122a7092a24a4ae5c04cf0b5b85bd750ae0 (diff) | |
download | ampache-185630d92c74356946a2a0fe19748b41c9ba57de.tar.gz ampache-185630d92c74356946a2a0fe19748b41c9ba57de.tar.bz2 ampache-185630d92c74356946a2a0fe19748b41c9ba57de.zip |
bedtime, added random box back in does not do anything thou... well besides taunt you with its not doing anythingness
-rw-r--r-- | lib/ui.lib.php | 8 | ||||
-rw-r--r-- | random.php | 2 | ||||
-rw-r--r-- | templates/show_random.inc.php (renamed from templates/show_random_play.inc) | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/lib/ui.lib.php b/lib/ui.lib.php index ececefbb..13065075 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -882,9 +882,13 @@ function show_artist_select($name='artist', $artist_id=0) { * It's amazing we have three of these funtions now, this one shows a select of genres and take s name * and a selected genre... Woot! */ -function show_genre_select($name='genre',$genre_id=0) { +function show_genre_select($name='genre',$genre_id=0,$size='') { - echo "<select name=\"$name\">\n"; + if ($size > 0) { + $multiple_txt = " multiple=\"multiple\" size=\"$size\""; + } + + echo "<select name=\"$name\"$multiple_txt>\n"; $sql = "SELECT `id`, `name` FROM `genre` ORDER BY `name`"; $db_results = Dba::query($sql); @@ -27,7 +27,7 @@ show_header(); switch ($_REQUEST['action']) { default: case 'advanced': - + require_once Config::get('prefix') . '/templates/show_random.inc.php'; break; } // end switch diff --git a/templates/show_random_play.inc b/templates/show_random.inc.php index dffadd22..684ced98 100644 --- a/templates/show_random_play.inc +++ b/templates/show_random.inc.php @@ -21,7 +21,7 @@ ?> -<form id="random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php"> +<form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php"> <?php show_box_top(_('Play Random Selection')); ?> <table> <tr> @@ -42,7 +42,7 @@ </td> <td rowspan="4" valign="top"><?php echo _('From genre'); ?></td> <td rowspan="4"> - <?php show_genre_pulldown('genre','','5'); ?> + <?php show_genre_select('genre','','5'); ?> </td> </tr> <tr> @@ -60,7 +60,7 @@ <tr> <td nowrap="nowrap"><?php echo _('From catalog'); ?></td> <td> - <?php show_catalog_pulldown('catalog',''); ?> + <?php show_catalog_select('catalog',''); ?> </td> </tr> <tr> @@ -78,11 +78,6 @@ </tr> <tr> <td colspan="4"> - <input type="hidden" name="action" value="random" /> - <input class="button" type="button" value="<?php echo _('Play'); ?>" onclick="return SubmitToPage('random','<?php echo conf('web_path'); ?>/song.php?action=random&method=stream');" /> - <?php if (batch_ok()) { ?> - <input class="button" type="button" value="<?php echo _('Download'); ?>" onclick="return SubmitToPage('random','<?php echo conf('web_path'); ?>/song.php?action=random&method=download');" /> - <?php } ?> </td> </tr> </table> |