diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-15 16:16:04 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-15 16:16:04 +0000 |
| commit | fdb7c58cb160c5f8f0f0327c11cba93226e062f6 (patch) | |
| tree | 6cf57a740799a3a9b9dc9a035ccb66e1e54b053f /templates/show_now_playing_row.inc.php | |
| parent | 86ff429b366080b9203e5ddb1740339c64013853 (diff) | |
| download | ampache-fdb7c58cb160c5f8f0f0327c11cba93226e062f6.tar.gz ampache-fdb7c58cb160c5f8f0f0327c11cba93226e062f6.tar.bz2 ampache-fdb7c58cb160c5f8f0f0327c11cba93226e062f6.zip | |
fix typo causing height to not display on art retrival, update to db allowing gc of tmp_browse, add extension to api album art image urls
Diffstat (limited to 'templates/show_now_playing_row.inc.php')
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index a9e98e9e..1bdc164f 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Prepare the variables */ -$title = scrub_out(truncate_with_ellipsis($song->title)); -$album = scrub_out(truncate_with_ellipsis($song->f_album_full)); -$artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); +$title = scrub_out(truncate_with_ellipsis($media->title)); +$album = scrub_out(truncate_with_ellipsis($media->f_album_full)); +$artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); ?> <div class="np_group"> <div class="np_cell cel_username"> @@ -34,8 +34,8 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); <div class="np_cell cel_rating"> <label><?php echo _('Rating'); ?></label> - <div id="rating_<?php echo $song->id; ?>_song"> - <?php Rating::show($song->id,'song'); ?> + <div id="rating_<?php echo $media->id; ?>_song"> + <?php Rating::show($media->id,'song'); ?> </div> </div> </div> @@ -43,21 +43,21 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); <div class="np_group"> <div class="np_cell cel_song"> <label><?php echo _('Song'); ?></label> - <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> + <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> <?php echo $title; ?> </a> </div> <div class="np_cell cel_album"> <label><?php echo _('Album'); ?></label> - <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> + <a title="<?php echo scrub_out($media->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> <?php echo $album; ?> </a> </div> <div class="np_cell cel_artist"> <label><?php echo _('Artist'); ?></label> - <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> + <a title="<?php echo scrub_out($media->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> <?php echo $artist; ?> </a> </div> @@ -66,8 +66,8 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); <?php if (Config::get('show_album_art')) { ?> <div class="np_group"> <div class="np_cell cel_albumart"> - <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> - <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" /> + <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> + <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" /> </a> </div> </div> |