summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2012-09-20 11:59:55 -0400
committerPaul Arthur <paul.arthur@flowerysong.com>2012-09-20 11:59:55 -0400
commit8a06c9a80cdd679ca86f01112b7379328ee50b6f (patch)
treed81f6bbcc57b8d08371d52cf7d8007c69dbf30ca /templates
parent7ff92215def3ad11b90f517461fa7db440a1218f (diff)
downloadampache-8a06c9a80cdd679ca86f01112b7379328ee50b6f.tar.gz
ampache-8a06c9a80cdd679ca86f01112b7379328ee50b6f.tar.bz2
ampache-8a06c9a80cdd679ca86f01112b7379328ee50b6f.zip
Clean up template show_now_playing_row
Song title was linked to yet another inconsistent action and links were being built from scratch instead of using the perfectly good preformatted ones.
Diffstat (limited to 'templates')
-rw-r--r--templates/show_now_playing_row.inc.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 031af1c7..16ec3548 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -27,9 +27,6 @@
*/
/* Prepare the variables */
-$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" id="np_group_1">
<div class="np_cell cel_username">
@@ -59,23 +56,17 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
<div class="np_group" id="np_group_2">
<div class="np_cell cel_song">
<label><?php echo T_('Song'); ?></label>
- <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $media->id; ?>">
- <?php echo $title; ?>
- </a>
+ <?php echo $media->f_link; ?>
</div>
<div class="np_cell cel_album">
<label><?php echo T_('Album'); ?></label>
- <a title="<?php echo scrub_out($media->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $media->album; ?>">
- <?php echo $album; ?>
- </a>
+ <?php echo $media->f_album_link; ?>
</div>
<div class="np_cell cel_artist">
<label><?php echo T_('Artist'); ?></label>
- <a title="<?php echo scrub_out($media->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $media->artist; ?>">
- <?php echo $artist; ?>
- </a>
+ <?php echo $media->f_artist_link; ?>
</div>
</div>