diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-26 08:28:09 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-26 08:28:09 +0000 |
| commit | 97bcd214044e30b5078052ee0c523b63966d6833 (patch) | |
| tree | 3710825f857adcb0d1926c9063bbc11adb678dc4 /templates | |
| parent | 13ae6a0371ae26023880a0ad69b3b1587db8dd76 (diff) | |
| download | ampache-97bcd214044e30b5078052ee0c523b63966d6833.tar.gz ampache-97bcd214044e30b5078052ee0c523b63966d6833.tar.bz2 ampache-97bcd214044e30b5078052ee0c523b63966d6833.zip | |
added direct links back in, added batch download to single artist view, removed useless cruft
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_artist.inc.php | 22 | ||||
| -rw-r--r-- | templates/show_song_row.inc.php | 5 |
2 files changed, 22 insertions, 5 deletions
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 37b9ad40..a2df6045 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -31,11 +31,25 @@ if (Config::get('ratings')) { <div id="information_actions"> <ul> -<li><a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('view'); ?></a> <?php echo _("Show All Songs By") . " " . $artist->f_name; ?></li> -<li><?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_' . $artist->id); ?><?php echo _('Add All songs By') . ' ' . $artist->f_name; ?></li> -<li><?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_' . $artist->id); ?><?php echo _('Add Random Songs By') . ' ' . $artist->f_name; ?></li> +<li> + <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('view'); ?></a> <?php echo _("Show All Songs By") . " " . $artist->f_name; ?> +</li> +<li> + <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_' . $artist->id); ?><?php echo _('Add All songs By') . ' ' . $artist->f_name; ?> +</li> +<li> + <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_' . $artist->id); ?><?php echo _('Add Random Songs By') . ' ' . $artist->f_name; ?> +</li> <?php if (Access::check('interface','50')) { ?> - <li><a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog'); ?></a> <?php echo _('Update from tags'); ?></li> +<li> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog'); ?></a> <?php echo _('Update from tags'); ?> +</li> +<?php } ?> +<?php if (Access::check_function('batch_download')) { ?> +<li> + <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo get_user_icon('batch_download'); ?></a> + <?php echo _('Download'); ?> +</li> <?php } ?> <li> <input type="checkbox" id="show_artist_artCB" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/> <?php echo _('Show Art'); ?> diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index dc463470..82b0cf4b 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -21,6 +21,9 @@ ?> <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_artist"><?php echo $song->f_artist_link; ?></td> @@ -37,7 +40,7 @@ <?php echo get_user_icon('comment',_('Post Shout')); ?> </a> <?php } ?> - <?php if (Config::get('download')) { ?> + <?php if (Access::check_function('download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> <?php echo get_user_icon('download',_('Download')); ?> </a> |