tweaked the style removing some unneeded mojo and javascripted the catalog build

8 files changed, 23 insertions, 10 deletions

diff --git a/admin/catalog.php b/admin/catalog.php
index c6d7f322..193c232b 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -104,12 +104,21 @@ switch ($_REQUEST['action']) {
 		/* Make sure they aren't in demo mode */
 		if (conf('demo_mode')) { break; } 
 
+		if (!$_REQUEST['catalogs']) { 
+			$_REQUEST['catalogs'] = array();
+			$catalogs = Catalog::get_catalogs();
+		}
+
 		/* This runs the clean/verify/add in that order */
 		foreach ($_REQUEST['catalogs'] as $catalog_id) { 
 			$catalog = new Catalog($catalog_id);
+			$catalogs[] = $catalog;
+		}
+
+		foreach ($catalogs as $catalog) { 
 			$catalog->clean_catalog();
 			$catalog->count = 0;
-			$catalog->update_catalog();
+			$catalog->verify_catalog();
 			$catalog->count = 0;
 			$catalog->add_to_catalog();
 		} 		
diff --git a/templates/footer.inc b/templates/footer.inc
index 4f6db43c..91332b3f 100644
--- a/templates/footer.inc
+++ b/templates/footer.inc
@@ -20,7 +20,6 @@
 
 */
 ?>
-</td></tr></table><!-- End Main Page Table-->
 </div> <!-- end id="content"-->
 </div> <!-- end id="maincontainer"-->
 </body>
diff --git a/templates/header.inc b/templates/header.inc
index 20118ea4..f1a2b8ed 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -61,5 +61,3 @@ if (conf('use_rss')) { ?>
 		<?php require_once(conf('prefix') . '/templates/sidebar.inc.php'); ?>
 	</div><!-- End sidebar -->
 	<div id="content">
-	<table>	 <!-- Start Main Page Table -->
-<tr><td>
diff --git a/templates/menustyle.inc b/templates/menustyle.inc
index 30400615..c922ce6e 100644
--- a/templates/menustyle.inc
+++ b/templates/menustyle.inc
@@ -70,12 +70,13 @@
  */
 	#content {
 /*                float: left;    /*                      use for horizontal menu; comment out otherwise */
-                margin-left:0px;
+           padding-left:155px;
+           padding-right:5px;
 	}
     #sidebar {
         clear: both;
         height: 100%;
-        margin: 0;
+        margin-right: 5px;
         float: left;
         padding: 0;
         list-style: none;
diff --git a/templates/show_admin_catalog.inc.php b/templates/show_admin_catalog.inc.php
index 43c11c56..6b40a8eb 100644
--- a/templates/show_admin_catalog.inc.php
+++ b/templates/show_admin_catalog.inc.php
@@ -50,5 +50,13 @@ $catalogs 	= Catalog::get_catalogs();
 </tr>
 <?php } // end foreach ?>
 </table>
+<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/catalog.php?action=full_service">
+<input class="button" type="submit" value="<?php echo _('Update Everything'); ?>" />
+</form>
 <span class="header2"><?php echo _('Other Tools'); ?></span><br />
+<ul style="list-style:none;">
+	<li><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></li>
+	<li><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a></li>
+	<li><a href="<?php echo $web_path; ?>/admin/catalog.php?show_disabled"><?php echo _('Show Disabled Songs'); ?></a></li>
+</ul>
 </div>
diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc
index e0c82225..552b91bd 100644
--- a/templates/show_preferences.inc
+++ b/templates/show_preferences.inc
@@ -79,7 +79,7 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth
 <?php } ?>
 </ul>
 </div>
-<div class="text-box">
+<div class="text-box" style="padding-left:135px;">
 <form method="post" name="preferences" action="<?php echo conf('web_path'); ?><?php echo $target; ?>" enctype="multipart/form-data">
 <?php 
 if ($current_tab != 'account') { 
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 0564ca04..2d245212 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -40,7 +40,6 @@ $browse_items[] = array('title'=>_("Lists"),'url'=>'browse.php','active'=>$locat
 
 $web_path = conf('web_path');
 ?>
-<!-- <div id="navcontainer">  --> <!--sigger: appears this div is not neccesary and duplicates #sidebar -->
 <ul id="navlist">
 	<li<?php
                 if ($location['page'] == "index.php"){
@@ -182,5 +181,3 @@ $web_path = conf('web_path');
 	<li><a href="<?php echo $web_path; ?>/logout.php"><?php echo _("Logout"); ?></a></li>
 <?php } // end (conf('use_auth'))?>
 </ul>
-	
-<!-- </div> -->
diff --git a/templates/style.inc b/templates/style.inc
index 2c29d1b9..bc55d541 100644
--- a/templates/style.inc
+++ b/templates/style.inc
@@ -65,6 +65,7 @@
 		{
 		padding-left:5px;
 		padding-top:5px;
+		padding-right:5px;
 		margin-bottom:10px;
 		background-color: <?php echo conf('base_color1'); ?>;
 		border-right:2px solid <?php echo conf('bg_color2'); ?>;