added sorting on most objects in most views, report bugs if you find points where sorting fails

7 files changed, 25 insertions, 19 deletions

diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 3a840db3..b2421511 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -61,9 +61,11 @@ $title		= scrub_out($album->name) . ' (' . $album->year . ') -- '
 <div id="additional_information">
 &nbsp;
 </div>
+<div id="browse_content">
 <?php 
-	show_box_top($album->name . ' ' . _('Songs')); 
 	$object_ids = $album->get_songs(); 
-	require Config::get('prefix') . '/templates/show_songs.inc.php'; 
-	show_box_bottom(); 
+	Browse::set_type('song');
+	Browse::save_objects($object_ids); 
+	Browse::show_objects($object_ids); 
 ?>
+</div>
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index 7a692caf..0df1393f 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -32,10 +32,10 @@ $ajax_url = Config::get('ajax_url');
 	<?php if (Browse::get_filter('show_art')) { ?>
 	<th><?php echo _('Cover'); ?></th>
 	<?php } ?>
-	<th><?php echo _('Album'); ?></th>
+	<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 _('Year'); ?></th>
+	<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th>
 	<th><?php echo _('Actions'); ?></th>
 </tr>
 <?php 
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index ae5d5006..9c598c08 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -25,5 +25,9 @@ require Config::get('prefix') . '/templates/show_artist_box.inc.php';
 
 ?>
 <div id="browse_content">
-<?php Browse::set_type('album'); Browse::show_objects($albums); ?>
+<?php 
+	Browse::set_type('album'); 
+	Browse::save_objects($albums);
+	Browse::show_objects($albums); 
+?>
 </div>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index da95eadc..3b7c1344 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -28,11 +28,11 @@ $web_path = Config::get('web_path');
 	</td>
 </tr>
 <tr class="table-header">
-	<td><?php echo _('Add'); ?>
-	<td><?php echo _('Artist'); ?></td>
-	<td> <?php echo _('Songs');  ?> </td>
-	<td> <?php echo _('Albums'); ?> </td>
-	<td> <?php echo _('Action'); ?> </td>
+	<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>
 <?php 
 /* Foreach through every artist that has been passed to us */
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index b69e81d3..d46a3b15 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -29,9 +29,9 @@ $web_path = Config::get('web_path');
 </tr>
 <tr class="table-header">
 	<th><?php echo _('Add'); ?></th>
-	<th><?php echo _('Name'); ?></th>
-	<th><?php echo _('Callsign');  ?></th>
-	<th><?php echo _('Frequency'); ?></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>
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index 81b7b22d..ce577508 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -28,7 +28,7 @@
 </tr>
 <tr class="table-header">
         <th>&nbsp;</th>
-	<th><?php echo _('Playlist Name'); ?></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>
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index 2ad73b95..a104f1f2 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -31,14 +31,14 @@ $ajax_url = Config::get('ajax_url');
 </tr>
 <tr class="table-header">
 	<th><?php echo _('Add'); ?></th>
-	<th onclick="ajaxPut('<?php echo $ajax_url; ?>?action=browse&amp;sort=title');return true;" style="cursor:pointer;">
-		<?php echo _('Song Title'); ?>
+	<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 _('Track'); ?></th>
-	<th><?php echo _('Time'); ?></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>
 <?php