Changeset 1614

Show
Ignore:
Timestamp:
07/04/08 07:37:16 (2 months ago)
Author:
vollmerk
Message:

some more cleanup of the menu

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/admin/catalog.php

    r1608 r1614  
    228228        break; 
    229229        case 'show_catalogs':  
    230                 $catalog_ids = Catalog::get_catalogs();  
    231                 Browse::set_type('catalog');  
    232                 Browse::set_static_content(1);  
    233                 Browse::save_objects($catalog_ids);  
    234                 Browse::show_objects($catalog_ids);  
     230                require_once Config::get('prefix') . '/templates/show_manage_catalogs.inc.php';  
    235231        break; 
    236232        case 'show_add_catalog': 
  • trunk/templates/show_catalogs.inc.php

    r1250 r1614  
    22/* 
    33 
    4  Copyright (c) 2001 - 2007 Ampache.org 
     4 Copyright (c) Ampache.org 
    55 All rights reserved. 
    66 
     
    4545</tr> 
    4646<?php } ?> 
    47 <tr class="<?php echo flip_class(); ?>"> 
    48         <td colspan="3"> 
    49         &nbsp; 
    50         </td> 
    51         <td class="cel_action" colspan="2"> 
    52                 <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a> 
    53                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a>  
    54                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> 
    55                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> 
    56                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a> 
    57         </td> 
    58 </tr> 
    5947<tr class="th-bottom"> 
    6048        <th class="cel_catalog"><?php echo _('Name'); ?></th> 
  • trunk/templates/show_manage_catalogs.inc.php

    r1250 r1614  
    22/* 
    33 
    4  Copyright (c) 2001 - 2007 Ampache.org 
     4 Copyright (c) Ampache.org 
    55 All rights reserved. 
    66 
     
    2020*/ 
    2121?> 
    22 <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> 
    23 <table class="tabledata" cellpadding="0" cellspacing="0"> 
    24 <colgroup> 
    25   <col id="col_catalog" /> 
    26   <col id="col_path" /> 
    27   <col id="col_lastverify" /> 
    28   <col id="col_lastadd" /> 
    29   <col id="col_action" /> 
    30 </colgroup> 
    31 <tr class="th-top"> 
    32         <th class="cel_catalog"><?php echo _('Name'); ?></th> 
    33         <th class="cel_path"><?php echo _('Path'); ?></th> 
    34         <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> 
    35         <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> 
    36         <th class="cel_action"><?php echo _('Actions'); ?></th> 
    37 </tr> 
     22<?php show_box_top(_('Show Catalogs')) ?> 
     23<div id="information_actions"> 
     24<ul> 
     25        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a></li> 
     26        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> </li> 
     27        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a></li> 
     28        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a></li> 
     29        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a></li> 
     30        <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li> 
     31</ul> 
     32</div> 
     33<?php show_box_bottom(); ?> 
    3834<?php  
    39         foreach ($object_ids as $catalog_id) {  
    40                 $catalog = new Catalog($catalog_id);  
    41                 $catalog->format();  
     35                $catalog_ids = Catalog::get_catalogs(); 
     36                Browse::set_type('catalog'); 
     37                Browse::set_static_content(1); 
     38                Browse::save_objects($catalog_ids); 
     39                Browse::show_objects($catalog_ids); 
    4240?> 
    43 <tr class="<?php echo flip_class(); ?>" id="catalog_<?php echo $catalog->id; ?>"> 
    44         <?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?> 
    45 </tr> 
    46 <?php } ?> 
    47 <tr class="<?php echo flip_class(); ?>"> 
    48         <td colspan="3"> 
    49         &nbsp; 
    50         </td> 
    51         <td class="cel_action" colspan="2"> 
    52                 <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a> 
    53                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a>  
    54                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> 
    55                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> 
    56                 | <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a> 
    57         </td> 
    58 </tr> 
    59 <tr class="th-bottom"> 
    60         <th class="cel_catalog"><?php echo _('Name'); ?></th> 
    61         <th class="cel_path"><?php echo _('Path'); ?></th> 
    62         <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> 
    63         <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> 
    64         <th class="cel_action"><?php echo _('Actions'); ?></th> 
    65 </tr> 
    66 </table> 
    67 <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> 
  • trunk/templates/sidebar_admin.inc.php

    r1527 r1614  
    4444    <ul class="sb3" id="sb_admin_ot"> 
    4545      <li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo _('Ampache Debug'); ?></a></li> 
    46       <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li> 
    47       <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li> 
    4846      <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> 
    49       <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li> 
    5047      <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export Catalog'); ?></a></li> 
    51       <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li> 
    5248      <?php if (Config::get('shoutbox')) { ?> 
    5349      <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php"><?php echo _('Manage Shoutbox'); ?></a></li>