[mb-commits] r10144 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server lib/MusicBrainz/Server/Adapter lib/MusicBrainz/Server/Controller root/artist root/components root/css root/label root/static
root at musicbrainz.org
root at musicbrainz.org
Mon Jul 21 23:12:47 UTC 2008
Author: acid2
Date: 2008-07-21 23:12:47 +0000 (Mon, 21 Jul 2008)
New Revision: 10144
Modified:
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Adapter/Relations.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Label.pm
mb_server/branches/TemplateToolkit/root/artist/compact.tt
mb_server/branches/TemplateToolkit/root/artist/full.tt
mb_server/branches/TemplateToolkit/root/artist/header.tt
mb_server/branches/TemplateToolkit/root/components/relations.tt
mb_server/branches/TemplateToolkit/root/css/entity.css
mb_server/branches/TemplateToolkit/root/css/layout.css
mb_server/branches/TemplateToolkit/root/css/release.css
mb_server/branches/TemplateToolkit/root/label/header.tt
mb_server/branches/TemplateToolkit/root/label/show.tt
mb_server/branches/TemplateToolkit/root/static/main.css
Log:
Bit more beauty
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Adapter/Relations.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Adapter/Relations.pm 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Adapter/Relations.pm 2008-07-21 23:12:47 UTC (rev 10144)
@@ -224,17 +224,36 @@
sub ExportLinks
{
my $links = shift;
+
+ sub require_new_group
+ {
+ my ($current_group, $relation) = @_;
+
+ if (not defined $current_group or
+ $current_group->{connector} ne $relation->{link_phrase} or
+ $current_group->{start_date} ne $relation->{begindate} or
+ $current_group->{end_date} ne $relation->{enddate})
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ };
my @stashData;
my $currentGroup = undef;
for my $link (@$links)
{
- if(not defined $currentGroup or $currentGroup->{connector} ne $link->{link_phrase})
+ if (require_new_group($currentGroup, $link))
{
$currentGroup = {
- connector => $link->{link_phrase},
- type => $link->{link_type},
- entities => []
+ connector => $link->{link_phrase},
+ type => $link->{link_type},
+ start_date => $link->{begindate},
+ end_date => $link->{enddate},
+ entities => [],
};
push @stashData, $currentGroup;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Artist.pm 2008-07-21 23:12:47 UTC (rev 10144)
@@ -191,40 +191,41 @@
sub ExportStash
{
- my $self = shift;
- my @data = @_;
+ my ($self, @data) = @_;
- my %dataHash;
- for (@data) { $dataHash{$_} = 1 }
-
my $ret = {};
- $ret->{mbid} = $self->GetMBId if $dataHash{'mbid'};
- $ret->{type} = GetTypeName($self->GetType) if $dataHash{'type'};
- $ret->{resolution} = $self->GetResolution if $dataHash{'resolution'};
+ $ret->{mbid} = $self->GetMBId;
+ $ret->{name} = $self->GetName;
$ret->{link_type} = 'artist';
- if($dataHash{'name'})
+ use Switch;
+ for my $data_item (@data)
{
- $ret->{name} = $self->GetName;
- $ret->{sortname} = $self->GetSortName;
- }
+ switch ($data_item)
+ {
+ case ('name') { $ret->{sortname} = $self->GetSortName; }
+ case ('type') { $ret->{type} = GetTypeName($self->GetType); }
+ case ('resolution') { $ret->{resolution} = $self->GetResolution; }
- if($dataHash{'quality'})
- {
- $ret->{quality} = {
- quality => ModDefs::GetQualityText($self->GetQuality),
- mp => $self->GetQualityModPending
+ case ('quality')
+ {
+ $ret->{quality} = {
+ quality => ModDefs::GetQualityText($self->GetQuality),
+ mp => $self->GetQualityModPending
+ };
+ }
+
+ case ('date')
+ {
+ $ret->{datespan} = {
+ start => $self->GetBeginDate,
+ end => $self->GetEndDate,
+ complete => $self->GetBeginDate && $self->GetEndDate,
+ };
+ }
}
}
- if($dataHash{'date'})
- {
- $ret->{datespan} = {
- start => $self->GetBeginDate,
- end => $self->GetEndDate
- };
- }
-
return $ret;
}
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-07-21 23:12:47 UTC (rev 10144)
@@ -62,6 +62,7 @@
}
else
{
+ $c->response->status(404);
croak "No MBID/row ID given.";
}
}
@@ -173,7 +174,7 @@
if ($c->form_posted)
{
- if (my $mods = $form->update_from_form ($c->req->params))
+ if (my $mods = $form->update_from_form($c->req->params))
{
$c->flash->{ok} = "Thanks! The artist has been added to the " .
"database, and we have redirected you to " .
@@ -283,8 +284,6 @@
my $group;
for my $release (@rawReleases)
{
- die "No release" unless defined $release;
-
if (not defined $group or $release->{linkphrase} ne $group->{phrase})
{
$group = {
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Label.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Label.pm 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Label.pm 2008-07-21 23:12:47 UTC (rev 10144)
@@ -342,7 +342,7 @@
Export data from a release to store in stash.
We can't just use $release->ExportStash as this doesn't give us the
-artist name/mbid.
+catalog number - which is loaded if you load via a label.
=cut
@@ -350,7 +350,7 @@
{
my $release = shift;
- my $stash = $release->ExportStash qw/language type first_date/;
+ my $stash = $release->ExportStash qw/track_count language type first_date/;
$stash->{artist} = {
name => $release->{artistname},
Modified: mb_server/branches/TemplateToolkit/root/artist/compact.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/compact.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/artist/compact.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -1,11 +1,11 @@
[%- WRAPPER "artist/landing.tt" -%]
[%- FOREACH group IN groups -%]
<div>
- <div class="compactreleasetype">[% group.name | html %]</div>
+ <h2 class="compactreleasetype">[% group.name | html %]</h2>
<table class="releases">
<tbody>
[%- FOREACH release IN group.releases -%]
- <tr>
+ <tr[% ' class="odd"' IF loop.count % 2 == 0 %]>
<td class="tracks">[% release.track_count %] <img src="/static/images/notes.gif" alt="Tracks" /></td>
<td class="discids">[% release.disc_ids %] <img src="/static/images/cd.gif" alt="Disc IDs" /></td>
<td class="puids">[% release.puids %] <img src="/static/images/puid.gif" alt="PUIDs" /></td>
Modified: mb_server/branches/TemplateToolkit/root/artist/full.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/full.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/artist/full.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -1,6 +1,6 @@
[%- WRAPPER "artist/landing.tt" -%]
[%- FOREACH group IN groups -%]
- <div class="releasetype">[% group.name | html %]</div>
+ <h2 class="releasetype">[% group.name | html %]</h2>
[%- FOREACH release IN group.releases -%]
[%- INCLUDE "releases/release-box.tt" -%]
[%- END -%]
Modified: mb_server/branches/TemplateToolkit/root/artist/header.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/header.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/artist/header.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -12,16 +12,23 @@
<div class="entity_header">
- <div class="title">
- <span><img src="/static/images/aicon_lg.png"> [% INCLUDE "components/entity-link.tt" entity=artist noicon=1 %]</span>
+ <div class="title artist">
+ [% INCLUDE "components/entity-link.tt" entity=artist noicon=1 %]
+ [%- IF artist.resolution; "(${artist.resolution})" | html; END -%]
</div>
<div class="info">
- [%- IF artist.resolution -%]
- <p>[%- artist.resolution | html -%]</p>
- [%- END -%]
- Type: [%- artist.type -%], [%- artist.quality.quality -%] data quality<br />
- [% IF artist.sortname != artist.name %][% artist.sortname | html %][% END %]
+ [% IF artist.sortname != artist.name %][% artist.sortname | html %]<br />[% END %]
+
+ [%- IF artist.datespan.complete -%]
+ [% artist.datespan.start %] - [% artist.datespan.end %]<br/>
+ [%- ELSIF artist.datespan.start -%]
+ Began: [% artist.datespan.start -%]<br />
+ [%- ELSIF artist.datespan.end -%]
+ End: [% artist.datespan.end -%]<br />
+ [%- END -%]
+
+ Type: [%- artist.type -%], [%- artist.quality.quality -%] data quality<br />
</div>
<div class="infoLinks"> Info: [% INCLUDE "components/piped-list.tt" list=info_links %]</div>
Modified: mb_server/branches/TemplateToolkit/root/components/relations.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/components/relations.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/components/relations.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -1,36 +1,30 @@
[%- DEFAULT maximum=3 -%]
+[%- BLOCK relation_group -%]
+ [% ar.connector | html %]
+ [%- FOREACH entity IN ar.entities -%]
+ [%- IF loop.count > 4 && !showall -%]
+ …
+ [%- LAST -%]
+ [%- ELSE -%]
+ [%#- Has to be on one line so we don't mess up the spacing with the comma :x -%]
+ [%- INCLUDE "components/entity-link.tt" -%]
+ [%- " (${entity.resolution})" | html IF entity.resolution -%]
+ [%- loop.count == (loop.size - 1) ? " and " : !loop.last ? "," : "" -%]
+ [%- END -%]
+ [%- END -%]
+ [% "from ${ar.start_date}" IF ar.start_date %]
+ [% "until ${ar.end_date}" IF ar.end_date %]
+[%- END -%]
[%- BLOCK list -%]
[%- IF relations.size > 1 OR nocompact -%]
<ul class="relations_list">
[%- FOREACH ar IN relations -%]
[%- LAST IF loop.count > maximum && !showall -%]
- <li>
- [% ar.connector | html %]
- [%- FOREACH entity IN ar.entities -%]
- [%- IF loop.count > 4 && !showall -%]
- …
- [%- LAST -%]
- [%- ELSE -%]
- [% INCLUDE "components/entity-link.tt" %][% !loop.last ? "," : "" %]
- [% "(${entity.resolution})" | html IF entity.resolution %]
- [%- END -%]
- [%- END -%]
- </li>
+ <li>[%- PROCESS relation_group -%]</li>
[%- END -%]
</ul>
[%- ELSIF relations.size == 1 -%]
- [%- FOREACH ar IN relations -%]
- [% ar.connector | html %]
- [%- FOREACH entity IN ar.entities -%]
- [%- IF loop.count > 4 && !showall -%]
- …
- [%- LAST -%]
- [%- ELSE -%]
- [% INCLUDE "components/entity-link.tt" %][% !loop.last ? "," : "" %]
- [% "(${entity.resolution})" | html IF entity.resolution %]
- [%- END -%]
- [%- END -%]
- [%- END -%]
+ [%- PROCESS relation_group ar=relations -%]
[%- END -%]
[%- IF relations.size > maximum && !showall -%]
[%- n = relations.size - maximum -%]
Modified: mb_server/branches/TemplateToolkit/root/css/entity.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/css/entity.css 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/css/entity.css 2008-07-21 23:12:47 UTC (rev 10144)
@@ -14,19 +14,31 @@
padding-top: 5px;
}
+.entity_header .title,
+.entity_header .info {
+ padding-left: 45px;
+}
+
.entity_header div.title a {
color: #000;
+ font-size: 20pt;
}
+.entity_header .artist { background: url(/static/images/aicon_lg.png) no-repeat 5px top; }
+.entity_header .label { background: url(/static/images/licon_lg.png) no-repeat 5px top; }
+
.entity_header div.title {
- padding-left: 5px;
- font-size: 25pt;
+ font-size: 15pt;
+ color: #555;
+ min-height: 32px;
+ margin-bottom: 0;
+ padding-bottom: 0;
+ padding-top: 3px;
}
.entity_header div.info {
- padding-left: 5px;
- padding-top: 3px;
font-size: 8pt;
+ line-height: 10pt;
}
.infoLinks,
Modified: mb_server/branches/TemplateToolkit/root/css/layout.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/css/layout.css 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/css/layout.css 2008-07-21 23:12:47 UTC (rev 10144)
@@ -7,6 +7,7 @@
line-height: 1.5em;
margin: 0;
width: 100%;
+ background: #fff;
}
p {
Modified: mb_server/branches/TemplateToolkit/root/css/release.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/css/release.css 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/css/release.css 2008-07-21 23:12:47 UTC (rev 10144)
@@ -1,12 +1,13 @@
-div.compactreleasetype {
+h2.compactreleasetype {
color: #000;
font-weight: bold;
+ font-size: 12pt;
padding: 1pt 5pt;
background: url(/static/images/header-bg-orangefade.gif) repeat-y;
}
-div.releasetype {
+h2.releasetype {
background: #736DAB;
color: #FFF;
border: 1px solid #000;
@@ -109,6 +110,14 @@
*/
table.releases { width: 100%; }
+table.releases td,
+table.releases th {
+ padding-left: 10pt;
+ padding-right: 10pt;
+}
+
+table.releases tr.odd { background: #eee; }
+
table.releases .tracks,
table.releases .puids,
table.releases .discids {
@@ -120,12 +129,14 @@
table.releases .tracks { width: 30pt; }
table.releases .date,
-table.releases .status {
- width: 80pt;
+table.releases .status,
+table.releases .language {
+ width: 20pt;
text-align: center;
}
-table.releases .language {
- width: 40pt;
- text-align: center;
+table.releases .artist,
+table.releases .title,
+table.releases .catalog {
+ text-align: left;
}
Modified: mb_server/branches/TemplateToolkit/root/label/header.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/label/header.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/label/header.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -9,9 +9,19 @@
-%]
<div class="entity_header">
- <div class="title">
- <span><img src="/static/images/licon_lg.png"> [% INCLUDE "components/entity-link.tt" entity=label noicon=1 %]</span>
+ <div class="title label">
+ [% INCLUDE "components/entity-link.tt" entity=label noicon=1 %]
+ [% IF label.resolution; "(${label.resolution})" | html; END %]
</div>
+ <div class="info">
+ [%- IF label.datespan.complete -%]
+ [% label.datespan.start %] - [% label.datespan.end %]<br/>
+ [%- ELSIF label.datespan.start -%]
+ Began: [% label.datespan.start -%]<br />
+ [%- ELSIF label.datespan.end -%]
+ End: [% label.datespan.end -%]<br />
+ [%- END -%]
+ </div>
<div class="infoLinks"> Info: [% INCLUDE "components/piped-list.tt" list=info_links %]</div>
<div class="editLinks">
Edit:
Modified: mb_server/branches/TemplateToolkit/root/label/show.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/label/show.tt 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/label/show.tt 2008-07-21 23:12:47 UTC (rev 10144)
@@ -2,35 +2,35 @@
[%- INCLUDE "label/header.tt" -%]
[%- INCLUDE "components/relations.tt" source=label -%]
-<h2>Releases</h2>
-<table class="releaselist">
+<h2 class="compactreleasetype">Releases</h2>
+<table class="releases">
<thead>
<tr>
- <th></th>
- <th>Status</th>
- <th>Language</th>
- <th>Date</th>
- <th>Catalog #</th>
- <th>Artist</th>
- <th>Title</th>
+ <th class="tracks"></th>
+ <th class="status">Status</th>
+ <th class="language">Language</th>
+ <th class="date">Date</th>
+ <th class="catalog">Catalog #</th>
+ <th class="artist">Artist</th>
+ <th class="title">Title</th>
</tr>
</thead>
<tbody>
[%- FOREACH release=releases -%]
- <tr>
- <td>[% release.track_count %]</td>
- <td>[% release.status %]</td>
- <td>
+ <tr[% ' class="odd"' IF loop.count % 2 == 0 %]>
+ <td class="tracks">[% release.track_count %] <img src="/static/images/notes.gif" alt="Tracks" /></td>
+ <td class="status">[% release.status %]</td>
+ <td class="language">
<abbr title="[% release.language.language %] / [% release.language.script %]">
[% release.language.shortLanguage %]
</abbr>
</td>
- <td>
+ <td class="date">
[% release.first_release_date | release_date %]
</td>
- <td>[% release.catalog_number %]</td>
- <td>[% INCLUDE "components/entity-link.tt" entity=release.artist %]</td>
- <td>[% INCLUDE "components/entity-link.tt" entity=release %]</td>
+ <td class="catalog">[% release.catalog_number %]</td>
+ <td class="artist">[% INCLUDE "components/entity-link.tt" entity=release.artist %]</td>
+ <td class="name">[% INCLUDE "components/entity-link.tt" entity=release %]</td>
</tr>
[%- END -%]
</tbody>
Modified: mb_server/branches/TemplateToolkit/root/static/main.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/static/main.css 2008-07-21 22:10:23 UTC (rev 10143)
+++ mb_server/branches/TemplateToolkit/root/static/main.css 2008-07-21 23:12:47 UTC (rev 10144)
@@ -1 +1 @@
-
+/* You probably want root/css/*... */
More information about the MusicBrainz-commits
mailing list