tweaked the sidebars, think they look a lot better now

4 files changed, 50 insertions, 17 deletions

diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
new file mode 100644
index 00000000..08d436ef
--- /dev/null
+++ b/templates/show_verify_catalog.inc.php
@@ -0,0 +1,25 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2007 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.
+
+*/
+
+// Get the count of the number of items in their playlist
+?>
+<?php echo _('Verifed'); ?>:<?php echo $catalog_verify_found; ?><br />
+<?php echo _('Reading'); ?>:<?php echo $catalog_verify_directory; ?><br />
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 59ca5b2a..a7e91364 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -1,10 +1,23 @@
 <h4><?php echo _('Catalogs'); ?></h4>
-<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a>
+<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></span>
+<hr />
+<?php 
+	$catalogs = Catalog::get_catalogs(); 
+	foreach ($catalogs as $catalog_id) { 
+		$catalog = new Catalog($catalog_id); 
+?>
+<strong><a href="<?php echo $web_path; ?>/admin/catalog?action=show_customize_catalog">
+	<?php echo $catalog->name; ?>
+</a></strong><br />
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a>
+| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
+| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
+<?php } ?>
 <hr />
 <h4><?php echo _('Other Tools'); ?></h4>
-<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a>
-<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a>
-<a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a>
+<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></span>
+<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></span>
+<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></span>
 <hr />
 
 
diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php
index dc669c3f..2eb69995 100644
--- a/templates/sidebar_browse.inc.php
+++ b/templates/sidebar_browse.inc.php
@@ -5,15 +5,10 @@
 	$text = scrub_in($_REQUEST['action']) . '_ac';
 	${$text} = ' selected="selected"'; 
 ?>
-<form id="browse_type" name="browse_type" action="<?php echo Config::get('web_path'); ?>/browse.php" method="get">
-<select name="action" onchange="document.getElementById('browse_type').submit();" >
-	<option value="">-- <?php echo _('Type'); ?> --</option>
-	<option value="song"<?php echo $song_ac; ?>><?php echo _('Song Title'); ?></option>
-	<option value="album"<?php echo $album_ac; ?>><?php echo _('Albums'); ?></option>
-	<option value="artist"<?php echo $artist_ac; ?>><?php echo _('Artist'); ?></option>
-	<option value="genre"<?php echo $genre_ac; ?>><?php echo _('Genre'); ?></option>
-</select>
-</form>
+<span><a href="<?php $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></span>
+<span><a href="<?php $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></span>
+<span><a href="<?php $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></span>
+<span><a href="<?php $web_path; ?>/browse.php?action=genre"><?php echo _('Genre'); ?></a></span>
 <hr />
 <h4><?php echo _('Filters'); ?></h4>
 <?php show_alphabet_list($_REQUEST['alpha_match'],$_REQUEST['action']); ?>
diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php
index c1e6471e..14bb5c67 100644
--- a/templates/sidebar_preferences.inc.php
+++ b/templates/sidebar_preferences.inc.php
@@ -1,7 +1,7 @@
 <h4><?php echo _('Sections'); ?></h4>
 <hr />
-<a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a>
-<a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a>
-<a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a>
-<a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a>
+<span><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></span>
+<span><a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a></span>
+<span><a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a></span>
+<span><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></span>
 <hr />