diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-08-02 06:52:34 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-08-02 06:52:34 +0000 |
| commit | b909c08509458f4a76ba0ba7922316cd7e55b0d4 (patch) | |
| tree | 46ebdf016a7664a077deb089103587c04aad60dc | |
| parent | 1c101a3b347b7240ab08e7ee03ab4c24673e58d8 (diff) | |
| download | ampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.tar.gz ampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.tar.bz2 ampache-b909c08509458f4a76ba0ba7922316cd7e55b0d4.zip | |
fixed a bug in the numbering, referencing a non-existant value
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | server/ajax.server.php | 2 | ||||
| -rw-r--r-- | templates/list_header.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_albums.inc.php | 5 | ||||
| -rw-r--r-- | templates/show_artists.inc.php | 6 | ||||
| -rw-r--r-- | templates/show_songs.inc.php | 5 |
6 files changed, 15 insertions, 6 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index c45248ec..59af7e3d 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.4-Alpha2 + - Added Paging to bottom of all views - Fixed get_location() (Thx ichneumon) - Moved Quick search to the top, right appears on every page - Fixed an issue with reading id3tags causing a uncaught exception diff --git a/server/ajax.server.php b/server/ajax.server.php index c4227361..640097c2 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -170,7 +170,6 @@ switch ($action) { break; } // end switch - $results['topbar-playlist'] = ajax_include('show_playlist_bar.inc.php'); $results['rightbar'] = ajax_include('rightbar.inc.php'); echo xml_from_array($results); break; @@ -224,7 +223,6 @@ switch ($action) { break; } // end switch - $results['topbar-playlist'] = ajax_include('show_playlist_bar.inc.php'); $results['rightbar'] = ajax_include('rightbar.inc.php'); echo xml_from_array($results); break; 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> |