summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/show_albums.inc.php8
-rw-r--r--templates/show_artist_row.inc.php3
-rw-r--r--templates/show_artists.inc.php8
-rw-r--r--templates/show_songs.inc.php12
-rw-r--r--templates/show_test_config.inc.php2
5 files changed, 18 insertions, 15 deletions
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index 8f1cccf5..02613803 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -40,10 +40,10 @@ $ajax_url = Config::get('ajax_url');
<?php if (Browse::get_filter('show_art')) { ?>
<th class="cel_cover"><?php echo _('Cover'); ?></th>
<?php } ?>
- <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th>
+ <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&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_year"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=year',_('Year'),'album_sort_year'); ?></th>
<th class="col_rating"><?php echo _('Rating'); ?></th>
<th class="cel_action"><?php echo _('Actions'); ?></th>
</tr>
@@ -70,10 +70,10 @@ $ajax_url = Config::get('ajax_url');
<?php if (Browse::get_filter('show_art')) { ?>
<th class="cel_cover"><?php echo _('Cover'); ?></th>
<?php } ?>
- <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name_bottom'); ?></th>
+ <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=name',_('Album'),'album_sort_name_bottom'); ?></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_bottom'); ?></th>
+ <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=year',_('Year'),'album_sort_year_bottom'); ?></th>
<th class="col_rating"><?php echo _('Rating'); ?></th>
<th class="cel_action"><?php echo _('Actions'); ?></th>
</tr>
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index b78216af..69dcd9f3 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@
<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_time"><?php echo $artist->f_time; ?></td>
<td class="cel_rating" id="rating_<?php echo $artist->id; ?>_artist"><?php Rating::show($artist->id,'artist'); ?></td>
<td class="cel_action">
<?php if (Access::check_function('batch_download')) { ?>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index 13c5e307..58e5b030 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -33,9 +33,10 @@ $web_path = Config::get('web_path');
</colgroup>
<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_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&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_time"> <?php echo _('Time'); ?> </th>
<th class="cel_rating"> <?php echo _('Rating'); ?> </th>
<th class="cel_action"> <?php echo _('Action'); ?> </th>
</tr>
@@ -59,9 +60,10 @@ foreach ($object_ids as $artist_id) {
<?php } ?>
<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_bottom'); ?></th>
+ <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name',_('Artist'),'artist_sort_name_bottom'); ?></th>
<th class="cel_songs"> <?php echo _('Songs'); ?> </th>
<th class="cel_albums"> <?php echo _('Albums'); ?> </th>
+ <th class="cel_time"> <?php echo _('Time'); ?> </th>
<th class="cel_rating"> <?php echo _('Rating'); ?> </th>
<th class="cel_action"> <?php echo _('Action'); ?> </th>
</tr>
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index a96739fb..c868a306 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -37,12 +37,12 @@ $ajax_url = Config::get('ajax_url');
</colgroup>
<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_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&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_tags"><?php echo _('Tags'); ?></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_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track',_('Track'),'sort_song_track'); ?></th>
+ <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time',_('Time'),'sort_song_time'); ?></th>
<?php if (Config::get('ratings')) {
Rating::build_cache('song', $object_ids);
?>
@@ -66,12 +66,12 @@ $ajax_url = Config::get('ajax_url');
<?php } ?>
<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_bottom'); ?></th>
+ <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title',_('Song Title'),'sort_song_title_bottom'); ?></th>
<th class="cel_artist"><?php echo _('Artist'); ?></th>
<th class="cel_album"><?php echo _('Album'); ?></th>
<th class="cel_tags"><?php echo _('Tags'); ?></th>
- <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track_bottom'); ?></th>
- <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time_bottom'); ?></th>
+ <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track',_('Track'),'sort_song_track_bottom'); ?></th>
+ <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time',_('Time'),'sort_song_time_bottom'); ?></th>
<?php if (Config::get('ratings')) { ?>
<th class="cel_rating"><?php echo _('Rating'); ?></th>
<?php } ?>
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index c5a6abb3..ab9e1ee2 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All Rights Reserved
this program is free software; you can redistribute it and/or