diff options
| -rw-r--r-- | albums.php | 25 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | stats.php | 15 | ||||
| -rw-r--r-- | templates/show_all_popular.inc.php | 1 | ||||
| -rw-r--r-- | templates/show_box.inc.php | 7 | ||||
| -rw-r--r-- | templates/show_index.inc.php | 25 | ||||
| -rw-r--r-- | themes/classic/templates/default.css | 3 |
7 files changed, 44 insertions, 33 deletions
@@ -91,6 +91,8 @@ switch ($action) { // get the Album information $album = new Album($_REQUEST['album_id']); + $images = array(); + $cover_url = array(); // If we've got an upload ignore the rest and just insert it if (!empty($_FILES['file']['tmp_name'])) { @@ -138,20 +140,21 @@ switch ($action) { } $images = array_merge($cover_url,$images); - // We don't want to store raw's in here so we need to strip them out into a seperate array - foreach ($images as $index=>$image) { - if (isset($image['raw'])) { - //unset($images[$index]); - $images[$index]['raw'] = ''; - } - } - - // Store the results for further use - $_SESSION['form']['images'] = $images; - + // If we've found anything then go for it! if (count($images)) { + // We don't want to store raw's in here so we need to strip them out into a seperate array + foreach ($images as $index=>$image) { + if (isset($image['raw'])) { + //unset($images[$index]); + $images[$index]['raw'] = ''; + } + } // end foreach + + // Store the results for further use + $_SESSION['form']['images'] = $images; require_once(conf('prefix') . '/templates/show_album_art.inc.php'); } + // Else nothing else { show_confirmation(_('Album Art Not Located'),_('Album Art could not be located at this time. This may be due to write access error, or the file is not received corectly.'),"/albums.php?action=show&album=" . $album->id); } diff --git a/docs/CHANGELOG b/docs/CHANGELOG index e8aa8a48..950b3701 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.3.3 + - Improve speed, sanity of single album art search - Fixed a logic issue with force_http_play - Improved performance of Amazon album art search by reducing the queries made on gather album art @@ -56,12 +56,15 @@ switch ($action) { require_once(conf('prefix') . '/templates/show_user_stats.inc.php'); - /* Build Recommendations from Ratings */ - $recommended_artists = $working_user->get_recommendations('artist'); - $recommended_albums = $working_user->get_recommendations('albums'); - $recommended_songs = $working_user->get_recommendations('song'); - - require_once(conf('prefix') . '/templates/show_user_recommendations.inc.php'); + // Onlu do this is ratings are on + if (conf('ratings')) { + /* Build Recommendations from Ratings */ + $recommended_artists = $working_user->get_recommendations('artist'); + $recommended_albums = $working_user->get_recommendations('albums'); + $recommended_songs = $working_user->get_recommendations('song'); + + require_once(conf('prefix') . '/templates/show_user_recommendations.inc.php'); + } // if ratings on show_box_top(); /* Show Most Popular artist/album/songs */ diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index e9f12a5c..51ace405 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -44,3 +44,4 @@ <?php show_info_box(_('Most Popular Tags'),'tags',$tags); ?> </td> </tr> +<tr><td colspan="2"> </td></tr> diff --git a/templates/show_box.inc.php b/templates/show_box.inc.php index 6be8f960..5f9553c8 100644 --- a/templates/show_box.inc.php +++ b/templates/show_box.inc.php @@ -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 @@ -21,7 +20,7 @@ */ ?> <span class="box-title"><?php echo $title; ?></span> - <ol> + <ol class="box-list"> <?php if (count($items)) { ?> <?php foreach ($items as $item) { diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 7591fed0..0522dcb4 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -23,21 +23,22 @@ <?php show_now_playing(); ?> </div> <!-- Close Now Playing Div --> <!-- Recently Played --> -<div id="catalog_info"> - <?php - $data = show_local_catalog_info(); - if (count($data)) { show_local_catalog_info(); } - ?> -</div> -<div id="recently_played"> - <?php - $data = get_recently_played(); - if (count($data)) { require_once(conf('prefix') . '/templates/show_recently_played.inc.php'); } - ?> -</div> <div id="random_selection"> <?php $albums = get_random_albums('6'); if (count($albums)) { require_once(conf('prefix') . '/templates/show_random_albums.inc.php'); } ?> </div> +<div id="recently_played"> + <?php + $data = get_recently_played(); + if (count($data)) { require_once(conf('prefix') . '/templates/show_recently_played.inc.php'); } + ?> +</div> +<div id="catalog_info"> + <?php + $data = show_local_catalog_info(); + if (count($data)) { show_local_catalog_info(); } + ?> +</div> + diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index 07588165..87a3b9d3 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -364,6 +364,9 @@ span.five-stars:hover { width: 80px; } font-size: 1.05em; font-weight: bold; } +.box-list { + padding-right: 10px; +} /* Enclosing Boxes Styles */ .box-left-top { |