fixed some +x stuff that shouldnt have been +x and moved the catalog functions back into the content area

3 files changed, 80 insertions, 20 deletions

diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
new file mode 100644
index 00000000..91310418
--- /dev/null
+++ b/templates/show_catalog_row.inc.php
@@ -0,0 +1,30 @@
+<?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.
+
+*/
+?>
+<td><?php echo $catalog->f_name_link; ?></td>
+<td><?php echo scrub_out($catalog->f_path); ?></td>
+<td><?php echo scrub_out($catalog->f_update); ?></td>
+<td><?php echo scrub_out($catalog->f_add); ?></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>
+	| <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>
+</td>
diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
new file mode 100644
index 00000000..2df65eda
--- /dev/null
+++ b/templates/show_catalogs.inc.php
@@ -0,0 +1,49 @@
+<?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.
+
+*/
+?>
+<table class="tabledata" cellspacing="0" cellpadding="0">
+<tr>
+	<td colspan="5">
+	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
+	</td>
+</tr>
+<tr class="table-header">
+	<th><?php echo _('Name'); ?></th>
+	<th><?php echo _('Path'); ?></th>
+	<th><?php echo _('Last Update'); ?></th>
+	<th><?php echo _('Last Add'); ?></th>
+	<th><?php echo _('Actions'); ?></th>
+</tr>
+<?php 
+	foreach ($object_ids as $catalog_id) { 
+		$catalog = new Catalog($catalog_id); 
+		$catalog->format(); 
+?>
+<tr class="<?php echo flip_class(); ?>" id="catalog_<?php echo $catalog->id; ?>">
+	<?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?>
+</tr>
+<?php } ?>
+<tr>
+	<td colspan="5">
+	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
+	</td>
+</tr>
+</table>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index e18260ad..4f952e0f 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -1,26 +1,7 @@
 <ul class="sb2" id="sb_admin">
   <li><h4><?php echo _('Catalogs'); ?></h4>
     <div class="sb3"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></div>
-  </li>
-  <li>
-    <ul class="sb3" id="sb_admin_catalogs">
-    <?php 
-    	$catalogs = Catalog::get_catalog_ids(); 
-    	foreach ($catalogs as $catalog_id) { 
-    		$catalog = new Catalog($catalog_id); 
-    ?>
-      <li class="sb_admin_catalogs_ctrls">
-        <strong><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog"><?php echo $catalog->name; ?></a></strong>
-        <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>">
-    		  <?php echo get_user_icon('delete',_('Delete Catalog')); ?>
-    	  </a>
-        <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>
-      </li>
-      <?php } // end foreach catalogs ?>
-    </ul>
+    <div class="sb3"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo _('Show Catalogs'); ?></a></div>
   </li>
 
   <li><h4><?php echo _('User Tools'); ?></h4>