diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-06 15:32:42 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-06 15:32:42 +0000 |
| commit | a2c8bf9d481376f7fbfeecee4db174d1f7e6bd52 (patch) | |
| tree | d295e516562b14767ae1aebff27b878235fe5bef | |
| parent | 809bbe1f97b47852b6154e4487aaef23d79850e9 (diff) | |
| download | ampache-a2c8bf9d481376f7fbfeecee4db174d1f7e6bd52.tar.gz ampache-a2c8bf9d481376f7fbfeecee4db174d1f7e6bd52.tar.bz2 ampache-a2c8bf9d481376f7fbfeecee4db174d1f7e6bd52.zip | |
make a slight change to the song display, the title is now the direct link. The info page is now an icon, this is based on watching a few ampache newbies try to use it and get confused as to how play stuff
| -rw-r--r-- | lib/class/song.class.php | 3 | ||||
| -rw-r--r-- | templates/show_song_row.inc.php | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index aa3c2f86..86f4d43e 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -669,7 +669,8 @@ class Song extends database_object { $this->f_title = truncate_with_ellipsis($this->title,Config::get('ellipse_threshold_title')); // Create Links for the different objects - $this->f_link = "<a href=\"" . Config::get('web_path') . "/song.php?action=show_song&song_id=" . $this->id . "\" title=\"" . scrub_out($this->title) . "\"> " . scrub_out($this->f_title) . "</a>"; + $this->link = Config::get('web_path') . "/song.php?action=show_song&song_id=" . $this->id; + $this->f_link = "<a href=\"" . $this->link . "\" title=\"" . scrub_out($this->title) . "\"> " . scrub_out($this->f_title) . "</a>"; $this->f_album_link = "<a href=\"" . Config::get('web_path') . "/albums.php?action=show&album=" . $this->album . "\" title=\"" . scrub_out($this->f_album_full) . "\"> " . scrub_out($this->f_album) . "</a>"; $this->f_artist_link = "<a href=\"" . Config::get('web_path') . "/artists.php?action=show&artist=" . $this->artist . "\" title=\"" . scrub_out($this->f_artist_full) . "\"> " . scrub_out($this->f_artist) . "</a>"; diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 812019f1..8a790971 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -21,11 +21,8 @@ ?> <td class="cel_add"> <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?> - <?php if (Access::check_function('download')) { ?> - <a href="<?php echo $song->get_url(); ?>"><?php echo get_user_icon('link'); ?></a> - <?php } ?> </td> -<td class="cel_song"><?php echo $song->f_link; ?></td> +<td class="cel_song"><a href="<?php echo $song->get_url(); ?>"><?php echo $song->f_title; ?></a></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> <td class="cel_album"><?php echo $song->f_album_link; ?></td> <td class="cel_tags"><?php echo $song->f_tags; ?></td> @@ -35,6 +32,7 @@ <td class="cel_rating" id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></td> <?php } ?> <td class="cel_action"> + <a href="<?php echo $song->link; ?>"><?php echo get_user_icon('preferences',_('Song Informatin')); ?></a> <?php if (Config::get('shoutbox')) { ?> <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $song->id; ?>"> <?php echo get_user_icon('comment',_('Post Shout')); ?> |