diff options
| author | spocky <spocky@ampache> | 2007-10-24 21:15:58 +0000 |
|---|---|---|
| committer | spocky <spocky@ampache> | 2007-10-24 21:15:58 +0000 |
| commit | e855988af2850d8d8105b56bc0ce9eae8b7d9dc0 (patch) | |
| tree | 9e05a256144165aca01e6bfe9a02bd2d81dbdfb4 /templates | |
| parent | 06a5efcc717cd28ea69bd75f11063c51ee455b82 (diff) | |
| download | ampache-e855988af2850d8d8105b56bc0ce9eae8b7d9dc0.tar.gz ampache-e855988af2850d8d8105b56bc0ce9eae8b7d9dc0.tar.bz2 ampache-e855988af2850d8d8105b56bc0ce9eae8b7d9dc0.zip | |
renamed a few files (missing php extension)
updated most of the tables so that every column is independently customizable by css rules
Diffstat (limited to 'templates')
41 files changed, 639 insertions, 470 deletions
diff --git a/templates/header.inc.php b/templates/header.inc.php index ef3672f1..c6400ada 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -58,19 +58,19 @@ if (Config::get('use_rss')) { ?> echo " class=\"vertical_menu\" "; }?>> - <div id="topbar"><!-- This is the topbar row --> - <div id="topbarleft"> - <a href="http://www.ampache.org"> - <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="Ampache: For the love of music" alt="Ampache: For the love of music" /> - </a> - </div><!--End topbarleft --> - <div id="topbarright"> - <?php show_box_top('','box box_topbarright'); ?> + <div id="header"><!-- This is the header --> + <h1 id="headerlogo"> + <a href="http://www.ampache.org"> + <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="Ampache: For the love of music" alt="Ampache: For the love of music" /> + </a> + </h1> + <div id="headerbox"> + <?php show_box_top('','box box_headerbox'); ?> <span id="loginInfo"><?php echo _('You are currently logged in as') . " " . $GLOBALS['user']->fullname; ?></span> <?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?> <?php show_box_bottom(); ?> - </div> <!-- End topbarright --> - </div><!-- End topbar --> + </div> <!-- End headerbox --> + </div><!-- End header --> <div id="sidebar"><!-- This is the sidebar --> <?php require_once Config::get('prefix') . '/templates/sidebar.inc.php'; ?> </div><!-- End sidebar --> diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 1374b81a..0c3c1fee 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -35,7 +35,7 @@ to add any server's IP address that you want to access your Ampache catalog or b stream from this server.</p> <p> -<a class="smallbutton" href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a> </p> <?php if (count($list)) { ?> <table cellspacing="1" cellpadding="3" class="tabledata"> diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index ddf2a77b..b011740d 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -33,7 +33,7 @@ $songs = Catalog::get_disabled(10); <?php show_box_top(_('Disabled Songs')); ?> <!-- Show Last 10 Disabled Songs --> - <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc'; ?> + <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> <div class="text-action"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a> </div> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 02237e59..b1e3e9e4 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -25,18 +25,22 @@ $catalogs = Catalog::get_catalogs(); ?> <?php show_box_top(_('Catalogs')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> -<tr class="table-header"> - <th><?php echo _('Name'); ?></th> - <th align="center"><?php echo _('Action'); ?></th> +<colgroup> + <col id="col_name" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($catalogs as $catalog) { ?> <tr class="<?php echo flip_class(); ?>"> - <td> + <td class="cel_name"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog&catalog_id=<?php echo $catalog->id; ?>"> <?php echo scrub_out($catalog->name); ?></a> (<?php echo scrub_out($catalog->path); ?>) </td> - <td> + <td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"> <?php echo _('Add'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"> @@ -65,6 +69,10 @@ $catalogs = Catalog::get_catalogs(); </td> </tr> <?php } // end if no catalogs ?> +<tr class="th-bottom"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> +</tr> </table> <div class="text-action"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 7d5ffde0..6d8189d3 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -19,22 +19,22 @@ */ ?> -<td> +<td class="cel_add"> <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Add'),'add_album_' . $album->id); ?> <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'random_album_' . $album->id); ?> </td> <?php if (Browse::get_filter('show_art')) { ?> -<td class="br_td_cover"> +<td class="cel_cover"> <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&album=<?php echo $album->id; ?>"> <img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&thumb=1&sid=<?php echo session_id(); ?>" /> </a> </td> <?php } ?> -<td><?php echo $album->f_name_link; ?></td> -<td><?php echo $album->f_artist_link; ?></td> -<td><?php echo $album->song_count; ?></td> -<td><?php echo $album->year; ?></td> -<td> +<td class="cel_album"><?php echo $album->f_name_link; ?></td> +<td class="cel_artist"><?php echo $album->f_artist_link; ?></td> +<td class="cel_songs"><?php echo $album->song_count; ?></td> +<td class="cel_year"><?php echo $album->year; ?></td> +<td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> <?php echo get_user_icon('batch_download',_('Batch Download')); ?> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index fe2af1be..962739ce 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -22,26 +22,28 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_cover" /> - <col id="br_album" /> - <col id="br_artist" /> - <col id="br_songs" /> - <col id="br_year" /> - <col id="br_action" /> + <col id="col_add" /> + <?php if (Browse::get_filter('show_art')) { ?> + <col id="col_cover" /> + <?php } ?> + <col id="col_album" /> + <col id="col_artist" /> + <col id="col_songs" /> + <col id="col_year" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> <?php if (Browse::get_filter('show_art')) { ?> - <th><?php echo _('Cover'); ?></th> + <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Songs'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th> - <th><?php echo _('Actions'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_songs"><?php echo _('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> <?php /* Foreach through the albums */ @@ -53,16 +55,16 @@ $ajax_url = Config::get('ajax_url'); <?php require Config::get('prefix') . '/templates/show_album_row.inc.php'; ?> </tr> <?php } //end foreach ($albums as $album) ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> <?php if (Browse::get_filter('show_art')) { ?> - <th><?php echo _('Cover'); ?></th> + <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Songs'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th> - <th><?php echo _('Actions'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_songs"><?php echo _('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index ab5ac563..e20ccfd9 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -19,14 +19,14 @@ */ ?> -<td> +<td class="cel_add"> <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_artist_' . $artist->id); ?> <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_artist_' . $artist->id); ?> </td> -<td><?php echo $artist->f_name_link; ?></td> -<td><?php echo $artist->songs; ?></td> -<td><?php echo $artist->albums; ?></td> -<td> +<td class="cel_artist"><?php echo $artist->f_name_link; ?></td> +<td class="cel_songs"><?php echo $artist->songs; ?></td> +<td class="cel_albums"><?php echo $artist->albums; ?></td> +<td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"> <?php echo get_user_icon('batch_download','',_('Batch Download')); ?> diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index f67f02cd..954686aa 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -22,20 +22,20 @@ $web_path = Config::get('web_path'); ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_artist" /> - <col id="br_songs" /> - <col id="br_albums" /> - <col id="br_action" /> + <col id="col_add" /> + <col id="col_artist" /> + <col id="col_songs" /> + <col id="col_albums" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th> - <th> <?php echo _('Songs'); ?> </th> - <th> <?php echo _('Albums'); ?> </th> - <th> <?php echo _('Action'); ?> </th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th> + <th class="cel_songs"> <?php echo _('Songs'); ?> </th> + <th class="cel_albums"> <?php echo _('Albums'); ?> </th> + <th class="cel_action"> <?php echo _('Action'); ?> </th> </tr> <?php /* Foreach through every artist that has been passed to us */ @@ -47,12 +47,12 @@ foreach ($object_ids as $artist_id) { <?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?> </tr> <?php } //end foreach ($artists as $artist) ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th> - <th> <?php echo _('Songs'); ?> </th> - <th> <?php echo _('Albums'); ?> </th> - <th> <?php echo _('Action'); ?> </th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th> + <th class="cel_songs"> <?php echo _('Songs'); ?> </th> + <th class="cel_albums"> <?php echo _('Albums'); ?> </th> + <th class="cel_action"> <?php echo _('Action'); ?> </th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 34f7ea77..faf9b406 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -20,11 +20,11 @@ */ $web_path = Config::get('web_path'); ?> -<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> +<td class="cel_catalog"><?php echo $catalog->f_name_link; ?></td> +<td class="cel_path"><?php echo scrub_out($catalog->f_path); ?></td> +<td class="cel_lastverify"><?php echo scrub_out($catalog->f_update); ?></td> +<td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td> +<td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a> diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index b8b6173e..9174838c 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -20,20 +20,20 @@ */ ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_catalog" /> - <col id="br_path" /> - <col id="br_lastverify" /> - <col id="br_lastadd" /> - <col id="br_action" /> + <col id="col_catalog" /> + <col id="col_path" /> + <col id="col_lastverify" /> + <col id="col_lastadd" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Path'); ?></th> - <th><?php echo _('Last Verify'); ?></th> - <th><?php echo _('Last Add'); ?></th> - <th><?php echo _('Actions'); ?></th> +<tr class="th-top"> + <th class="cel_catalog"><?php echo _('Name'); ?></th> + <th class="cel_path"><?php echo _('Path'); ?></th> + <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> <?php foreach ($object_ids as $catalog_id) { @@ -44,18 +44,11 @@ <?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?> </tr> <?php } ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Path'); ?></th> - <th><?php echo _('Last Verify'); ?></th> - <th><?php echo _('Last Add'); ?></th> - <th><?php echo _('Actions'); ?></th> -</tr> <tr class="<?php echo flip_class(); ?>"> <td colspan="3"> </td> - <td align="right" colspan="2"> + <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> @@ -63,5 +56,12 @@ | <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> + <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> +</tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index 21b20ca3..fb66ce4b 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -22,8 +22,8 @@ <?php show_box_top(scrub_out($title)); ?> <?php echo $text; ?> <br /> - <a class="smallbutton" href="<?php echo $path; ?>"><?php echo _('Continue'); ?></a> + <a class="button" href="<?php echo $path; ?>"><?php echo _('Continue'); ?></a> <?php if ($cancel) { ?> - <a class="smallbutton" href="<?php echo Config::get('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a> + <a class="button" href="<?php echo Config::get('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a> <?php } ?> <?php show_box_bottom(); ?> diff --git a/templates/show_disabled_songs.inc b/templates/show_disabled_songs.inc deleted file mode 100644 index 833d1881..00000000 --- a/templates/show_disabled_songs.inc +++ /dev/null @@ -1,54 +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 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. -*/ -?> -<br /> -<form name="songs" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data" style="Display:inline"> -<table class="tabledata" cellspacing="0"> -<tr class="table-header"> - <td><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td> - <td><?php echo _('Title'); ?></td> - <td><?php echo _('Album'); ?></td> - <td><?php echo _('Artist'); ?></td> - <td><?php echo _('Filename'); ?></td> - <td><?php echo _('Addition Time'); ?></td> -</tr> -<?php foreach ($songs as $song) { ?> - <tr class="<?php echo flip_class(); ?>"> - <td><input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" /></td> - <td><?php echo $song->title; ?></td> - <td><?php echo $song->get_album_name($song->album); ?></td> - <td><?php echo $song->get_artist_name($song->album); ?></td> - <td><?php echo $song->file; ?></td> - <td><?php echo date("h:i:s, m/d/y",$song->addition_time); ?></td> - - </tr> -<?php } if (!count($songs)) { ?> - <tr class="<?php echo flip_class(); ?>"> - <td colspan="7"><span class="error"><?php echo _('No Records Found'); ?></span></td> - </tr> -<?php } ?> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="7"> - <input class="button" type="submit" value="<?php echo _('Remove'); ?>" /> - <input type="hidden" name="action" value="remove_disabled" /> - </td> -</tr> -</table> -</form> diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php new file mode 100644 index 00000000..1f051306 --- /dev/null +++ b/templates/show_disabled_songs.inc.php @@ -0,0 +1,70 @@ +<?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 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. +*/ +?> +<br /> +<form name="songs" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data" style="Display:inline"> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_select" /> + <col id="col_song" /> + <col id="col_album" /> + <col id="col_artist" /> + <col id="col_filename" /> + <col id="col_additiontime" /> +</colgroup> +<tr class="th-top"> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td> + <th class="cel_song"><?php echo _('Title'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> + <th class="cel_additiontime"><?php echo _('Addition Time'); ?></th> +</tr> +<?php foreach ($songs as $song) { ?> + <tr class="<?php echo flip_class(); ?>"> + <td class="cel_select"><input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" /></td> + <td class="cel_song"><?php echo $song->title; ?></td> + <td class="cel_album"><?php echo $song->get_album_name($song->album); ?></td> + <td class="cel_artist"><?php echo $song->get_artist_name($song->album); ?></td> + <td class="cel_filename"><?php echo $song->file; ?></td> + <td class="cel_additiontime"><?php echo date("h:i:s, m/d/y",$song->addition_time); ?></td> + + </tr> +<?php } if (!count($songs)) { ?> + <tr class="<?php echo flip_class(); ?>"> + <td colspan="7"><span class="error"><?php echo _('No Records Found'); ?></span></td> + </tr> +<?php } ?> +<tr class="<?php echo flip_class(); ?>"> + <td colspan="7"> + <input class="button" type="submit" value="<?php echo _('Remove'); ?>" /> + <input type="hidden" name="action" value="remove_disabled" /> + </td> +</tr> +<tr class="th-bottom"> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td> + <th class="cel_song"><?php echo _('Title'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> + <th class="cel_additiontime"><?php echo _('Addition Time'); ?></th> +</tr> +</table> +</form> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index 0860d805..ec8c7cd0 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -22,27 +22,36 @@ $web_path = Config::get('web_path'); ?> <form id="songs" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=reject_flags"> -<table class="tabledata" cellspacing="0" cellpadding="0"> -<tr class="table-header"> - <th><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> - <th><?php echo _('Object'); ?></th> - <th><?php echo _('User'); ?></th> - <th><?php echo _('Flag'); ?></th> - <th><?php echo _('Comment'); ?></th> - <th><?php echo _('Status'); ?></th> - <th><?php echo _('Action'); ?></th> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_select" /> + <col id="col_object" /> + <col id="col_username" /> + <col id="col_flag" /> + <col id="col_comment" /> + <col id="col_status" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> + <th class="cel_object"><?php echo _('Object'); ?></th> + <th class="cel_username"><?php echo _('User'); ?></th> + <th class="cel_flag"><?php echo _('Flag'); ?></th> + <th class="cel_comment"><?php echo _('Comment'); ?></th> + <th class="cel_status"><?php echo _('Status'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($flagged as $data) { $flag = new Flag($data); ?> <tr class="<?php echo flip_class(); ?>"> - <td align="center"> + <td class="cel_select"> <input type="checkbox" name="song[]" value="<?php echo $flag->id; ?>" id="song_<?php echo $flag->id; ?>" /> </td> - <td><a href="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=show_edit_song&song=<?php echo $flag->object_id; ?>"><?php $flag->print_name(); ?></a></td> - <td><?php echo scrub_out($flag->f_user_username); ?></td> - <td><?php $flag->print_flag(); ?></td> - <td><?php echo scrub_out($flag->comment); ?></td> - <td><?php $flag->print_status(); ?></td> - <td align="center"> + <td class="cel_object"><a href="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=show_edit_song&song=<?php echo $flag->object_id; ?>"><?php $flag->print_name(); ?></a></td> + <td class="cel_username"><?php echo scrub_out($flag->f_user_username); ?></td> + <td class="cel_flag"><?php $flag->print_flag(); ?></td> + <td class="cel_comment"><?php echo scrub_out($flag->comment); ?></td> + <td class="cel_status"><?php $flag->print_status(); ?></td> + <td class="cel_action"> <?php if ($flag->approved) { ?> <a href="<?php echo $web_path; ?>/admin/flag.php?action=reject_flag&flag_id=<?php echo $flag->id; ?>"> <?php echo get_user_icon('disable'); ?> @@ -68,6 +77,15 @@ $web_path = Config::get('web_path'); <input class="button" type="submit" value="<?php echo _('Update'); ?>" /> </td> </tr> +<tr class="th-bottom"> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> + <th class="cel_object"><?php echo _('Object'); ?></th> + <th class="cel_username"><?php echo _('User'); ?></th> + <th class="cel_flag"><?php echo _('Flag'); ?></th> + <th class="cel_comment"><?php echo _('Comment'); ?></th> + <th class="cel_status"><?php echo _('Status'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> +</tr> </table> </form> <div class="text-action"> diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php index f0570100..d2df78ba 100644 --- a/templates/show_genres.inc.php +++ b/templates/show_genres.inc.php @@ -25,18 +25,18 @@ */ ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_genre" /> - <col id="br_songs" /> - <col id="br_action" /> + <col id="col_add" /> + <col id="col_genre" /> + <col id="col_songs" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th> - <th><?php echo _('Songs'); ?></th> - <th><?php echo _('Action'); ?></th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_genre"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th> + <th class="cel_songs"><?php echo _('Songs'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($object_ids as $genre_id) { @@ -44,7 +44,7 @@ foreach ($object_ids as $genre_id) { $genre->format(); ?> <tr class="<?php echo flip_class(); ?>"> - <td> + <td class="cel_add"> <span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&type=genre&id=<?php echo $genre->id; ?>');return true;" > <?php echo get_user_icon('add'); ?> </span> @@ -52,9 +52,9 @@ foreach ($object_ids as $genre_id) { <?php echo get_user_icon('random'); ?> </span> </td> - <td><?php echo $genre->f_link; ?></td> - <td><?php echo $genre->get_song_count(); ?></td> - <td> + <td class="cel_genre"><?php echo $genre->f_link; ?></td> + <td class="cel_songs"><?php echo $genre->get_song_count(); ?></td> + <td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo $genre->download_link; ?>"> <?php echo get_user_icon('batch_download'); ?> @@ -63,11 +63,11 @@ foreach ($object_ids as $genre_id) { </td> </tr> <?php } // end foreach genres ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th> - <th><?php echo _('Songs'); ?></th> - <th><?php echo _('Action'); ?></th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_genre"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th> + <th class="cel_songs"><?php echo _('Songs'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_install.inc b/templates/show_install.inc.php index 5a477e74..5a477e74 100644 --- a/templates/show_install.inc +++ b/templates/show_install.inc.php diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc.php index 9b5c477b..9b5c477b 100644 --- a/templates/show_install_config.inc +++ b/templates/show_install_config.inc.php diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index d3b2a010..0e30c93f 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -28,24 +28,29 @@ <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a> <?php }?> </div> -<table> -<tr class="table-header"> - <td align="center"> - <?php echo _('Date'); ?> - </td> - <td align=\"center\"> - <?php echo _('IP Address'); ?> - </td> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_date" /> + <col id="col_ipaddress" /> +</colgroup> +<tr class="th-top"> + <th class="cel_date"><?php echo _('Date'); ?></th> + <th class="cel_ipaddress"><?php echo _('IP Address'); ?></th> </tr> <?php foreach ($history as $data) { ?> <tr class="<?php echo flip_class(); ?>"> - <td> + <td class="cel_date"> <?php echo date("d/m/Y H\hi",$data['date']); ?> </td> - <td> + <td class="cel_ipaddress"> <?php echo int2ip($data['ip']); ?> </td> </tr> <?php } ?> +<tr class="th-bottom"> + <th class="cel_date"><?php echo _('Date'); ?></th> + <th class="cel_ipaddress"><?php echo _('IP Address'); ?></th> +</tr> + </table> <?php show_box_bottom(); ?> diff --git a/templates/show_list_duplicates.inc.php b/templates/show_list_duplicates.inc.php index f4ff4b58..f835cf8a 100644 --- a/templates/show_list_duplicates.inc.php +++ b/templates/show_list_duplicates.inc.php @@ -25,16 +25,26 @@ show_duplicate_searchbox($search_type); if (count($flags)) { ?> <?php show_box_top(_('Duplicate Songs')); ?> <form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable"> - <table class="tabledata"> - <tr class="table-header"> - <td><?php echo _('Disable'); ?></td> - <td><?php echo _('Song'); ?></td> - <td><?php echo _('Artist'); ?></td> - <td><?php echo _('Album'); ?></td> - <td><?php echo _('Length'); ?></td> - <td><?php echo _('Bitrate'); ?></td> - <td><?php echo _('Size'); ?></td> - <td><?php echo _('Filename'); ?></td> + <table class="tabledata" cellpadding="0" cellspacing="0"> + <colgroup> + <col id="col_disable" /> + <col id="col_song" /> + <col id="col_artist" /> + <col id="col_album" /> + <col id="col_length" /> + <col id="col_bitrate" /> + <col id="col_size" /> + <col id="col_filename" /> + </colgroup> + <tr class="th-top"> + <th class="cel_disable"><?php echo _('Disable'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_length"><?php echo _('Length'); ?></th> + <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> + <th class="cel_size"><?php echo _('Size'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> </tr> <?php foreach ($flags as $flag) { @@ -58,14 +68,14 @@ if (count($flags)) { ?> $check_txt = ''; if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } echo "<tr class=\"".$current_class."\">". - "<td><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>". - "<td><a href=\"$web_path/stream.php?action=single_song&song_id=$song->id\">".scrub_out($formated_title)."</a> </td>". - "<td><a href=\"$web_path/artists.php?action=show&artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>". - "<td><a href=\"$web_path/albums.php?action=show&album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>". - "<td>".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>". - "<td>".intval($dinfo['bitrate']/1000)."</td>". - "<td>".sprintf("%.2f", ($dinfo['size']/1048576))."MB</td>". - "<td>".$dinfo['file']."</td>"; + "<td class=\"cel_disable\"><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>". + "<td class=\"cel_song\"><a href=\"$web_path/stream.php?action=single_song&song_id=$song->id\">".scrub_out($formated_title)."</a> </td>". + "<td class=\"cel_artist\"><a href=\"$web_path/artists.php?action=show&artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>". + "<td class=\"cel_album\"><a href=\"$web_path/albums.php?action=show&album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>". + "<td class=\"cel_length\">".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>". + "<td class=\"cel_bitrate\">".intval($dinfo['bitrate']/1000)."</td>". + "<td class=\"cel_size\">".sprintf("%.2f", ($dinfo['size']/1048576))."MB</td>". + "<td class=\"cel_filename\">".$dinfo['file']."</td>"; echo "</tr>\n"; } // end foreach ($dinfolist as $dinfo) @@ -74,6 +84,16 @@ if (count($flags)) { ?> <tr> <td colspan="8" class="<?php echo flip_class(); ?>"><input type="submit" value="<?php echo _('Disable Songs'); ?>" /></td> </tr> + <tr class="th-bottom"> + <th class="cel_disable"><?php echo _('Disable'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_length"><?php echo _('Length'); ?></th> + <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> + <th class="cel_size"><?php echo _('Size'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> + </tr> </table> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 773b1d35..23e0f9d7 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -19,14 +19,14 @@ */ ?> -<td> +<td class="cel_add"> <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add',_('Add'),'add_radio_' . $radio->id); ?> </td> -<td><?php echo $radio->f_name_link; ?></td> -<td><?php echo $radio->f_callsign; ?></td> -<td><?php echo $radio->f_frequency; ?></td> -<td><?php echo $radio->f_genre; ?></td> -<td> +<td class="cel_streamname"><?php echo $radio->f_name_link; ?></td> +<td class="cel_callsign"><?php echo $radio->f_callsign; ?></td> +<td class="cel_frequency"><?php echo $radio->f_frequency; ?></td> +<td class="cel_genre"><?php echo $radio->f_genre; ?></td> +<td class="cel_action"> <?php if ($GLOBALS['user']->has_access('50')) { ?> <?php echo Ajax::button('?action=show_edit_object&type=live_stream&id=' . $radio->id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?> <?php } ?> diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index beb44f10..b315922c 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -22,22 +22,22 @@ $web_path = Config::get('web_path'); ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_streamname" /> - <col id="br_callsign" /> - <col id="br_frequency" /> - <col id="br_genre" /> - <col id="br_action" /> + <col id="col_add" /> + <col id="col_streamname" /> + <col id="col_callsign" /> + <col id="col_frequency" /> + <col id="col_genre" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th> - <th><?php echo _('Genre'); ?></th> - <th><?php echo _('Action'); ?> </th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?> </th> </tr> <?php foreach ($object_ids as $radio_id) { @@ -48,13 +48,13 @@ foreach ($object_ids as $radio_id) { <?php require Config::get('prefix') . '/templates/show_live_stream_row.inc.php'; ?> </tr> <?php } //end foreach ($artists as $artist) ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th> - <th><?php echo _('Genre'); ?></th> - <th><?php echo _('Action'); ?> </th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?> </th> </tr> </table> <?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php index 49c6a309..389f3099 100644 --- a/templates/show_local_catalog_info.inc.php +++ b/templates/show_local_catalog_info.inc.php @@ -22,16 +22,16 @@ ?> <?php show_box_top(_('Catalog Statistics')); ?> -<table cellspacing="1" cellpadding="3"> -<tr class="table-header"> - <td><?php echo _('Connected Users'); ?></td> - <td><?php echo _('Total Users'); ?></td> - <td><?php echo _('Albums'); ?></td> - <td><?php echo _('Artists'); ?></td> - <td><?php echo _('Songs'); ?></td> - <td><?php echo _('Genres'); ?></td> - <td><?php echo _('Catalog Size'); ?></td> - <td><?php echo _('Catalog Time'); ?></td> +<table class="tabledata" cellpadding="3" cellspacing="1"> +<tr class="th-top"> + <th><?php echo _('Connected Users'); ?></th> + <th><?php echo _('Total Users'); ?></th> + <th><?php echo _('Albums'); ?></th> + <th><?php echo _('Artists'); ?></th> + <th><?php echo _('Songs'); ?></th> + <th><?php echo _('Genres'); ?></th> + <th><?php echo _('Catalog Size'); ?></th> + <th><?php echo _('Catalog Time'); ?></th> </tr> <tr> <td><?php echo $stats['connected']; ?></td> diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php index 3e8cd613..ba7b5fcb 100644 --- a/templates/show_localplay_controllers.inc.php +++ b/templates/show_localplay_controllers.inc.php @@ -21,12 +21,18 @@ $web_path = Config::get('web_path'); ?> <!-- Plugin we've found --> -<table class="tabledata" cellspacing="0"> -<tr class="table-header"> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Description'); ?></th> - <th><?php echo _('Version'); ?></th> - <th><?php echo _('Action'); ?></th> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_name" /> + <col id="col_description" /> + <col id="col_version" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_description"><?php echo _('Description'); ?></th> + <th class="cel_version"><?php echo _('Version'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($controllers as $controller) { @@ -43,16 +49,22 @@ foreach ($controllers as $controller) { } ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo scrub_out($localplay->f_name); ?></td> - <td><?php echo scrub_out($localplay->f_description); ?></td> - <td><?php echo scrub_out($localplay->f_version); ?></td> - <td><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&type=<?php echo urlencode($controller); ?>"><?php echo $action_txt; ?></a></td> + <td class="cel_name"><?php echo scrub_out($localplay->f_name); ?></td> + <td class="cel_description"><?php echo scrub_out($localplay->f_description); ?></td> + <td class="cel_version"><?php echo scrub_out($localplay->f_version); ?></td> + <td class="cel_action"><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&type=<?php echo urlencode($controller); ?>"><?php echo $action_txt; ?></a></td> </tr> <?php } if (!count($controllers)) { ?> <tr class="<?php echo flip_class(); ?>"> <td colspan="4"><span class="error"><?php echo _('No Records Found'); ?></span></td> </tr> <?php } ?> +<tr class="th-bottom"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_description"><?php echo _('Description'); ?></th> + <th class="cel_version"><?php echo _('Version'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> +</tr> </table> <br /> diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index 216f1523..10f8ecb9 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -20,25 +20,30 @@ */ ?> <?php show_box_top(_('Current Playlist')); ?> -<table class="table-data" cellspacing="0"> -<tr class="table-header"> - <th><?php echo _('Track'); ?></th> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Action'); ?></th> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_track" /> + <col id="col_name" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($objects as $object) { - $class = ''; - if ($status['track'] == $object['track']) { $class=' class="lp_current"'; } + $class = ' class="cel_name"'; + if ($status['track'] == $song['track']) { $class=' class="cel_name lp_current"'; } ?> <tr class="<?php echo flip_class(); ?>" id="localplay_playlist_<?php echo $object['id']; ?>"> - <td> + <td class="cel_track"> <?php echo scrub_out($object['track']); ?> </td> <td<?php echo $class; ?>> <?php echo $localplay->format_name($object['name'],$object['id']); ?> </td> - <td> + <td class="cel_action"> <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete',_('Delete'),'localplay_delete_' . intval($object['id'])); ?> </td> </tr> @@ -47,5 +52,10 @@ foreach ($objects as $object) { <td colspan="3"><span class="error"><?php echo _('No Records Found'); ?></span></td> </tr> <?php } ?> +<tr class="th-bottom"> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> +</tr> </table> <?php show_box_bottom(); ?> diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc.php index ea271460..ea271460 100644 --- a/templates/show_login_form.inc +++ b/templates/show_login_form.inc.php diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php index 91b7877b..1efb252a 100644 --- a/templates/show_playlist_row.inc.php +++ b/templates/show_playlist_row.inc.php @@ -19,14 +19,14 @@ */ ?> -<td> +<td class="cel_add"> <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random',_('Random'),'random_playlist_' . $playlist->id); ?> </td> -<td><?php echo $playlist->f_link; ?></td> -<td><?php echo $count; ?></td> -<td><?php echo scrub_out($playlist->f_user); ?></td> -<td> +<td class="cel_playlist"><?php echo $playlist->f_link; ?></td> +<td class="cel_songs"><?php echo $count; ?></td> +<td class="cel_owner"><?php echo scrub_out($playlist->f_user); ?></td> +<td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"> <?php echo get_user_icon('batch_download',_('Batch Download')); ?> diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php index 9cfcc992..e96aa91b 100644 --- a/templates/show_playlist_song_row.inc.php +++ b/templates/show_playlist_song_row.inc.php @@ -19,15 +19,15 @@ */ ?> -<td><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'playlist_add_' . $song->id); ?></td> -<td><?php echo $playlist_track; ?></td> -<td><?php echo $song->f_link; ?></td> -<td><?php echo $song->f_artist_link; ?></td> -<td><?php echo $song->f_album_link; ?></td> -<td><?php echo $song->f_genre_link; ?></td> -<td><?php echo $song->f_track; ?></td> -<td><?php echo $song->f_time; ?></td> -<td> +<td class="cel_add"><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'playlist_add_' . $song->id); ?></td> +<td class="cel_track"><?php echo $playlist_track; ?></td> +<td class="cel_song"><?php echo $song->f_link; ?></td> +<td class="cel_artist"><?php echo $song->f_artist_link; ?></td> +<td class="cel_album"><?php echo $song->f_album_link; ?></td> +<td class="cel_genre"><?php echo $song->f_genre_link; ?></td> +<td class="cel_track"><?php echo $song->f_track; ?></td> +<td class="cel_time"><?php echo $song->f_time; ?></td> +<td class="cel_action"> <?php if ($GLOBALS['user']->prefs['download']) { ?> <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> <?php echo get_user_icon('download',_('Download')); ?> diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php index 17aa68a6..b0ba1e95 100644 --- a/templates/show_playlist_songs.inc.php +++ b/templates/show_playlist_songs.inc.php @@ -23,22 +23,29 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> -<tr> - <td colspan="8"> - <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> - </td> -</tr> -<tr class="table-header"> - <th> </th> - <th><?php echo _('Track'); ?></th> - <th><?php echo _('Song Title'); ?></th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Album'); ?></th> - <th><?php echo _('Genre'); ?></th> - <th><?php echo _('Track'); ?></th> - <th><?php echo _('Time'); ?></th> - <th><?php echo _('Action'); ?></th> +<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_add" /> + <col id="col_track" /> + <col id="col_song" /> + <col id="col_artist" /> + <col id="col_album" /> + <col id="col_genre" /> + <col id="col_track" /> + <col id="col_time" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_add"> </th> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_song"><?php echo _('Song Title'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($object_ids as $object) { @@ -50,9 +57,16 @@ $ajax_url = Config::get('ajax_url'); <?php require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; ?> </tr> <?php } ?> -<tr> - <td colspan="8"> - <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> - </td> +<tr class="th-bottom"> + <th class="cel_add"> </th> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_song"><?php echo _('Song Title'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_track"><?php echo _('Track'); ?></th> + <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> </table> +<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index c2da7945..385877f8 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -21,20 +21,20 @@ */ ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_playlist" /> - <col id="br_songs" /> - <col id="br_owner" /> - <col id="br_action" /> + <col id="col_add" /> + <col id="col_playlist" /> + <col id="col_songs" /> + <col id="col_owner" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> - <th><?php echo _('# Songs'); ?></th> - <th><?php echo _('Owner'); ?></th> - <th><?php echo _('Actions'); ?></th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_songs"><?php echo _('# Songs'); ?></th> + <th class="cel_owner"><?php echo _('Owner'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> <?php foreach ($object_ids as $playlist_id) { @@ -46,12 +46,12 @@ foreach ($object_ids as $playlist_id) { <?php require Config::get('prefix') . '/templates/show_playlist_row.inc.php'; ?> </tr> <?php } // end foreach ($playlists as $playlist) ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> - <th><?php echo _('# Songs'); ?></th> - <th><?php echo _('Owner'); ?></th> - <th><?php echo _('Actions'); ?></th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_songs"><?php echo _('# Songs'); ?></th> + <th class="cel_owner"><?php echo _('Owner'); ?></th> + <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php index a87e3f9b..6bc5cf26 100644 --- a/templates/show_plugins.inc.php +++ b/templates/show_plugins.inc.php @@ -21,12 +21,18 @@ $web_path = Config::get('web_path'); ?> <!-- Plugin we've found --> -<table class="tabledata" cellspacing="0"> -<tr class="table-header"> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Description'); ?></th> - <th><?php echo _('Version'); ?></th> - <th><?php echo _('Action'); ?></th> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_name" /> + <col id="col_description" /> + <col id="col_version" /> + <col id="col_action" /> +</colgroup> +<tr class="th-top"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_description"><?php echo _('Description'); ?></th> + <th class="cel_version"><?php echo _('Version'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($plugins as $plugin_name) { @@ -41,16 +47,22 @@ foreach ($plugins as $plugin_name) { } ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo scrub_out($plugin->_plugin->name); ?></td> - <td><?php echo scrub_out($plugin->_plugin->description); ?></td> - <td><?php echo scrub_out($plugin->_plugin->version); ?></td> - <td><?php echo $action; ?></td> + <td class="cel_name"><?php echo scrub_out($plugin->_plugin->name); ?></td> + <td class="cel_description"><?php echo scrub_out($plugin->_plugin->description); ?></td> + <td class="cel_version"><?php echo scrub_out($plugin->_plugin->version); ?></td> + <td class="cel_action"><?php echo $action; ?></td> </tr> <?php } if (!count($plugins)) { ?> <tr class="<?php echo flip_class(); ?>"> <td colspan="4"><span class="error"><?php echo _('No Records Found'); ?></span></td> </tr> <?php } ?> +<tr class="th-bottom"> + <th class="cel_name"><?php echo _('Name'); ?></th> + <th class="cel_description"><?php echo _('Description'); ?></th> + <th class="cel_version"><?php echo _('Version'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> +</tr> </table> <br /> diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 6fa4de4a..01cae624 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -21,17 +21,21 @@ ?> <?php show_box_top(_('Preference Administration')); ?> <form method="post" action="<?php echo conf('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data"> -<table cellspacing="0"> -<tr class="table-header"> - <td><?php echo _('Preference'); ?></td> - <td><?php echo _('Level'); ?></td> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_preference" /> + <col id="col_level" /> +</colgroup> +<tr class="th-top"> + <th class="cel_preference"><?php echo _('Preference'); ?></th> + <th class="cel_level"><?php echo _('Level'); ?></th> </tr> <?php foreach ($preferences as $preference) { unset($is_25,$is_5,$is_100); ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo scrub_out($preference['description']); ?></td> - <td> + <td class="cel_preference"><?php echo scrub_out($preference['description']); ?></td> + <td class="cel_level"> <?php $level_name = "is_" . $preference['level']; ${$level_name} = 'selected="selected"'; ?> <select name="prefs[<?php echo scrub_out($preference['name']); ?>]"> <option value="5" <?php echo $is_5; ?>><?php echo _('Guest'); ?></option> @@ -47,6 +51,10 @@ <input type="submit" value="<?php echo _('Update'); ?>" /> </td> </tr> +<tr class="th-bottom"> + <th class="cel_preference"><?php echo _('Preference'); ?></th> + <th class="cel_level"><?php echo _('Level'); ?></th> +</tr> </table> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index e435c005..b1964841 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -26,27 +26,33 @@ if (($GLOBALS['user']->has_access(100) OR !Config::get('use_auth')) AND $_REQUES $is_admin = true; } ?> +<div class="header2"><?php echo $preferences['title']; ?></div> <table class="tabledata" cellpadding="0" cellspacing="0"> -<tr class="odd"> - <th colspan="5" class="header2" align="left"><?php echo $preferences['title']; ?></th> -</tr> -<tr class="table-header"> - <th><?php echo _('Preference'); ?></th> - <th><?php echo _('Value'); ?></th> +<colgroup> + <col id="col_preference" /> + <col id="col_value" /> + <?php if ($is_admin) { ?> + <col id="col_applytoall" /> + <col id="col_level" /> + <?php } ?> +</colgroup> +<tr class="th-top"> + <th class="cel_preference"><?php echo _('Preference'); ?></th> + <th class="cel_value"><?php echo _('Value'); ?></th> <?php if ($is_admin) { ?> - <th><?php echo _('Apply to All'); ?></th> - <th><?php echo _('Access Level'); ?></th> + <th class="cel_applytoall"><?php echo _('Apply to All'); ?></th> + <th class="cel_level"><?php echo _('Access Level'); ?></th> <?php } ?> </tr> <?php foreach ($preferences['prefs'] as $pref) { ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _($pref['description']); ?></td> - <td> + <td class="cel_preference"><?php echo _($pref['description']); ?></td> + <td class="cel_value"> <?php create_preference_input($pref['name'], $pref['value']); ?> </td> <?php if ($is_admin) { ?> - <td align="center"><input type="checkbox" name="check_<?php echo $pref['name']; ?>" value="1" /></td> - <td align="center"> + <td class="cel_applytoall"><input type="checkbox" name="check_<?php echo $pref['name']; ?>" value="1" /></td> + <td class="cel_level"> <?php $name = 'on_' . $pref['level']; ${$name} = 'selected="selected"'; ?> <select name="level_<?php echo $pref['name']; ?>"> <option value="5" <?php echo $on_5; ?>><?php echo _('Guest'); ?></option> @@ -60,4 +66,12 @@ if (($GLOBALS['user']->has_access(100) OR !Config::get('use_auth')) AND $_REQUES <?php } ?> </tr> <?php } // End foreach ($preferences['prefs'] as $pref) ?> +<tr class="th-bottom"> + <th class="cel_preference"><?php echo _('Preference'); ?></th> + <th class="cel_value"><?php echo _('Value'); ?></th> + <?php if ($is_admin) { ?> + <th class="cel_applytoall"><?php echo _('Apply to All'); ?></th> + <th class="cel_level"><?php echo _('Access Level'); ?></th> + <?php } ?> +</tr> </table> diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index 428d7ccc..5cfdc9a0 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -76,7 +76,7 @@ </tr> <tr> <td colspan="4"> - <?php echo Ajax::text("?page=random&action=advanced_random",_('Enqueue'),'advanced_random_enqueue','random','smallbutton'); ?> + <?php echo Ajax::text("?page=random&action=advanced_random",_('Enqueue'),'advanced_random_enqueue','random','button'); ?> </td> </tr> </table> diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index 0e1ee595..4d3b416d 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -23,13 +23,20 @@ $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago')); ?> -<table class="table-data" cellspacing="0"> -<tr class="table-header"> - <th><?php echo _('Username'); ?></th> - <th><?php echo _('Song'); ?></th> - <th><?php echo _('Album'); ?></th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Last Played'); ?></th> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_username" /> + <col id="col_song" /> + <col id="col_album" /> + <col id="col_artist" /> + <col id="col_lastplayed" /> +</colgroup> +<tr class="th-top"> + <th class="cel_username"><?php echo _('Username'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_lastplayed"><?php echo _('Last Played'); ?></th> </tr> <?php foreach ($data as $row) { $row_user = new User($row['user']); @@ -62,15 +69,22 @@ $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days a $song->format(); ?> <tr class="<?php echo flip_class(); ?>"> - <td> + <td class="cel_username"> <a href="<?php echo Config::get('web_path'); ?>/stats.php?action=show_user&user_id=<?php echo scrub_out($row_user->id); ?>"> <?php echo scrub_out($row_user->fullname); ?> </a> </td> - <td><?php echo $song->f_link; ?></td> - <td><?php echo $song->f_album_link; ?></td> - <td><?php echo $song->f_artist_link; ?></td> - <td><?php echo $time_string; ?></td> + <td class="cel_song"><?php echo $song->f_link; ?></td> + <td class="cel_album"><?php echo $song->f_album_link; ?></td> + <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> + <td class="cel_lastplayed"><?php echo $time_string; ?></td> </tr> <?php } ?> +<tr class="th-bottom"> + <th class="cel_username"><?php echo _('Username'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_lastplayed"><?php echo _('Last Played'); ?></th> +</tr> </table> diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index 9e97591b..d69574d9 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -25,10 +25,7 @@ ?> <?php show_box_top(_('Search Ampache') . "..."); ?> <form name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline"> -<table class="tabledata" cellspacing="0" cellpadding="3"> -<tr class="table-header"> - <td colspan="4"> </td> -</tr> +<table class="tabledata" cellpadding="3" cellspacing="0"> <tr class="<?php echo flip_class(); ?>"> <td><?php echo _('Keywords') ?></td> <td> diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php index 63322f37..e186b78f 100644 --- a/templates/show_search_bar.inc.php +++ b/templates/show_search_bar.inc.php @@ -26,8 +26,8 @@ <input type="hidden" name="action" value="quick_search" /> <input type="hidden" name="method" value="fuzzy" /> <input type="hidden" name="object_type" value="song" /> - <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" id="searchBtn" /> - <a href="<?php echo $web_path; ?>/search.php" class="smallbutton" id="advSearchBtn"><?php echo _('Advanced Search'); ?></a> + <input class="button" type="submit" value="<?php echo _('Search'); ?>" id="searchBtn" /> + <a href="<?php echo $web_path; ?>/search.php" class="button" id="advSearchBtn"><?php echo _('Advanced Search'); ?></a> </form> </div> diff --git a/templates/show_similar_artists.inc b/templates/show_similar_artists.inc.php index 5ab3753e..ccf54374 100644 --- a/templates/show_similar_artists.inc +++ b/templates/show_similar_artists.inc.php @@ -23,10 +23,14 @@ $web_path = conf('web_path'); <?php show_box_top(_('Similar Artists')); ?> <form name="artists" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/artists.php?action=rename_similar&artist=<?php echo $artist_id;?>" style="Display:inline;"> <h3><?php _('Please check the artists you want to merge with the current one'); ?> (<span style='text-decoration: underline;'><?php echo $artist_name;?></span>)</h3> - <table class="tabledata" cellspacing="0" cellpadding="0"> - <tr class="table-header"> - <th> Select</th> - <th><?php echo _("Artist"); ?></th> + <table class="tabledata" cellpadding="0" cellspacing="0"> + <colgroup> + <col id="col_select" /> + <col id="col_artist" /> + </colgroup> + <tr class="th-top"> + <th class="cel_select"> Select</th> + <th class="cel_artist"><?php echo _("Artist"); ?></th> </tr> <?php if (count($similar_artists) > 0) { @@ -34,10 +38,10 @@ if (count($similar_artists) > 0) { foreach ($similar_artists as $artist_array) { ?> <tr class="<?php echo flip_class(); ?>"> - <td align="center"> + <td class="cel_select"> <input type="checkbox" name="artists[]" value="<?php echo $artist_array[0]; ?>" /> </td> - <td> + <td class="cel_artist"> <a href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $artist_array[0]; ?>" title="<?php echo htmlspecialchars($artist_array[1]); ?>" <?php echo $text_class; ?>><?php echo htmlspecialchars($artist_array[1]); ?></a> </td> </tr> @@ -47,7 +51,7 @@ if (count($similar_artists) > 0) { $show = false; ?> <tr class="<?php echo flip_class(); ?>"> - <td align="center"> + <td> </td> <td> @@ -55,7 +59,7 @@ if (count($similar_artists) > 0) { </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td align="center"> + <td> </td> <td> @@ -77,7 +81,11 @@ if ($show) { <?php } ?> -</table> + <tr class="th-bottom"> + <th class="cel_select"> Select</th> + <th class="cel_artist"><?php echo _("Artist"); ?></th> + </tr> + </table> </form> <?php show_box_bottom(); ?> <?php show_box_top(_('Advanced Options')); ?> diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 3ae150ca..492609eb 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -19,16 +19,16 @@ */ ?> -<td> +<td class="cel_add"> <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?> </td> -<td><?php echo $song->f_link; ?></td> -<td><?php echo $song->f_artist_link; ?></td> -<td><?php echo $song->f_album_link; ?></td> -<td><?php echo $song->f_genre_link; ?></td> -<td><?php echo $song->f_track; ?></td> -<td><?php echo $song->f_time; ?></td> -<td> +<td class="cel_song"><?php echo $song->f_link; ?></td> +<td class="cel_artist"><?php echo $song->f_artist_link; ?></td> +<td class="cel_album"><?php echo $song->f_album_link; ?></td> +<td class="cel_genre"><?php echo $song->f_genre_link; ?></td> +<td class="cel_track"><?php echo $song->f_track; ?></td> +<td class="cel_time"><?php echo $song->f_time; ?></td> +<td class="cel_action"> <?php if ($GLOBALS['user']->prefs['download']) { ?> <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> <?php echo get_user_icon('download',_('Download')); ?> diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 293b0b55..0ebd770c 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -24,28 +24,26 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> -<table class="tabledata" cellspacing="0" cellpadding="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_add" /> - <col id="br_song" /> - <col id="br_artist" /> - <col id="br_album" /> - <col id="br_genre" /> - <col id="br_track" /> - <col id="br_time" /> - <col id="br_action" /> + <col id="col_add" /> + <col id="col_song" /> + <col id="col_artist" /> + <col id="col_album" /> + <col id="col_genre" /> + <col id="col_track" /> + <col id="col_time" /> + <col id="col_action" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Add'); ?></th> - <th> - <?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?> - </th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Album'); ?></th> - <th><?php echo _('Genre'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time'); ?></th> - <th><?php echo _('Action'); ?></th> +<tr class="th-top"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> <?php foreach ($object_ids as $song_id) { @@ -56,17 +54,15 @@ $ajax_url = Config::get('ajax_url'); <?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?> </tr> <?php } ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Add'); ?></th> - <th> - <?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?> - </th> - <th><?php echo _('Artist'); ?></th> - <th><?php echo _('Album'); ?></th> - <th><?php echo _('Genre'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track'); ?></th> - <th><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time'); ?></th> - <th><?php echo _('Action'); ?></th> +<tr class="th-bottom"> + <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_genre"><?php echo _('Genre'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_tv_playlist.inc.php b/templates/show_tv_playlist.inc.php index 50bc7d11..f6fb87bb 100644 --- a/templates/show_tv_playlist.inc.php +++ b/templates/show_tv_playlist.inc.php @@ -21,7 +21,16 @@ /* Some defaults */ $web_path = conf('web_path'); ?> -<table cellspacing="0"> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_action" /> + <col id="col_votes" /> + <col id="col_song" /> + <col id="col_time" /> + <?php if ($GLOBALS['user']->has_access(100)) { ?> + <col id="col_admin" /> + <?php } ?> +</colgroup> <?php if (!count($songs)) { $playlist = new Playlist($tmp_playlist->base_playlist); @@ -39,13 +48,13 @@ if (!count($songs)) { /* Else we have songs */ else { ?> -<tr class="table-header"> - <td><?php echo _('Action'); ?></td> - <td><?php echo _('Votes'); ?></td> - <td><?php echo _('Song'); ?></td> - <td><?php echo _('Time'); ?></td> +<tr class="th-top"> + <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_votes"><?php echo _('Votes'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_time"><?php echo _('Time'); ?></th> <?php if ($GLOBALS['user']->has_access(100)) { ?> - <td><?php echo _('Admin'); ?></td> + <th class="cel_admin"><?php echo _('Admin'); ?></th> <?php } ?> </tr> <?php @@ -56,18 +65,18 @@ foreach($songs as $row_id=>$song_id) { $song->format_song(); ?> <tr class="<?php echo flip_class(); ?>"> - <td> + <td class="cel_action"> <?php if ($tmp_playlist->has_vote($song_id)) { ?> <input class="button" type="button" value="-" onclick="ajaxPut('<?php echo conf('ajax_url'); ?>?action=vote&object_id=<?php echo $song_id; ?>&vote=-1<?php echo conf('ajax_info'); ?>')" /> <?php } else { ?> <input class="button" type="button" value="+" onclick="ajaxPut('<?php echo conf('ajax_url'); ?>?action=vote&object_id=<?php echo $song_id; ?>&vote=1<?php echo conf('ajax_info'); ?>')" /> <?php } ?> </td> - <td><?php echo scrub_out($tmp_playlist->get_vote($row_id)); ?></td> - <td><?php echo $song->f_link . " / " . $song->f_album_link . " / " . $song->f_artist_link; ?></td> - <td><?php echo $song->f_time; ?></td> + <td class="cel_votes"><?php echo scrub_out($tmp_playlist->get_vote($row_id)); ?></td> + <td class="cel_song"><?php echo $song->f_link . " / " . $song->f_album_link . " / " . $song->f_artist_link; ?></td> + <td class="cel_time"><?php echo $song->f_time; ?></td> <?php if ($GLOBALS['user']->has_access(100)) { ?> - <td> + <td class="cel_admin"> <span onclick="ajaxPut('<?php echo conf('ajax_url'); ?>?action=tv_admin&cmd=delete&track_id=<?php echo $song_id; ?><?php echo conf('ajax_info'); ?>')" /> <?php echo get_user_icon('delete'); ?> </span> @@ -75,7 +84,18 @@ foreach($songs as $row_id=>$song_id) { <?php } ?> </tr> <?php - } // end foreach + } // end foreach +?> +<tr class="th-bottom"> + <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_votes"><?php echo _('Votes'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_time"><?php echo _('Time'); ?></th> + <?php if ($GLOBALS['user']->has_access(100)) { ?> + <th class="cel_admin"><?php echo _('Admin'); ?></th> + <?php } ?> +</tr> +<?php } // end else ?> </table> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index a9e5fbd4..a27963ab 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -25,24 +25,26 @@ $web_path = Config::get('web_path'); <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="br_username" /> - <col id="br_lastseen" /> - <col id="br_registrationdate" /> - <col id="br_activity" /> - <col id="br_lastip" /> - <col id="br_action" /> - <col id="br_online" /> + <col id="col_username" /> + <col id="col_lastseen" /> + <col id="col_registrationdate" /> + <col id="col_activity" /> + <?php if (Config::get('track_user_ip')) { ?> + <col id="col_lastip" /> + <?php } ?> + <col id="col_action" /> + <col id="col_online" /> </colgroup> -<tr class="table-header th-top"> - <th><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> - <th><?php echo _('Last Seen'); ?></th> - <th><?php echo _('Registration Date'); ?></th> - <th><?php echo _('Activity'); ?></th> +<tr class="th-top"> + <th class="cel_username"><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> + <th class="cel_lastseen"><?php echo _('Last Seen'); ?></th> + <th class="cel_registrationdate"><?php echo _('Registration Date'); ?></th> + <th class="cel_activity"><?php echo _('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> - <th><?php echo _('Last Ip'); ?></th> + <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> <?php } ?> - <th><?php echo _('Action'); ?></th> - <th><?php echo _('On-line'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_online"><?php echo _('On-line'); ?></th> </tr> <?php foreach ($object_ids as $user_id) { @@ -52,29 +54,22 @@ foreach ($object_ids as $user_id) { $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : _('Unknown'); ?> <tr class="<?php echo flip_class(); ?>" align="center"> - <td align="left"> + <td class="cel_username"> <a href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $client->id; ?>"> <?php echo $client->fullname; ?> (<?php echo $client->username; ?>) </a> </td> - <td> - <?php echo $last_seen; ?> - </td> - <td> - <?php echo $create_date; ?> - </td> - - <td> - <?php echo $client->f_useage; ?> - </td> + <td class="cel_lastseen"><?php echo $last_seen; ?></td> + <td class="cel_registrationdate"><?php echo $create_date; ?></td> + <td class="cel_activity"><?php echo $client->f_useage; ?></td> <?php if (Config::get('track_user_ip')) { ?> - <td> + <td class="cel_lastip"> <a href="<?php echo $web_path; ?>/admin/users.php?action=show_ip_history&user_id=<?php echo $client->id; ?>"> <?php echo $client->ip_history; ?> </a> </td> <?php } ?> - <td> + <td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"> <?php echo get_user_icon('edit'); ?> </a> @@ -93,24 +88,24 @@ foreach ($object_ids as $user_id) { </td> <?php if (($client->is_logged_in()) AND ($client->is_online())) { - echo "<td class=\"user_online\"> </td>"; + echo "<td class=\"cel_online user_online\"> </td>"; } elseif ($client->disabled == 1) { - echo "<td class=\"user_disabled\"> </td>"; + echo "<td class=\"cel_online user_disabled\"> </td>"; } else { - echo "<td class=\"user_offline\"> </td>"; + echo "<td class=\"cel_online user_offline\"> </td>"; } ?> </tr> <?php } //end foreach users ?> -<tr class="table-header th-bottom"> - <th><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> - <th><?php echo _('Last Seen'); ?></th> - <th><?php echo _('Registration Date'); ?></th> - <th><?php echo _('Activity'); ?></th> +<tr class="th-bottom"> + <th class="cel_username"><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> + <th class="cel_lastseen"><?php echo _('Last Seen'); ?></th> + <th class="cel_registrationdate"><?php echo _('Registration Date'); ?></th> + <th class="cel_activity"><?php echo _('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> - <th><?php echo _('Last Ip'); ?></th> + <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> <?php } ?> - <th><?php echo _('Action'); ?></th> - <th><?php echo _('On-line'); ?></th> + <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_online"><?php echo _('On-line'); ?></th> </tr> </table> |