diff options
| author | spocky <spocky@ampache> | 2007-01-11 22:02:45 +0000 |
|---|---|---|
| committer | spocky <spocky@ampache> | 2007-01-11 22:02:45 +0000 |
| commit | 65929b1bcc5e8692dd6e716d3066fbd92d754a26 (patch) | |
| tree | 6c9e422ad59d5eee321d492ecf1ce372ea1da115 | |
| parent | dced24f2c5475199fd7f23de726ae2f1423e3956 (diff) | |
| download | ampache-65929b1bcc5e8692dd6e716d3066fbd92d754a26.tar.gz ampache-65929b1bcc5e8692dd6e716d3066fbd92d754a26.tar.bz2 ampache-65929b1bcc5e8692dd6e716d3066fbd92d754a26.zip | |
- Added artist name on "Albums of the Moment" tooltip
- Don't display "Album of the Moment" without art
- Minor html/text adjustments
| -rw-r--r-- | lib/album.lib.php | 2 | ||||
| -rw-r--r-- | templates/show_random_albums.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_random_play.inc | 4 | ||||
| -rw-r--r-- | templates/show_search.inc | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/album.lib.php b/lib/album.lib.php index 134e040e..29c9e90a 100644 --- a/lib/album.lib.php +++ b/lib/album.lib.php @@ -70,7 +70,7 @@ function get_random_albums($count='') { $count = sql_escape($count); - $sql = "SELECT id FROM album ORDER BY RAND() LIMIT $count"; + $sql = "SELECT id FROM album WHERE art IS NOT NULL ORDER BY RAND() LIMIT $count"; $db_results = mysql_query($sql,dbh()); $results = array(); diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index bc41edef..b2f3348d 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -27,7 +27,7 @@ $web_path = conf('web_path'); foreach ($albums as $album_id) { $album = new Album($album_id); $album->format(); - $name = scrub_out($album->name); + $name = scrub_out('[' . $album->artist . '] ' . $album->name); ?> <td> <a href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $album_id; ?>"> diff --git a/templates/show_random_play.inc b/templates/show_random_play.inc index 7216f41b..dffadd22 100644 --- a/templates/show_random_play.inc +++ b/templates/show_random_play.inc @@ -46,8 +46,8 @@ </td> </tr> <tr> - <td colspan="2"> - <?php echo _('Type'); ?>: + <td><?php echo _('Type'); ?></td> + <td> <select name="random_type"> <option value="normal"><?php echo _('Standard'); ?></option> <option value="unplayed"><?php echo _('Less Played'); ?></option> diff --git a/templates/show_search.inc b/templates/show_search.inc index 4a3a7dee..f0cf9a17 100644 --- a/templates/show_search.inc +++ b/templates/show_search.inc @@ -89,7 +89,7 @@ </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Rating'); ?>:</td> + <td><?php echo _('Rating'); ?></td> <td> <select id="s_rating" name="s_rating"> <option value=""> </option> @@ -100,7 +100,7 @@ <option value="5"><?php echo _('Five Stars'); ?></option> </select> </td> - <td><?php echo _('Operator'); ?>:</td> + <td><?php echo _('Operator'); ?></td> <td> <select name="operator"> <option value="and" <?php if($_REQUEST['operator']=="and") echo "selected=\"selected\""?>><?php echo _('AND'); ?></option> @@ -109,14 +109,14 @@ </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Method'); ?>:</td> + <td><?php echo _('Method'); ?></td> <td> <select name="method"> <option value="fuzzy" <?php if($_REQUEST['method']=="fuzzy") echo "selected=\"selected\""?>><?php echo _('Fuzzy'); ?></option> <option value="exact" <?php if($_REQUEST['method']=="exact") echo "selected=\"selected\""?>><?php echo _('Exact'); ?></option> </select> </td> - <td><?php echo _('Maximum Results'); ?>:</td> + <td><?php echo _('Maximum Results'); ?></td> <td> <select name="limit"> <option value="0"><?php echo _('Unlimited'); ?></option> |