r10155 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller root/artist root/css root/releases

[root-97]

Author: acid2
Date: 2008-07-23 15:56:55 +0000 (Wed, 23 Jul 2008)
New Revision: 10155

Added:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/CdToc.pm
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm
   mb_server/branches/TemplateToolkit/root/artist/header.tt
   mb_server/branches/TemplateToolkit/root/css/release.css
   mb_server/branches/TemplateToolkit/root/releases/full.tt
Log:
Disc IDs on release listing

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/CdToc.pm

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm 2008-07-23 15:20:40 UTC (rev 10154)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm 2008-07-23 15:56:55 UTC (rev 10155)
@@ -180,7 +180,18 @@
 
         push @{ $c->stash->{tracks} }, $trackStash;
     }
+    
+    my $discids = $release->GetDiscIDs;
+    $c->stash->{release}->{disc_ids} = [ map {
+        my $cdtoc = $_->GetCDTOC;
 
+        {
+            mbid      => $cdtoc->GetDiscID,
+            duration  => MusicBrainz::Server::Track::FormatTrackLength($cdtoc->GetLeadoutOffset / 75 * 1000),
+            link_type => 'cdtoc',
+        }
+    } @$discids ];
+
     # Release Events
     my @events = $release->ReleaseEvents(1);
 
@@ -193,8 +204,8 @@
         my $cid = $event_stash->{country};
         $event_stash->{country} = (
             $county_names{$cid} ||= do {
-                my $c = $country_obj->newFromId($cid);
-                $c ? $c->GetName : "?";
+                my $country = $country_obj->newFromId($cid);
+                $country ? $country->GetName : "?";
             }
         );
 

Modified: mb_server/branches/TemplateToolkit/root/artist/header.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/header.tt 2008-07-23 15:20:40 UTC (rev 10154)
+++ mb_server/branches/TemplateToolkit/root/artist/header.tt 2008-07-23 15:56:55 UTC (rev 10155)
@@ -1,5 +1,5 @@
 [%- info_links = [
-     { link => entity_url(artist, 'perma'), text => "Permenant link" },
+     { link => entity_url(artist, 'perma'), text => "Permanent link" },
      { link => entity_url(artist, 'details'), text => "Details" },
      { link => entity_url(artist, 'aliases'), text => "Aliases" },
      { link => entity_url(artist, 'tags'), text => "Tags" },

Modified: mb_server/branches/TemplateToolkit/root/css/release.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/css/release.css 2008-07-23 15:20:40 UTC (rev 10154)
+++ mb_server/branches/TemplateToolkit/root/css/release.css 2008-07-23 15:56:55 UTC (rev 10155)
@@ -16,6 +16,23 @@
     padding: 2px 4px;
 }
 
+div.release_discids table {
+    border-collapse: collapse;
+}
+
+div.release_discids tr {
+    border-top: 1px solid #000;
+    background: #FFECD6;
+}
+
+div.release_discids td {
+    padding: 2pt 3pt;
+}
+
+div.release_discids table td.duration {
+    width: 20pt;
+}
+
 div.release {
     position: relative;
     border: 1px solid #000;

Modified: mb_server/branches/TemplateToolkit/root/releases/full.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/releases/full.tt 2008-07-23 15:20:40 UTC (rev 10154)
+++ mb_server/branches/TemplateToolkit/root/releases/full.tt 2008-07-23 15:56:55 UTC (rev 10155)
@@ -88,6 +88,19 @@
   </table>
   [% INCLUDE "releases/box-summary.tt" %]
 
+  [%- IF release.disc_ids.size -%]
+  <div class="release_discids">
+    <table style="width: 100%">
+    [%- FOREACH discid = release.disc_ids -%]
+      <tr>
+        <td>Disc ID: <a href="[% entity_url(discid, 'show') %]">[% discid.mbid %]</a></td>
+        <td style="width: 20pt;">[% discid.duration %]</td>
+      </tr>
+    [%- END -%]
+    </table>
+  </div>
+  [%- END -%]
+
   <div class="release_events">
     <table>
       <thead>


_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits