diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-05-25 05:49:22 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-05-25 05:49:22 +0000 |
| commit | 79316acb81fe9215b09ec41918b9a402560e7bef (patch) | |
| tree | 9a71adc5d6dd297e3f39976796e380be10f19a4e /templates | |
| parent | 035b273ff529a34e1d2cb52bd61c653c6bff8250 (diff) | |
| download | ampache-79316acb81fe9215b09ec41918b9a402560e7bef.tar.gz ampache-79316acb81fe9215b09ec41918b9a402560e7bef.tar.bz2 ampache-79316acb81fe9215b09ec41918b9a402560e7bef.zip | |
fixed find album art, including a fix from Karl Hungus... seriously I am not making that name up
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_album_art.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_big_art.inc.php (renamed from templates/show_big_art.inc) | 10 | ||||
| -rw-r--r-- | templates/show_get_albumart.inc.php | 4 | ||||
| -rw-r--r-- | templates/sidebar_browse.inc.php | 15 |
4 files changed, 19 insertions, 14 deletions
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index a13f15e1..49e92809 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -32,7 +32,7 @@ while ($i <= $rows) { $j=0; while ($j < 4) { $key = $i*4+$j; - $image_url = conf('web_path') . '/image.php?type=session&image_index=' . $key; + $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; if (!isset($images[$key])) { echo "<td> </td>\n"; } else { ?> @@ -41,7 +41,7 @@ while ($i <= $rows) { <img src="<?php echo $image_url; ?>" border="0" height="175" width="175" /><br /> </a> <p align="center"> - [<a href="<?php echo conf('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>] + [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>] </p> </td> <?php diff --git a/templates/show_big_art.inc b/templates/show_big_art.inc.php index f9f84bcc..009a0daa 100644 --- a/templates/show_big_art.inc +++ b/templates/show_big_art.inc.php @@ -19,19 +19,19 @@ */ -$htmllang = str_replace("_","-",conf('lang')); +$htmllang = str_replace("_","-",Config::get('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> -<link rel="shortcut icon" href="<?php echo conf('web_path'); ?>/favicon.ico" /> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" /> -<title><?php echo conf('site_title'); ?> - <?php echo _("Album Art"); ?></title> +<link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> +<meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> +<title><?php echo Config::get('site_title'); ?> - <?php echo _("Album Art"); ?></title> </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') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" border=\"0\" />"; +echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" border=\"0\" />"; echo "</a>"; ?> </body> diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php index 3375ae18..7d2bd475 100644 --- a/templates/show_get_albumart.inc.php +++ b/templates/show_get_albumart.inc.php @@ -21,7 +21,7 @@ */ ?> <?php show_box_top(_('Customize Search')); ?> -<form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo conf('web_path'); ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>&artist_name=<?php echo $_REQUEST['artist_name'];?>&album_name=<?php echo $_REQUEST['album_name']; ?>&cover=<?php echo scrub_out($_REQUEST['cover']); ?>" style="Display:inline;"> +<form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>&artist_name=<?php echo $_REQUEST['artist_name'];?>&album_name=<?php echo $_REQUEST['album_name']; ?>&cover=<?php echo scrub_out($_REQUEST['cover']); ?>" style="Display:inline;"> <table> <tr> </tr> @@ -62,7 +62,7 @@ <td> <input type="hidden" name="action" value="find_art" /> <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> - <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo conf('max_upload_size'); ?>" /> + <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo Config::get('max_upload_size'); ?>" /> <input type="submit" value="<?php echo _('Get Art'); ?>" /> </td> </tr> diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php index d7cada27..dc669c3f 100644 --- a/templates/sidebar_browse.inc.php +++ b/templates/sidebar_browse.inc.php @@ -1,12 +1,17 @@ <?php $ajax_info = Config::get('ajax_url'); ?> <h4><?php echo _('Browse By'); ?></h4> -<form id="browse_type" name="browse_type" action="<?php echo Config::get('web_path'); ?>/browse.php" method="post"> +<?php + // Build the selected dealie + $text = scrub_in($_REQUEST['action']) . '_ac'; + ${$text} = ' selected="selected"'; +?> +<form id="browse_type" name="browse_type" action="<?php echo Config::get('web_path'); ?>/browse.php" method="get"> <select name="action" onchange="document.getElementById('browse_type').submit();" > <option value="">-- <?php echo _('Type'); ?> --</option> - <option value="song"><?php echo _('Song Title'); ?></option> - <option value="album"><?php echo _('Albums'); ?></option> - <option value="artist"><?php echo _('Artist'); ?></option> - <option value="genre"><?php echo _('Genre'); ?></option> + <option value="song"<?php echo $song_ac; ?>><?php echo _('Song Title'); ?></option> + <option value="album"<?php echo $album_ac; ?>><?php echo _('Albums'); ?></option> + <option value="artist"<?php echo $artist_ac; ?>><?php echo _('Artist'); ?></option> + <option value="genre"<?php echo $genre_ac; ?>><?php echo _('Genre'); ?></option> </select> </form> <hr /> |