Index: Slim/Web/Pages.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Web/Pages.pm,v
retrieving revision 1.5
diff -u -p -B -r1.5 Pages.pm
--- Slim/Web/Pages.pm	27 Jul 2004 23:45:15 -0000	1.5
+++ Slim/Web/Pages.pm	29 Jul 2004 00:45:04 -0000
@@ -1,6 +1,6 @@
 package Slim::Web::Pages;
 
-# $Id: Pages.pm,v 1.5 2004/07/27 23:45:15 dean Exp $
+# $Id: Pages.pm,v 1.4 2004/07/27 07:33:06 kdf Exp $
 # SlimServer Copyright (c) 2001-2004 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License, 
@@ -1634,7 +1634,6 @@ sub browseid3 {
 				$list_form{'genre'}	   = $genre;
 				$list_form{'artist'}       = $artist;
 				$list_form{'album'}	   = '*';
-				$list_form{'song'}	   = $song;
 				$list_form{'title'}        = string('ALL_SONGS');
 				$list_form{'descend'}      = 1;
 				$list_form{'player'}       = $player;
@@ -1657,7 +1656,6 @@ sub browseid3 {
 				$list_form{'genre'}	   = $genre;
 				$list_form{'artist'}       = $artist;
 				$list_form{'album'}	   = $item;
-				$list_form{'song'}	   = $song;
 				$list_form{'title'}        = $item;
 				$list_form{'descend'}      = $descend;
 				$list_form{'player'}       = $player;
@@ -1674,24 +1672,29 @@ sub browseid3 {
 				if ($params->{'artwork'}) {
 
 					my $song = Slim::Music::Info::pathFromAlbum($item);
-
+					my @songs;
 					if (defined $song) {
 						$list_form{'coverthumb'}   = 1; 
 						$list_form{'thumbartpath'} = $song;
 					} else {
 						$list_form{'coverthumb'}   = 0;
+						@songs = Slim::Music::Info::songs([$genre], [$artist], [$item], []);
+						$song = $songs[0];
 					}
-					$list_form{'item'}	   = $item;
+					$list_form{'year'}		 = Slim::Music::Info::year($song);
+					$list_form{'item'}		 = $item;
 					$list_form{'itemnumber'} = $itemnumber;
-					$list_form{'artwork'}    = 1;
-					$list_form{'size'}       = Slim::Utils::Prefs::get('thumbSize');
+					$list_form{'artwork'}	 = 1;
+					$list_form{'size'}		 = Slim::Utils::Prefs::get('thumbSize');
 
 					$itemnumber++;
 
 					$params->{'browse_list'} .= ${Slim::Web::HTTP::filltemplatefile("browseid3_artwork.html", \%list_form)};
 
 				} else {
-
+					my @songs = Slim::Music::Info::songs([$genre], [$artist], [$item], []);
+					my $song = $songs[0];
+					$list_form{'year'}		 = Slim::Music::Info::year($song);
 					$itemnumber++;
 					$params->{'browse_list'} .= ${Slim::Web::HTTP::filltemplatefile("browseid3_list.html", \%list_form)};
 				}
Index: HTML/Fishbone/browseid3_artwork.html
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/HTML/Fishbone/browseid3_artwork.html,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 browseid3_artwork.html
--- HTML/Fishbone/browseid3_artwork.html	6 Jul 2004 13:44:53 -0000	1.1.1.1
+++ HTML/Fishbone/browseid3_artwork.html	29 Jul 2004 00:45:04 -0000
@@ -2,8 +2,8 @@
 <table cellpadding="5" cellspacing="0" border="0" align="left">
 <tr>
 	<td>
-		[% IF coverthumb %]<table border="0" cellspacing="0" cellpadding="0"><tr><td width="[% size %]"><a href="browseid3.html?genre=*&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]&artwork=[% artwork %]" target="browser"><center><img src="/music/[% thumbartpath | uri %]/thumb.jpg" border="0" height="[% size %]" width="[% size %]" alt="[% item | html %]" title="[% item | html %]" onMouseOver="self.status=&quot;[% item | html %]&quot;;return true;"></a></td></tr></table>[% END %]
-		[% IF not coverthumb %]<table border="0" cellspacing="0" cellpadding="0" height="[% size %]"><tr><td width="[% size %]"><a href="browseid3.html?genre=*&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]&artwork=[% artwork %]" target="browser"><center>[% item | html %]</center></a></td><td><a href=""><img src="html/images/spacer.gif" border="0" height="[% size %]" width="0"></a></td></tr></table>[% END %]
+		[% IF coverthumb %]<table border="0" cellspacing="0" cellpadding="0"><tr><td width="[% size %]"><a href="browseid3.html?genre=*&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]&artwork=[% artwork %]" target="browser"><center><img src="/music/[% thumbartpath | uri %]/thumb.jpg" border="0" height="[% size %]" width="[% size %]" alt="[% item | html %][% IF year %] ([% year %])[% END %]" title="[% item | html %][% IF year %] ([% year %])[% END %]" onMouseOver="self.status=&quot;[% item | html %]&quot;;return true;"></a></td></tr></table>[% END %]
+		[% IF not coverthumb %]<table border="0" cellspacing="0" cellpadding="0" height="[% size %]"><tr><td width="[% size %]"><a href="browseid3.html?genre=*&artist=[% artist | uri %]&album=[% album | uri %]&player=[% player | uri %]&artwork=[% artwork %]" target="browser"><center>[% item | html %][% IF year %] ([% year %])[% END %]</center></a></td><td><a href=""><img src="html/images/spacer.gif" border="0" height="[% size %]" width="0"></a></td></tr></table>[% END %]
 	</td>
 </tr>
 <tr>
Index: HTML/Fishbone/browseid3_list.html
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/HTML/Fishbone/browseid3_list.html,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 browseid3_list.html
--- HTML/Fishbone/browseid3_list.html	6 Jul 2004 13:44:53 -0000	1.1.1.1
+++ HTML/Fishbone/browseid3_list.html	29 Jul 2004 00:45:04 -0000
@@ -1,7 +1,7 @@
 <tr>
 	<td  class="listing">&nbsp;
 		[% IF anchor %]<a name="[% anchor %]"></a>[% END %]
-		[% IF descend %]<a href="browseid3.html?song=[% song | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&genre=[% genre | uri %]&player=[% player | uri %]" title='Descend' ><font style="color:yellow">+ </font>[% title %]</a>  [% END %]
+		[% IF descend %]<a href="browseid3.html?song=[% song | uri %]&artist=[% artist | uri %]&album=[% album | uri %]&genre=[% genre | uri %]&player=[% player | uri %]" title='Descend' ><font style="color:yellow">+ </font>[% title %][% IF year %] ([% year %])[% END %]</a>  [% END %]
 		[% IF not descend %]<b><a href="songinfo.html?itempath=[% itempath | uri %]&player=[% player | uri %]">[% title %]</a></b>
 			[% IF includeArtist && artist %][% "BY" | string %]
 				<a href="browseid3.html?genre=*&artist=[% artist | uri %]&player=[% player | uri %]" target="browser">[% artist %]</a>