diff options
| -rw-r--r-- | admin/catalog.php | 6 | ||||
| -rw-r--r-- | templates/show_catalogs.inc.php | 14 | ||||
| -rw-r--r-- | templates/show_manage_catalogs.inc.php | 40 | ||||
| -rw-r--r-- | templates/sidebar_admin.inc.php | 4 |
4 files changed, 42 insertions, 22 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index fb23f7cf..fd39b5e1 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -227,11 +227,7 @@ switch ($_REQUEST['action']) { show_confirmation($title,$body,$url); break; case 'show_catalogs': - $catalog_ids = Catalog::get_catalogs(); - Browse::set_type('catalog'); - Browse::set_static_content(1); - Browse::save_objects($catalog_ids); - Browse::show_objects($catalog_ids); + require_once Config::get('prefix') . '/templates/show_manage_catalogs.inc.php'; break; case 'show_add_catalog': require Config::get('prefix') . '/templates/show_add_catalog.inc.php'; diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index 9174838c..44b233be 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -44,18 +44,6 @@ <?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?> </tr> <?php } ?> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="3"> - - </td> - <td class="cel_action" colspan="2"> - <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a> - | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> - | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> - | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> - | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a> - </td> -</tr> <tr class="th-bottom"> <th class="cel_catalog"><?php echo _('Name'); ?></th> <th class="cel_path"><?php echo _('Path'); ?></th> diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php new file mode 100644 index 00000000..1fcf7194 --- /dev/null +++ b/templates/show_manage_catalogs.inc.php @@ -0,0 +1,40 @@ +<?php +/* + + Copyright (c) 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. + +*/ +?> +<?php show_box_top(_('Show Catalogs')) ?> +<div id="information_actions"> +<ul> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> </li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li> +</ul> +</div> +<?php show_box_bottom(); ?> +<?php + $catalog_ids = Catalog::get_catalogs(); + Browse::set_type('catalog'); + Browse::set_static_content(1); + Browse::save_objects($catalog_ids); + Browse::show_objects($catalog_ids); +?> diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index e6d27f43..ae57583d 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -43,12 +43,8 @@ <li><h4><?php echo _('Other Tools'); ?></h4> <ul class="sb3" id="sb_admin_ot"> <li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo _('Ampache Debug'); ?></a></li> - <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li> - <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li> <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li> - <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li> <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export Catalog'); ?></a></li> - <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li> <?php if (Config::get('shoutbox')) { ?> <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php"><?php echo _('Manage Shoutbox'); ?></a></li> <?php } ?> |