[mb-commits] r9784 - in mb_server/branches/ReleaseTrack/htdocs: comp show/track

[root at musicbrainz.org]

Author: luks
Date: 2008-03-17 09:49:47 +0000 (Mon, 17 Mar 2008)
New Revision: 9784

Added:
   mb_server/branches/ReleaseTrack/htdocs/show/track/details.html
Modified:
   mb_server/branches/ReleaseTrack/htdocs/comp/tracktitle
   mb_server/branches/ReleaseTrack/htdocs/show/track/index.html
Log:
A little more user-friendly track page

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/tracktitle
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/tracktitle	2008-03-17 09:29:10 UTC (rev 9783)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/tracktitle	2008-03-17 09:49:47 UTC (rev 9784)
@@ -52,8 +52,9 @@
 	$m->out(qq!</a></td></tr>!);
 
 	# Info box, a) resolution b) start-end date c) track-type d) sortname
-	$m->out('<tr><td class="info">by <a href="/artist/'.$artist->GetMBId.'">');
-	$m->out($m->interp->apply_escapes($artist->GetName, 'h') . '</a><br />');
+	$m->out('<tr><td class="info">Artist: <a href="/artist/'.$artist->GetMBId.'">');
+	$m->out($m->interp->apply_escapes($artist->GetName, 'h') . '</a>, Length: ');
+	$m->out(MusicBrainz::Server::Track::FormatTrackLength($track->GetLength));
 	$m->out('</td></tr>');
 
 	# Row 2: non-editing links
@@ -62,6 +63,7 @@
     $m->out(qq!Info: [ !);
     </%perl>
     <& /comp/googlelink, search => [ $artist->GetName, $track->GetName ], text => "Search Google" &>
+        | <a href="/show/track/details.html?trackid=<% $track->GetId %>">Details</a>
         | <a href="/show/track/tags.html?id=<% $track->GetId %>">Tags</a>
         | <a href="/mod/search/pre/track.html?trackid=<% $track->GetId %>&amp;artistid=<% $artist->GetId %>">View track edits under current artist</a>
         | <a href="/mod/search/pre/track.html?trackid=<% $track->GetId %>">View all track edits</a>

Copied: mb_server/branches/ReleaseTrack/htdocs/show/track/details.html (from rev 9779, mb_server/branches/ReleaseTrack/htdocs/show/track/index.html)

Modified: mb_server/branches/ReleaseTrack/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/show/track/index.html	2008-03-17 09:29:10 UTC (rev 9783)
+++ mb_server/branches/ReleaseTrack/htdocs/show/track/index.html	2008-03-17 09:49:47 UTC (rev 9784)
@@ -92,10 +92,6 @@
 			);
 	}
 
-	my @TRM = MusicBrainz::Server::TRM->new($mb->{DBH})->GetTRMFromTrackId($track->GetId);
-	my @PUID = MusicBrainz::Server::PUID->new($mb->{DBH})->GetPUIDFromTrackId($track->GetId);
-
-
 	# load artist from trackartist
 	my $artist = $m->comp("/comp/loadartist", $mb, $track->GetArtist);
 
@@ -131,15 +127,32 @@
 
 	<& /comp/ar/RelationshipBox, id=>$track->GetId, type=>'track', name=>$track->GetName, isrelpage=>1 &>
 
-	<& /comp/trackinfo, track => $track, TRM => \@TRM, PUID => \@PUID &>
+	<h2>Releases</h2>
 
+	<table id="CompactReleaseList" width="100%">
+		<tr>
+			<th>Track#</th>
+			<th>Release</th>
+			<th>Artist</th>
+		</tr>
+%	my $rownum = 0;
 %	my $releases = $track->FindReleases;
-%	for my $rtrack (@$releases) {
-		<& /comp/releaseinfo, short => 1, release => $rtrack->GetRelease,
-			track => $track, trackseq => $rtrack->GetSequence &>
+%	my $release_artist;
+%	for my $release_track (@$releases) {
+%		my $release = $release_track->GetRelease;
+%		if (!defined($release_artist) || $release_artist->GetId != $release->GetArtist) {
+%			$release_artist = $m->comp("/comp/loadartist", $mb, $release->GetArtist);
+%		}
+		<tr class="<% $rownum++ % 2 ? 'ev' : 'od' %>">
+			<td><% $release_track->GetSequence %></td>
+			<td><& /comp/linkrelease, release => $release, strong => 0,
+				modpending => $release->GetModPending &></td>
+			<td><& /comp/linkartist, artist => $artist, strong => 0,
+				modpending => $artist->GetModPending &></td>
+		</tr>
 %	}
 
-	<& /comp/artistinfo, artist => $artist, short => 1, &>
+	</table>
 
 <& /comp/footer &>