[Slim-Checkins] r11377 - in /trunk/server/HTML: EN/hreftemplate Fishbone/html/ajax.js Fishbone/status_header.html

[kdf at svn.slimdevices.com]

Author: kdf
Date: Fri Feb  9 19:24:07 2007
New Revision: 11377

URL: http://svn.slimdevices.com?rev=11377&view=rev
Log:
Bug: 4753
Description: add link for year, fix artist and album remove links. update album-based links only when album info is present


Modified:
    trunk/server/HTML/EN/hreftemplate
    trunk/server/HTML/Fishbone/html/ajax.js
    trunk/server/HTML/Fishbone/status_header.html

Modified: trunk/server/HTML/EN/hreftemplate
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/hreftemplate?rev=11377&r1=11376&r2=11377&view=diff
==============================================================================
--- trunk/server/HTML/EN/hreftemplate (original)
+++ trunk/server/HTML/EN/hreftemplate Fri Feb  9 19:24:07 2007
@@ -2,6 +2,7 @@
 [% 
 playerURI = player | uri;
 albumHRef = "href=\"${webroot}browsedb.html?hierarchy=album,track&level=1&album.id=$itemobj.album.id&player=$playerURI\"";
+yearHRef = "href=\"${webroot}browsedb.html?hierarchy=year,album,track&level=1&year.id=$itemobj.year&player=$playerURI\"";
 songinfoHRef = "href=\"${webroot}songinfo.html?item=$itemobj.id&player=$playerURI\"";
 browseDbHRef = "href=\"${webroot}browsedb.html?hierarchy=$hierarchy&level=$level$attributes&player=$playerURI\" target=\"browser\"";
 coverArtHRef = "href=\"/music/$coverArt/cover.jpg\"";

Modified: trunk/server/HTML/Fishbone/html/ajax.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/html/ajax.js?rev=11377&r1=11376&r2=11377&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/html/ajax.js (original)
+++ trunk/server/HTML/Fishbone/html/ajax.js Fri Feb  9 19:24:07 2007
@@ -281,10 +281,11 @@
 		if (parsedData['albumid']) {
 			refreshHrefElement('albumhref', parsedData['albumid'],"album.id=");
 			refreshHrefElement('coverhref', parsedData['albumid'],"album.id=");
-		}
-		refreshHrefElement('removealbumhref', parsedData['album'],"p4=");
-		refreshHrefElement('removeartisthref', parsedData['artist'],"p3=");
+			refreshHrefElement('removealbumhref', parsedData['albumid'],"album.id=");
+		}
+		refreshHrefElement('removeartisthref', parsedData['artistid'],"contributor.id=");
 		refreshHrefElement('songtitlehref', parsedData['songtitleid'],"item=");
+		refreshHrefElement('yearhref', parsedData['year'],"year.id=");
 		refreshHrefElement('zaphref', parsedData['thissongnum']-1,"p2=");
 		currentID = parsedData['songtitleid'];
 	}
@@ -298,7 +299,7 @@
 	}
 	
 	if (newsong) {
-		var elems = ['duration', 'bitrate', 'year'];
+		var elems = ['duration', 'bitrate'];
 		for (var i=0; i < elems.length; i++) {
 			var key = elems[i];
 			if (parsedData[key] && parsedData[key] != 0) {
@@ -312,9 +313,11 @@
 		if(parsedData['album']) {
 			showElements(['albuminfo']);
 			showElements(['albumhref'], 'inline');
+			showElements(['yearinfo'], 'inline');
 			refreshElement('album', parsedData['album']);
-		} else {
-			hideElements(['albuminfo', 'albumhref']);
+			refreshElement('year', parsedData['year']);
+		} else {
+			hideElements(['albuminfo', 'albumhref', 'yearinfo']);
 		}
 		
 		if(parsedData['artist']) {

Modified: trunk/server/HTML/Fishbone/status_header.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/status_header.html?rev=11377&r1=11376&r2=11377&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/status_header.html (original)
+++ trunk/server/HTML/Fishbone/status_header.html Fri Feb  9 19:24:07 2007
@@ -51,7 +51,7 @@
 [% END %]
 
 [% BLOCK remove %]
-	<a class="label" href="[% statusroot %]?p0=playlist&amp;p1=deletealbum&amp;p2=&amp;[% param %]=[% value | uri %]&amp;player=[% playerURI %]" title='[% "REMOVE_FROM_PLAYLIST" | string %]'>[x]</a>
+	<a class="label" href="[% statusroot %]?command=playlist&amp;subcommand=deletetracks&amp;[% param %]=[% value | uri %]&amp;player=[% playerURI %]" title='[% "REMOVE_FROM_PLAYLIST" | string %]'>[x]</a>
 [% END %]
 
 [% END -%]
@@ -140,11 +140,12 @@
 				<div id="songtitlehref" class="currentSongData"><a class="songtitle" [% songinfoHRef %] target="browser"><span id="songtitle">[% songtitle %]</span></a>
 				&nbsp;<span id="duration">[% IF itemobj.duration %]([% itemobj.duration | html %])[% END %]</span>&nbsp;<span id="bitrate">[% IF bitrate %]([% bitrate %])[% END %]</span></div>
 				
-				<div id="artistinfo" class="label">[% "ARTIST" | string %]&nbsp;<span id="removeartisthref">[% PROCESS remove param="p3" value = "$itemobj.artist" %]</span></div>
+				<div id="artistinfo" class="label">[% "ARTIST" | string %]&nbsp;<span id="removeartisthref">[% PROCESS remove param="contributor.id" value = "$itemobj.artist.id" %]</span></div>
 				<span id="artisthtml">[% PROCESS artistsAsHTML.html noby=1 %]</span>
 				
-				<div id="albuminfo" class="label">[% "ALBUM" | string %]&nbsp;<span id="removealbumhref">[% PROCESS remove param="p3=&amp;p4" value = "$itemobj.album.title" %]</span></div>
-				<span id="albumhref"><a [% albumHRef %] target="browser"><span id="album">[% itemobj.album.title | html %]</span></a>&nbsp;<span id="year">[% IF itemobj.year %]([% itemobj.year %])[% END %]</span></span>
+				<div id="albuminfo" class="label">[% "ALBUM" | string %]&nbsp;<span id="removealbumhref">[% PROCESS remove param="album.id" value = "$itemobj.album.id" %]</span></div>
+				<span id="albumhref"><a [% albumHRef %] target="browser"><span id="album">[% itemobj.album.title | html %]</span></a>&nbsp;
+				<span id="yearinfo">(<span id="yearhref"><a [% yearHRef %] target="browser"><span id="year">[% itemobj.year %]</span></a></span>)</span></span>
 			</div>
 		</div>