cleaned up the css some more and changed the sidebar mojo to pulldown

4 files changed, 19 insertions, 24 deletions

diff --git a/templates/basestyle.inc.php b/templates/basestyle.inc.php
index de41587b..ff8dc0f2 100644
--- a/templates/basestyle.inc.php
+++ b/templates/basestyle.inc.php
@@ -261,11 +261,11 @@
                 border-top:2px solid <?php echo conf('bg_color2'); ?>;
 	}
 	.text-action { 
-		list-style: none;
 		margin-top:5px;
 		margin-bottom:5px;
 	}
 	.text-action a { 
+		background: <?php echo conf('base_color2'); ?>;
 		border:1px solid <?php echo conf('bg_color2'); ?>;	
 		padding-left:2px;
 		padding-right:2px;
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index 993bc03b..bf5820e4 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -30,7 +30,9 @@ $total_flagged	= Flag::get_total();
 <div class="text-box"> 
 <span class="header2"><?php echo _('Last Ten Flagged Songs'); ?></span><br />
 <?php require (conf('prefix') . '/templates/show_flagged.inc.php'); ?>
-<li class="text-action"><a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a></li>
+<div class="text-action">
+<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a>
+</div>
 </div><br />
 <span class="header2"><?php echo _('Disabled Songs'); ?></span><br />
 <div class="text-box">	
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index b5b96455..9f74394c 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -25,6 +25,11 @@ $catalogs 	= Catalog::get_catalogs();
 ?>
 <span class="header1"><?php echo _('Catalogs'); ?></span>
 <div class="text-box"> 
+<div class="text-action">
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a>
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_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>
+</div>
 <!-- Current Catalogs -->
 <table border="0" cellpadding="0" cellspacing="0">
 <tr class="table-header">
@@ -60,32 +65,20 @@ $catalogs 	= Catalog::get_catalogs();
 </tr>
 <?php } // end if no catalogs ?>
 </table>
-<form id="catalog_tools" method="post" enctype="multipart/form-data" style="Display:inline;">
-<input class="button" type="button" value="<?php echo _('Clean All'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Verify All'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Add to All'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Update All'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=full_service');" />
+<div class="text-action">
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a>&nbsp;
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a>&nbsp;
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a>&nbsp;
+<a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a>&nbsp;
+</div>
 </div><br />
 <span class="header1"><?php echo _('Other Tools'); ?></span><br />
 <div class="text-box">
-<li class="text-action">
-	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a>
-</li>
-<li class="text-action">
-	<a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a><br />
-</li>
-<li class="text-action">
+<div class="text-action">
+	<a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a>
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show Disabled Songs'); ?></a>
-</li>
-<li class="text-action">
-	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo _('Clear Catalog Stats'); ?></a>
-</li>
-<li class="text-action">
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a>
-</li>
-<li class="text-action">
-	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a>
-</li>
+</div>
 </div><br />
 <span class="header1"><?php echo _('Manage Users'); ?></span>
 <div class="text-box">
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index fa9d7659..f403e97b 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -170,7 +170,7 @@ $web_path = conf('web_path');
 			<option value="Less Played"><?php echo _("Less Played"); ?></option>
 		</select>
 		<br /> 
-		<?php show_catalog_select('catalog','','width:9em;'); ?>
+		<?php show_catalog_pulldown('catalog','width:9em;'); ?>
 		<br />
 		<input type="hidden" name="aaction" value="Play!" />
 		<input class="smallbutton" type="submit" name="aaction" value="<?php echo _("Enqueue"); ?>" />