summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-02 06:52:34 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-02 06:52:34 +0000
commitb909c08509458f4a76ba0ba7922316cd7e55b0d4 (patch)
tree46ebdf016a7664a077deb089103587c04aad60dc /templates
parent1c101a3b347b7240ab08e7ee03ab4c24673e58d8 (diff)
downloadampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.tar.gz
ampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.tar.bz2
ampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.zip
fixed a bug in the numbering, referencing a non-existant value
Diffstat (limited to 'templates')
-rw-r--r--templates/list_header.inc.php2
-rw-r--r--templates/show_albums.inc.php5
-rw-r--r--templates/show_artists.inc.php6
-rw-r--r--templates/show_songs.inc.php5
4 files changed, 14 insertions, 4 deletions
diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php
index 62725752..8146261d 100644
--- a/templates/list_header.inc.php
+++ b/templates/list_header.inc.php
@@ -62,7 +62,7 @@ while ($page > 0) {
if ($i == '15') { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; }
$i++;
$page = $page - 1;
- $page_data['down'][$page] = $page * $GLOBALS['view']->offset_limit;
+ $page_data['down'][$page] = $page * $limit;
} // while page > 0
// Up Next
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index 851f31e3..2741d16d 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -45,4 +45,9 @@ $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">
+ <td colspan="6">
+ <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
+ </td>
+</tr>
</table>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index 3e76c26c..7339b541 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -53,9 +53,9 @@ foreach ($object_ids as $artist_id) {
<td><?php echo _('Action'); ?></td>
</tr>
-<tr class="even" align="center">
- <td colspan="4">
- <?php if ($view->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
+<tr class="table-header" align="center">
+ <td colspan="5">
+ <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
</table>
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index cd073b6f..bedc49f1 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -50,4 +50,9 @@ $ajax_url = Config::get('ajax_url');
<?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?>
</tr>
<?php } ?>
+<tr class="table-header" align="center">
+ <td colspan="8">
+ <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
+ </td>
+</tr>
</table>