catalog clean up and admin index changes

4 files changed, 82 insertions, 47 deletions

diff --git a/templates/header.inc b/templates/header.inc
index 0e8185f0..20118ea4 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -61,5 +61,5 @@ if (conf('use_rss')) { ?>
 		<?php require_once(conf('prefix') . '/templates/sidebar.inc.php'); ?>
 	</div><!-- End sidebar -->
 	<div id="content">
-	<table>	<!-- Start Main Page Table-->
+	<table>	 <!-- Start Main Page Table -->
 <tr><td>
diff --git a/templates/show_admin_catalog.inc.php b/templates/show_admin_catalog.inc.php
new file mode 100644
index 00000000..43c11c56
--- /dev/null
+++ b/templates/show_admin_catalog.inc.php
@@ -0,0 +1,54 @@
+<?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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ 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.
+
+*/
+$web_path 	= conf('web_path');
+$catalogs 	= Catalog::get_catalogs();
+
+?>
+<div class="text-box"> 
+<span class="header2"><?php echo _('Catalogs'); ?></span>
+<!-- Current Catalogs -->
+<table border="0" cellpadding="0" cellspacing="0">
+<tr class="table-header">
+	<td><?php echo _('Name'); ?></td>
+	<td align="center"><?php echo _('Action'); ?></td>
+<?php foreach ($catalogs as $catalog) { ?>
+<tr class="<?php echo flip_class(); ?>">
+	<td>
+		<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog&amp;catalog_id=<?php echo $catalog->id; ?>">
+		<?php echo $catalog->name; ?></a>
+		&nbsp;&nbsp;(<?php echo $catalog->path; ?>)
+	</td>
+	<td>
+		<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>">
+		<?php echo _('Add'); ?></a>&nbsp;|&nbsp;
+		<a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>">
+		<?php echo _('Update'); ?></a>&nbsp;|&nbsp;
+		<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>">
+		<?php echo _('Clean'); ?></a>&nbsp;|&nbsp;
+		<a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&amp;catalogs[]=<?php echo $catalog->id; ?>">
+		<?php echo _('All'); ?></a>
+	</td>
+</tr>
+<?php } // end foreach ?>
+</table>
+<span class="header2"><?php echo _('Other Tools'); ?></span><br />
+</div>
diff --git a/templates/show_admin_index.inc b/templates/show_admin_index.inc
deleted file mode 100644
index 057aa9c1..00000000
--- a/templates/show_admin_index.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- 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.
-
-*/
-/*!
-	@header Show Admin Index
-	@discussion shows the admin index 
-*/
-$web_path = conf('web_path');
-$sections 	= array(_("User Management") => $web_path . "/admin/users.php",
-			_("E-mail Management") => $web_path . "/admin/mail.php",
-			_("Catalog Managment") => $web_path . "/admin/catalog.php",
-			_("Admin Preferences") => $web_path . "/admin/preferences.php",
-			_("Access Lists") => $web_path . "/admin/access.php");
-			
-$common		= array(_("Add a catalog") => $web_path . "/admin/catalog.php?action=show_add_catalog",
-			_("Add a new user") => $web_path . "/admin/users.php?action=show_add_user",
-			_("Clear Now Playing")   => $web_path . "/admin/catalog.php?action=clear_now_playing",
-			_("Add Access List Entry") => $web_path . "/admin/access.php?action=show_add_host");
-?>
-<table cellpadding="5" border="0" cellspacing="0">
-<tr>
-	<td valign="top"><?php show_tool_box(_("Common Functions"), $common); ?><?php show_clear(); ?></td>
-</tr>
-<tr>
-	<td valign="top"><?php show_tool_box(_("Admin Sections"), $sections); ?></td>
-</tr>
-</table>
-
diff --git a/templates/show_admin_user.inc.php b/templates/show_admin_user.inc.php
new file mode 100644
index 00000000..8269eb06
--- /dev/null
+++ b/templates/show_admin_user.inc.php
@@ -0,0 +1,27 @@
+<?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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ 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.
+
+*/
+$web_path = conf('web_path');
+
+?>
+<div class="text-box"> 
+<span class="header2"><?php echo _('Users'); ?></span><br />
+</div>