[mb-commits] r9902 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller root root/artist

[root at musicbrainz.org]

Author: acid2
Date: 2008-06-29 19:40:17 +0000 (Sun, 29 Jun 2008)
New Revision: 9902

Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
   mb_server/branches/TemplateToolkit/root/artist/show.tt
   mb_server/branches/TemplateToolkit/root/layout.tt
Log:
Made the show template much more like the compact view

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-06-29 17:26:40 UTC (rev 9901)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-06-29 19:40:17 UTC (rev 9902)
@@ -107,15 +107,15 @@
     #
     # Artist:
     $c->stash->{artist} = {
-	name => $artist->GetName,
-	type => MusicBrainz::Server::Artist::GetTypeName($artist->GetType) || '',
-	datespan => {
-	    start => $artist->GetBeginDate,
-	    end => $artist->GetEndDate
-	},
-	quality => ModDefs::GetQualityText($artist->GetQuality),
-        resolution => $artist->GetResolution,
-    };
+			      name => $artist->GetName,
+			      type => MusicBrainz::Server::Artist::GetTypeName($artist->GetType),
+			      datespan => {
+					      start => $artist->GetBeginDate,
+					      end => $artist->GetEndDate
+					  },
+			      quality => ModDefs::GetQualityText($artist->GetQuality),
+			      resolution => $artist->GetResolution,
+			  };
 
     # Releases, sorted into "release groups":
     $c->stash->{groups} = [];
@@ -130,22 +130,43 @@
 	if(not defined $currentGroup or $currentGroup->{type} != $type)
 	{
 	    $currentGroup = {
-			       name => $release->GetAttributeNamePlural($type),
-			       releases => [],
-			       type => $type
+			        name => $release->GetAttributeNamePlural($type),
+			        releases => [],
+			        type => $type
 			    };
 
 	    push @{$c->stash->{groups}}, $currentGroup;
 	}
 
+	my $language = {};
+	$language->{script} = defined $release->GetScript ? $release->GetScript->GetName : "";
+	$language->{language} = defined $release->GetLanguage ? $release->GetLanguage->GetName : "";
+	$language->{shortLanguage} = defined $release->GetLanguage ? $release->GetLanguage->GetISOCode3T : "";
+
 	my $rel = {
-	    title => $release->GetName,
-	    id => $release->GetMBId
-	};
+		      title => $release->GetName,
+		      id => $release->GetMBId,
+		      trackCount => $release->GetTrackCount,
+		      discIds => $release->GetDiscidCount,
+		      puids => $release->GetPuidCount,
+		      trms => $release->GetTrmidCount,
+		      quality => ModDefs::GetQualityText($release->GetQuality),
+		      language => $language,
+#		      releaseDate => ,
+		  };
 
+	$rel->{attributes} = [];
+	my $attributes = $release->GetAttributes;
+	
+	for my $attr ($attributes)
+	{
+	    push @{$rel->{attributes}}, $release->GetAttributeName($attr);
+	}
+
 	push @{$currentGroup->{releases}}, $rel;
     }
 
+    $c->error("");
     $c->stash->{template} = 'artist/show.tt';
 }
 

Modified: mb_server/branches/TemplateToolkit/root/artist/show.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/show.tt	2008-06-29 17:26:40 UTC (rev 9901)
+++ mb_server/branches/TemplateToolkit/root/artist/show.tt	2008-06-29 19:40:17 UTC (rev 9902)
@@ -1,4 +1,4 @@
-[% WRAPPER 'layout.tt' %]
+[% WRAPPER "layout.tt" title=artist.name %]
 
 [% info_links = [
      { link => "permalink", text => "Permenant Link" },
@@ -45,13 +45,36 @@
 <h1>Releases</h1>
 [% FOREACH group IN groups %]
   <h2>[% group.name %]</h2>
-  <ul>
-    [% FOREACH release IN group.releases %]
-      <li>
-      <a href="[% c.uri_for('/release', release.id) %]">[% release.title %]</a>
-      </li>
-    [% END %]
-  </ul>
+  <table>
+    <thead>
+      <tr>
+	<th>Tracks</th>
+	<th>Disc IDs</th>
+	<th>TRMs</th>
+	<th>PUIDs</th>
+	<th>Status</th>
+	<th>Release Date</th>
+	<th>Language</th>
+	<th>Title</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH release IN group.releases %]
+      <tr>
+        <td>[% release.trackCount %]</td>
+	<td>[% release.discIds %]</td>
+	<td>[% release.trms %]</td>
+	<td>[% release.puids %]</td>
+	<td>[% release.status %]</td>
+	<td>[% release.releaseDate %]</td>
+	<td>[% release.language.shortLanguage %]</td>
+	<td>
+          <a href="[% c.uri_for('/release', release.id) %]">[% release.title %]</a>
+        </td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
 [% END %]
 
 [% END %]

Modified: mb_server/branches/TemplateToolkit/root/layout.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout.tt	2008-06-29 17:26:40 UTC (rev 9901)
+++ mb_server/branches/TemplateToolkit/root/layout.tt	2008-06-29 19:40:17 UTC (rev 9902)
@@ -6,7 +6,7 @@
     <meta http-equiv="expires" content="1" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   
-    <title>[% template.title %]</title>
+    <title>[% title %][% " - " IF title %]MusicBrainz.org</title>
     
     <link rel="stylesheet" type="text/css" href="/static/main.css" />