- hardcoded disk# sort order when sort is set to album name

- removed pager from browse table
- added footer to browse tables
- updated browse files for better customization
- modified css

10 files changed, 160 insertions, 110 deletions

diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 807175c7..7d5ffde0 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -24,10 +24,11 @@
 	<?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 height="87">
+<td class="br_td_cover">
         <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&amp;album=<?php echo $album->id; ?>">
-                <img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>"
+                <img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" />
         </a>
+</td>
 <?php } ?>
 <td><?php echo $album->f_name_link; ?></td>
 <td><?php echo $album->f_artist_link; ?></td>
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index d63353e3..fe2af1be 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -21,13 +21,18 @@
 $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">
-<tr>
-	<td colspan="7">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
-</tr>
-<tr class="table-header">
+<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" />
+</colgroup>
+<tr class="table-header th-top">
 	<th><?php echo _('Add'); ?></th>
 	<?php if (Browse::get_filter('show_art')) { ?>
 	<th><?php echo _('Cover'); ?></th>
@@ -48,9 +53,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>
-	<td colspan="7">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
+<tr class="table-header th-bottom">
+	<th><?php echo _('Add'); ?></th>
+	<?php if (Browse::get_filter('show_art')) { ?>
+	<th><?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>
 </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 f394337e..ab5ac563 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -26,7 +26,7 @@
 <td><?php echo $artist->f_name_link; ?></td>
 <td><?php echo $artist->songs; ?></td>
 <td><?php echo $artist->albums; ?></td>
-<td nowrap="nowrap">
+<td>
 <?php if (Access::check_function('batch_download')) { ?>
 	<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&amp;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 224d3ce0..f67f02cd 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -21,13 +21,16 @@
 $web_path = Config::get('web_path');
 
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
-<tr>
-	<td colspan="5">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
-</tr>
-<tr class="table-header">
+<colgroup>
+  <col id="br_add" />
+  <col id="br_artist" />
+  <col id="br_songs" />
+  <col id="br_albums" />
+  <col id="br_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>
@@ -44,17 +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">
+<tr class="table-header th-bottom">
 	<th><?php echo _('Add'); ?></th>
-        <th><?php echo _("Artist"); ?></th>
-        <th><?php echo _('Songs');  ?></th>
-        <th><?php echo _('Albums'); ?></th>
-	<th><?php echo _('Action'); ?></th>
-
-</tr>
-<tr>
-	<td colspan="5">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
+	<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>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
index fe6e3e7d..7a0a48cd 100644
--- a/templates/show_catalogs.inc.php
+++ b/templates/show_catalogs.inc.php
@@ -19,13 +19,16 @@
 
 */
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
-<tr>
-	<td colspan="5">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
-</tr>
-<tr class="table-header">
+<colgroup>
+  <col id="br_catalog" />
+  <col id="br_path" />
+  <col id="br_lastverify" />
+  <col id="br_lastadd" />
+  <col id="br_action" />
+</colgroup>
+<tr class="table-header th-top">
 	<th><?php echo _('Name'); ?></th>
 	<th><?php echo _('Path'); ?></th>
 	<th><?php echo _('Last Verify'); ?></th>
@@ -41,9 +44,12 @@
 	<?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?>
 </tr>
 <?php } ?>
-<tr>
-	<td colspan="5">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
+<tr 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>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 3008ed4c..f0570100 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -24,13 +24,15 @@
  * Takes an array of genre objects and displays them out
  */
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
-<tr>
-	<td colspan="5">
-		<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
-	</td>
-</tr>
-<tr class="table-header">
+<colgroup>
+  <col id="br_add" />
+  <col id="br_genre" />
+  <col id="br_songs" />
+  <col id="br_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>
@@ -61,9 +63,11 @@ foreach ($object_ids as $genre_id) {
 		</td>
 	</tr>
 <?php } // end foreach genres ?>
-<tr>
-	<td colspan="5">
-		<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
-	</td>
+<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>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index 037d91c1..beb44f10 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -21,13 +21,17 @@
 $web_path = Config::get('web_path');
 
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
-<tr>
-	<td colspan="6">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
-</tr>
-<tr class="table-header">
+<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" />
+</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>
@@ -44,9 +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>
-	<td colspan="6">
-	<?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
+<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>
 </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 000c5f28..c2da7945 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -20,14 +20,17 @@
 
 */
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0"> <!-- Playlist Table -->
-<tr>
-        <td colspan="5">
-                <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
-        </td>
-</tr>
-<tr class="table-header">
-        <th>&nbsp;</th>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
+<table class="tabledata" cellspacing="0" cellpadding="0">
+<colgroup>
+  <col id="br_add" />
+  <col id="br_playlist" />
+  <col id="br_songs" />
+  <col id="br_owner" />
+  <col id="br_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>
@@ -43,9 +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>
-        <td colspan="5">
-                <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
-        </td>
+<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>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index a104f1f2..293b0b55 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -23,13 +23,19 @@
 $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">
-<tr>
-	<td colspan="8">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
-</tr>
-<tr class="table-header">
+<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" />
+</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'); ?>
@@ -50,9 +56,17 @@ $ajax_url = Config::get('ajax_url');
 	<?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?> 
 </tr>
 <?php } ?>
-<tr>
-	<td colspan="8">
-	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-	</td>
+<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>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index 8b44a75f..a9e5fbd4 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -22,37 +22,27 @@
 $web_path = Config::get('web_path');
 
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
-<tr class="table-header" align="center">
-        <th colspan="11">
-        <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-        </th>
-</tr>
-<tr class="table-header">
-	<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>
+<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" />
+</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>
 	<?php if (Config::get('track_user_ip')) { ?>
-  <th>
-		<?php echo _('Last Ip'); ?>
-	</th>
+  <th><?php echo _('Last Ip'); ?></th>
 	<?php } ?>
-	<th>
-    <?php echo _('Action'); ?>
-  </th>
-  <th>
-		<?php echo _('On-line'); ?>
-	</th>
+	<th><?php echo _('Action'); ?></th>
+  <th><?php echo _('On-line'); ?></th>
 </tr>
 <?php
 foreach ($object_ids as $user_id) { 
@@ -112,4 +102,15 @@ foreach ($object_ids as $user_id) {
 ?>	
 </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>
+	<?php if (Config::get('track_user_ip')) { ?>
+  <th><?php echo _('Last Ip'); ?></th>
+	<?php } ?>
+	<th><?php echo _('Action'); ?></th>
+  <th><?php echo _('On-line'); ?></th>
+</tr>
 </table>