* New Play/Random icons (last ones I swear)

* Fixed up missing actions/icons on genre browse
* Fixed batch logic to show access denied, rather then
  redirecting
* Fixed a minor css issue on classic that caused the
  album art to float around

4 files changed, 34 insertions, 24 deletions

diff --git a/templates/show_albums.inc b/templates/show_albums.inc
index fa2b63ec..5ebdebf0 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc
@@ -57,22 +57,21 @@ foreach ($albums as $album) {
 			<td><?php echo $album->songs; ?></td>
 			<td><?php echo $album->year; ?></td>
 			<td nowrap="nowrap"> 
-			<?php echo _('Play'); ?>:
 			<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo _('All'); ?>
-			</a> |  
+				<?php echo get_user_icon('all'); ?>
+			</a>
 			<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo _('Random'); ?>
-			</a> |
+				<?php echo get_user_icon('random'); ?>
+			</a>
 			<?php if (batch_ok()) { ?>
 				<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>">
-				<?php echo _('Download'); ?>
-				</a> |
+				<?php echo get_user_icon('download'); ?>
+				</a>
 			<?php } ?>
 			<?php if ($GLOBALS['user']->has_access('50')) { ?>
 				<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_album&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo _('Edit'); ?>
-				</a> | 
+				<?php echo get_user_icon('edit'); ?>
+				</a>
 			<?php } ?>
 			</td>
 	</tr>
diff --git a/templates/show_artists.inc b/templates/show_artists.inc
index a3632350..4e2cef72 100644
--- a/templates/show_artists.inc
+++ b/templates/show_artists.inc
@@ -51,11 +51,17 @@ foreach ($artists as $artist) { ?>
 		<td><?php echo $artist['name']; ?></td>
 		<td><?php echo $artist['songs']; ?></td>
 		<td><?php echo $artist['albums']; ?></td>	
-		<td nowrap="nowrap"> <?php echo _("Play"); ?> : 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('All'); ?></a> | 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('Random'); ?></a> 
+		<td nowrap="nowrap"> 
+			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist['id']; ?>">
+				<?php echo get_user_icon('all'); ?>	
+			</a> 
+			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist['id']; ?>">
+				<?php echo get_user_icon('random'); ?>
+			</a> 
 		<?php if ($GLOBALS['user']->has_access(100)) { ?>
-			| <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('Edit'); ?></a>
+			<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&amp;artist_id=<?php echo $artist['id']; ?>">
+				<?php echo get_user_icon('edit'); ?>
+			</a>
 		<?php } ?>
 		</td>
 	</tr>
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 176ad93b..0ffd7492 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -33,9 +33,9 @@ $total_items = $view->total_items;
 	</td>
 </tr>
 <tr class="table-header">
-	<td><?php echo _("Genre"); ?></td>
-	<td><?php echo _("Songs"); ?></td>
-	<td><?php echo _("Action"); ?></td>
+	<td><?php echo _('Genre'); ?></td>
+	<td><?php echo _('Songs'); ?></td>
+	<td><?php echo _('Action'); ?></td>
 </tr>
 <?php 
 foreach ($genres as $genre) { 
@@ -44,12 +44,17 @@ foreach ($genres as $genre) {
 		<td><?php echo $genre->link; ?></td>
 		<td><?php echo $genre->get_song_count(); ?></td>
 		<td>
-			<?php echo _("Play"); ?>:
-			<a href="<?php echo $genre->play_link; ?>">All</a> 
-			|
-			<a href="<?php echo $genre->random_link; ?>">Random</a>
-			|
-			Download
+			<a href="<?php echo $genre->play_link; ?>">
+				<?php echo get_user_icon('all'); ?>
+			</a> 
+			<a href="<?php echo $genre->random_link; ?>">
+				<?php echo get_user_icon('random'); ?>
+			</a>
+			<?php if (batch_ok()) { ?>
+			<a href="<?php echo $genre->download_link; ?>">
+				<?php echo get_user_icon('download'); ?>
+			</a>
+			<?php } ?>
 		</td>
 	</tr>
 <?php } // end foreach genres ?>
diff --git a/templates/show_now_playing.inc b/templates/show_now_playing.inc
index 5c0cc2b5..f56a8fee 100644
--- a/templates/show_now_playing.inc
+++ b/templates/show_now_playing.inc
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 if (count($results)) {
 ?>
 <?php show_box_top(_('Now Playing')); ?>
-<table>
+<table class="tabledata">
 <?php 
 foreach ($results as $item) {
 	$song = $item['song'];