[Slim-Checkins] r11801 - in /trunk/server: Changelog7.html HTML/EN/hreftemplate

[kdf at svn.slimdevices.com]

Author: kdf
Date: Mon Apr 23 19:35:06 2007
New Revision: 11801

URL: http://svn.slimdevices.com?rev=11801&view=rev
Log:
Bug: 4922
Description: block clear and download links if the playlist is empty, as they serve no function in this case and can cause odd results


Modified:
    trunk/server/Changelog7.html
    trunk/server/HTML/EN/hreftemplate

Modified: trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/trunk/server/Changelog7.html?rev=11801&r1=11800&r2=11801&view=diff
==============================================================================
--- trunk/server/Changelog7.html (original)
+++ trunk/server/Changelog7.html Mon Apr 23 19:35:06 2007
@@ -81,6 +81,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4516">#4516</a> - Enabling Playlists Breaks Search Results</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4678">#4578</a> - Localize DateTime screensaver</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4873">#4873</a> - Error creating INI entry in Logitech.url</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4922">#4922</a> - When PlayList is empty, Download brings up a blank web page and gets stuck there</li>
 </li>
 	<ul>
 		<li></li>

Modified: trunk/server/HTML/EN/hreftemplate
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/hreftemplate?rev=11801&r1=11800&r2=11801&view=diff
==============================================================================
--- trunk/server/HTML/EN/hreftemplate (original)
+++ trunk/server/HTML/EN/hreftemplate Mon Apr 23 19:35:06 2007
@@ -27,12 +27,12 @@
 
 [%#href for downloading the current playlist %]
 [% BLOCK downloadPlaylistLink; downloadString = "DOWNLOAD" | string -%]
-	[% "<a href=\"status.m3u?player=$playerURI\" target=\"";$target or 'playlist';"\">";img or downloadString;"</a>" -%]
+	[% IF playlist_items %][% "<a href=\"status.m3u?player=$playerURI\" target=\"";$target or 'playlist';"\">";img or downloadString;"</a>" -%][%- END %]
 [%- END %]
 
 [%# href for clear current playlist command %]
 [% BLOCK clearPlaylistLink; clearString = "CLEAR" | string -%]
-	[% "<a href=\"$statusroot?p0=playlist&amp;p1=clear&amp;player=$playerURI\" target=\"";$target or 'status';"\" >";img or clearString;"</a>" -%]
+	[% IF playlist_items %][% "<a href=\"$statusroot?p0=playlist&amp;p1=clear&amp;player=$playerURI\" target=\"";$target or 'status';"\" >";img or clearString;"</a>" -%][%- END %]
 [%- END %]
 
 [%# img tag for album thumbnail in the now playing status context %]