fixed admin prefs, flushed out localplay stuff, tweaked filters on browse

4 files changed, 24 insertions, 16 deletions

diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
index 7a0a48cd..b8b6173e 100644
--- a/templates/show_catalogs.inc.php
+++ b/templates/show_catalogs.inc.php
@@ -51,5 +51,17 @@
 	<th><?php echo _('Last Add'); ?></th>
 	<th><?php echo _('Actions'); ?></th>
 </tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="3">
+	&nbsp;
+	</td>
+	<td align="right" colspan="2">
+		<a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a>
+		| <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> 
+		| <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a>
+		| <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a>
+		| <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a>
+	</td>
+</tr>
 </table>
 <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php
index 7932f419..216f1523 100644
--- a/templates/show_localplay_playlist.inc.php
+++ b/templates/show_localplay_playlist.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -18,37 +18,34 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
-$songs = $localplay->get();
-$status = $localplay->status();
 ?>
-<table cellspacing="0">
+<?php show_box_top(_('Current Playlist')); ?>
+<table class="table-data" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Track'); ?></th>
 	<th><?php echo _('Name'); ?></th>
 	<th><?php echo _('Action'); ?></th>
 </tr>
 <?php 
-foreach ($songs as $song) { 
+foreach ($objects as $object) { 
 	$class = '';
-	if ($status['track'] == $song['track']) { $class=' class="lp_current"'; } 	
+	if ($status['track'] == $object['track']) { $class=' class="lp_current"'; } 	
 ?>
-<tr class="<?php echo flip_class(); ?>">
+<tr class="<?php echo flip_class(); ?>" id="localplay_playlist_<?php echo $object['id']; ?>">
 	<td>
-		<?php echo scrub_out($song['track']); ?>
+		<?php echo scrub_out($object['track']); ?>
 	</td>
 	<td<?php echo $class; ?>>
-		<?php echo $localplay->format_name($song['name'],$song['id']); ?>
+		<?php echo $localplay->format_name($object['name'],$object['id']); ?>
 	</td>
 	<td>
-	<a href="<?php echo $web_path; ?>/localplay.php?action=delete_song&amp;song_id=<?php echo scrub_out($song['id']); ?>">
-		<?php echo get_user_icon('delete'); ?>
-	</a>
+	<?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete',_('Delete'),'localplay_delete_' . intval($object['id'])); ?>
 	</td>
 </tr>
-<?php } if (!count($songs)) { ?>
+<?php } if (!count($objects)) { ?>
 <tr class="<?php echo flip_class(); ?>">
 	<td colspan="3"><span class="error"><?php echo _('No Records Found'); ?></span></td>
 </tr>
 <?php } ?>
 </table>
+<?php show_box_bottom(); ?>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index dc04b797..c34de6bd 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -22,7 +22,6 @@
     <ul class="sb3" id="sb_admin_ot">
       <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>
       <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li>
-      <li id="sb_admin_ot_GatherArt"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></li>
     </ul>
   </li>
 
diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php
index 3bede2cc..073dad9e 100644
--- a/templates/sidebar_localplay.inc.php
+++ b/templates/sidebar_localplay.inc.php
@@ -11,7 +11,7 @@
     <ul class="sb3" id="sb_localplay_info">
 	<li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo _('Add Instance'); ?></a></li>
 	<li id="sb_localplay_info_show_instances"><a href="<?php echo $web_path; ?>/localplay.php?action=show_instances"><?php echo _('Show instances'); ?></a></li>
-	<li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_songs"><?php echo _('Show Playlist'); ?></a></li>
+	<li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo _('Show Playlist'); ?></a></li>
     </ul>
   </li>
 <?php } ?>