[Slim-Checkins] r10571 - in /branches/6.5/server: Changelog6.html HTML/EN/ajaxRequest.txt HTML/Nokia770/cmdwrappers HTML/Nokia770/playlist.js

[kdf at svn.slimdevices.com]

Author: kdf
Date: Thu Nov  2 21:17:57 2006
New Revision: 10571

URL: http://svn.slimdevices.com?rev=10571&view=rev
Log:
Bug: 4446
Description: merge -r 10538:10539 and 10569:10570 from trunk


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/HTML/EN/ajaxRequest.txt
    branches/6.5/server/HTML/Nokia770/cmdwrappers
    branches/6.5/server/HTML/Nokia770/playlist.js

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Thu Nov  2 21:17:57 2006
@@ -110,6 +110,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4430">#4430</a> - Snow.pm loading Text Display on all player types</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4431">#4431</a> - Scanner fills up FileCache, causing disk issues and slows scanning speed.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4432">#4432</a> - Purge of FileCache stalls slimserver for large collections</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4446">#4446</a> - Current playlist page in Nokia770 skin doesn't show multiple artists</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4447">#4447</a> - lowercase tooltips</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4450">#4450</a> - With the Nokia770 skin, the genre hyperlink on the track info page doesn't filter by genre</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4457">#4457</a> - Nokia770 song info page doesn't delimit multiple artists with a comma</li>

Modified: branches/6.5/server/HTML/EN/ajaxRequest.txt
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/ajaxRequest.txt?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- branches/6.5/server/HTML/EN/ajaxRequest.txt (original)
+++ branches/6.5/server/HTML/EN/ajaxRequest.txt Thu Nov  2 21:17:57 2006
@@ -57,7 +57,7 @@
 [%- END %]
 item_[% item.num %]|[% item.item %]
 title_[% item.num %]|[% item.title %]
-artist_[% item.num %]|[% item.artist.name %]
+artist_[% item.num %]|[% PROCESS artistsAsHTML.html itemobj = item.itemobj notarget=1 %]
 album_[% item.num %]|[% item.album.title %]
 artistid_[% item.num %]|[% item.itemobj.artist.id %]
 albumid_[% item.num %]|[% item.itemobj.album.id %]

Modified: branches/6.5/server/HTML/Nokia770/cmdwrappers
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/cmdwrappers?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/cmdwrappers (original)
+++ branches/6.5/server/HTML/Nokia770/cmdwrappers Thu Nov  2 21:17:57 2006
@@ -190,10 +190,9 @@
 
 [% BLOCK ajax_by_from_info %]
 	<span class = 'smalltext' id = 'byfrominfo_[% item.num %]'>
-	[% IF item.includeArtist && item.artist && item.artist != item.noArtist %]
-		[% "BY" | string %]
-		<a href="[% webroot %]browsedb.html?hierarchy=contributor,album,track&amp;contributor.id=[% item.itemobj.artist.id %]&amp;level=1&amp;player=[% playerURI %]" id = 'artistlink_[% item.num %]'>[% item.artist.name %]</a>
-	[% END %]
+	<span id = 'artist_[% item.num %]'>
+		[% PROCESS artistsAsHTML.html %]
+	</span>
 	[% IF item.includeAlbum && item.album && item.album != item.noAlbum %]
 		[% "FROM" | string %]
 		<i><a [% PROCESS albumItemHRef %] id = 'albumlink_[% item.num %]'> [% item.itemobj.album.title | html %] </a></i>

Modified: branches/6.5/server/HTML/Nokia770/playlist.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/playlist.js?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/playlist.js (original)
+++ branches/6.5/server/HTML/Nokia770/playlist.js Thu Nov  2 21:17:57 2006
@@ -71,7 +71,6 @@
 	var parsedData = fillDataHash(theData);
 	// items to refresh: tracklink, artistlink, albumlink
 	var linkIds = { tracklink:  { id:'tracklink_', stub:trackHrefTemplate, replaceString: 'ITEM', key: 'item_', inner: 'title_'},
-			artistlink: { id: 'artistlink_', stub:artistHrefTemplate, replaceString: 'ARTIST', key: 'artistid_', inner: 'artist_'},
 			albumlink:  { id: 'albumlink_', stub:albumHrefTemplate, replaceString: 'ALBUM', key: 'albumid_', inner: 'album_'}};
 	for (obj in linkIds) {
 		var thisId = linkIds[obj].id + r.toString();		
@@ -87,6 +86,7 @@
 			$(thisId).innerHTML = innerText;
 		}
 	}
+	refreshElement('artist_' + r.toString(),parsedData['artist_0']);
 	refreshItemClass(parsedData, r);
 }