* Added new icons, and speed up icon display

* Fixed ORDER BY `track` on play selected
* Started work on editing/flagging albums and artists

4 files changed, 70 insertions, 12 deletions

diff --git a/templates/show_album.inc b/templates/show_album.inc
index d1251407..264756d0 100644
--- a/templates/show_album.inc
+++ b/templates/show_album.inc
@@ -53,16 +53,16 @@ $title		= scrub_out($album->name) . ' -- ' . $album->f_artist;
 		?>
 		<strong><?php echo _('Actions'); ?>:</strong><br />
 		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Play Album"); ; ?></a><br />
-		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo  $album->id; ; ?>"><?php echo  _("Play Random from Album"); ; ?></a><br />
+		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Play Random from Album"); ; ?></a><br />
 		<?php if ( ($GLOBALS['user']->has_access('75')) || (!conf('use_auth'))) { ?>
-		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=clear_art&amp;album_id=<?php echo  $album->id; ; ?>"><?php echo  _("Reset Album Art"); ; ?></a><br />
+		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=clear_art&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Reset Album Art"); ; ?></a><br />
 		<?php } ?>
-		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=find_art&amp;album_id=<?php echo  $album->id; ; ?>"><?php echo  _("Find Album Art"); ; ?></a><br />
+		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Find Album Art"); ; ?></a><br />
 		<?php  if (($GLOBALS['user']->has_access('100')) || (!conf('use_auth'))) { ?>
-		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&amp;album_id=<?php echo  $album->id; ; ?>"><?php echo  _("Update from tags"); ?></a><br />
+		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Update from tags"); ?></a><br />
 		<?php  } ?>
 		<?php if (batch_ok()) { ?>
-		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo  $album->id; ; ?>"><?php echo _('Download'); ?></a><br />
+		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>"><?php echo _('Download'); ?></a><br />
 		<?php } ?>
 	</div>
 <?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_albums.inc b/templates/show_albums.inc
index 17cf5496..5787af2f 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc
@@ -56,11 +56,22 @@ foreach ($albums as $album) {
 			<td><?php echo $album->f_artist; ?></td>
 			<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> | 
-			<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo $album->id; ?>"><?php echo _("Random"); ?></a> 
+			<td nowrap="nowrap"> 
+			<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $album->id; ?>">
+				<?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 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>
+				<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>">
+				<?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 get_user_icon('edit'); ?>
+				</a>
 			<?php } ?>
 			</td>
 	</tr>
diff --git a/templates/show_artist.inc b/templates/show_artist.inc
index b4b013dc..f4e426a5 100644
--- a/templates/show_artist.inc
+++ b/templates/show_artist.inc
@@ -35,7 +35,7 @@ $web_path = conf('web_path');
 	<th><?php echo _('Cover'); ?></th>
 	<th><a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;artist=<?php echo $artist->id  ?>&amp;keep_view=true&amp;sort_type=album.name&amp;sort_order=0"><?php echo _('Album Name'); ?></th>
 	<th><a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;artist=<?php echo $artist->id  ?>&amp;keep_view=true&amp;sort_type=album.year&amp;sort_order=0"><?php echo _('Album Year'); ?></th>
-	<th><?php echo _('Total Tracks'); ?></th>
+	<th><?php echo _('Tracks'); ?></th>
 	<th><?php echo _('Action'); ?></th>
 </tr>
 <?php
@@ -59,10 +59,22 @@ foreach ($albums as $album) {
 		<td><?php echo $album->year; ?></td>
 		<td><?php echo $count; ?></td>
 		<td>
-		<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $id; ?>"><?php echo _('Play'); ?></a>
+		<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $id; ?>">
+			<?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 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>
+			<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>">
+				<?php echo get_user_icon('download'); ?>
+			</a>
 		<?php } ?> 
+		<?php if ($GLOBALS['user']->has_access('100')) { ?>
+			<a href="<?php echo $web_path; ?>/admin/flag.php?action=album&amp;album_id=<?php echo $album->id; ?>">
+				<?php echo get_user_icon('edit'); ?>
+			</a>
+		<?php } ?>
 		</td>
 	</tr>
 <?php  } //end foreach ($albums as $album)?>
diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php
new file mode 100644
index 00000000..6b6c42fa
--- /dev/null
+++ b/templates/show_edit_album.inc.php
@@ -0,0 +1,35 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+
+<?php show_box_top(_('Edit Album')); ?>
+<form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_album">
+<table class="tabledata">
+<tr class="<?php echo flip_class(); ?>">
+	<td>&nbsp;</td>
+	<td>
+		<input type="hidden" name="album_id" value="<?php echo $album->id; ?>" />
+		<input type="submit" value="<?php echo _('Update Album'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
+<?php show_box_bottom(); ?>