diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-29 00:55:05 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-29 00:55:05 +0000 |
| commit | 49ca88ee622ae1b334d231c5d954c5dc647ce06f (patch) | |
| tree | 8d68da761578c8e3d3e9e806361b73a97b2835cb /templates | |
| parent | 1a22c7c3170af9345b57e51a6b007983e3ecd6e5 (diff) | |
| download | ampache-49ca88ee622ae1b334d231c5d954c5dc647ce06f.tar.gz ampache-49ca88ee622ae1b334d231c5d954c5dc647ce06f.tar.bz2 ampache-49ca88ee622ae1b334d231c5d954c5dc647ce06f.zip | |
renamed albumart.php to image.php and prepared for the find album art page fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_album.inc | 4 | ||||
| -rw-r--r-- | templates/show_artist.inc | 2 | ||||
| -rw-r--r-- | templates/show_big_art.inc | 10 | ||||
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_tv_nowplaying.inc.php | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/templates/show_album.inc b/templates/show_album.inc index 264756d0..903eedf1 100644 --- a/templates/show_album.inc +++ b/templates/show_album.inc @@ -36,9 +36,9 @@ $title = scrub_out($album->name) . ' -- ' . $album->f_artist; <div style="float:left;display:table-cell;width:140px;"> <?php if ($album_name != "Unknown (Orphaned)") { - $aa_url = $web_path . "/albumart.php?id=" . $album->id . "&type=popup"; + $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popup_art('$aa_url'); return false;\">"; - echo "<img border=\"0\" src=\"" . $web_path . "/albumart.php?id=" . $album->id . "&thumb=2\" alt=\"Album Art\" height=\"128\" />"; + echo "<img border=\"0\" src=\"" . $web_path . "/image.php?id=" . $album->id . "&thumb=2&sid=" . session_id() . "\" alt=\"Album Art\" height=\"128\" />"; echo "</a>\n"; } ?> diff --git a/templates/show_artist.inc b/templates/show_artist.inc index 2612df33..ff0565a4 100644 --- a/templates/show_artist.inc +++ b/templates/show_artist.inc @@ -50,7 +50,7 @@ foreach ($albums as $album) { </td> <td height="87"> <a href="<?php echo $web_path; ?>/albums.php?album=<?php echo $id; ?>&artist=<?php echo $artist->id; ?>"> - <img border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $id; ?>&fast=1&thumb=1" alt="<?php echo scrub_out($album_name); ?>" title="<?php echo scrub_out($album_name); ?>" height="75" width="75" /> + <img border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $id; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($album_name); ?>" title="<?php echo scrub_out($album_name); ?>" height="75" width="75" /> </a> </td> <td> diff --git a/templates/show_big_art.inc b/templates/show_big_art.inc index 9048d5b0..f9f84bcc 100644 --- a/templates/show_big_art.inc +++ b/templates/show_big_art.inc @@ -5,9 +5,8 @@ All rights reserved. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +21,6 @@ $htmllang = str_replace("_","-",conf('lang')); ?> - <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> <head> @@ -32,8 +30,8 @@ $htmllang = str_replace("_","-",conf('lang')); </head> <body onLoad="self.resizeTo(document.images[0].width+30, document.images[0].height+70)"> <?php -echo "<a href=\"javascript:window.close()\" title=\"" . _("Click to close window") . "\">"; -echo "<img src=\"" . conf('web_path') . "/albumart.php?id=" . $_GET['id'] . "\" border=\"0\" />"; +echo "<a href=\"javascript:window.close()\" title=\"" . _('Click to close window') . "\">"; +echo "<img src=\"" . conf('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" border=\"0\" />"; echo "</a>"; ?> </body> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 08ae5da5..a0ab25f1 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -41,7 +41,7 @@ $artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25')); </td> <?php if (conf('play_album_art')) { ?> <td class="np_cell"> - <a target="_blank" href="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&type=popup" onclick="popup_art('<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&type=popup'); return false;"> - <img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&fast=1&thumb=1" alt="Album Art" height="75" /></a> + <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> + <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="Album Art" height="75" /></a> </td> <?php } // end play album art ?> diff --git a/templates/show_tv_nowplaying.inc.php b/templates/show_tv_nowplaying.inc.php index 930d5444..94e4dee2 100644 --- a/templates/show_tv_nowplaying.inc.php +++ b/templates/show_tv_nowplaying.inc.php @@ -30,8 +30,8 @@ foreach ($results as $row) { ?> <tr> <td> - <a target="_blank" href="<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&type=popup" onclick="popup_art('<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&type=popup'); return false;"> - <img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&fast=1" /> + <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> + <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&fast=1" /> </a> </td> </tr> |