Changeset 10178

Show
Ignore:
Timestamp:
2008-07-27 16:38:51 (4 months ago)
Author:
acid2
Message:

Consistancy with entity headers. Should fix #3876 - zout, can you confirm?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm

    r10160 r10178  
    3030{ 
    3131    my ($self, $c, $mbid) = @_; 
    32     $c->stash->{release} = $c->model('Release')->load($mbid); 
     32 
     33    my $release = $c->model('Release')->load($mbid); 
     34 
     35    $c->stash->{release}        = $release; 
     36    $c->stash->{release_artist} = $c->model('Artist')->load($release->artist_id);  
    3337} 
    3438 
    …… 
    97101    my $release = $c->stash->{release}; 
    98102 
    99     $c->stash->{relations} = $c->model('Relation')->load_relations($release); 
     103    $c->stash->{relations}      = $c->model('Relation')->load_relations($release); 
     104 
    100105    $c->stash->{template} = 'releases/relations.tt'; 
    101106} 
    …… 
    121126    $c->stash->{show_relationships} = defined $show_rels ? $show_rels : 1; 
    122127 
    123     $c->stash->{artist}         = $c->model('Artist')->load($release->artist->id);  
     128    $c->stash->{artist}         = $c->model('Artist')->load($release->artist_id);  
    124129    $c->stash->{relations}      = $c->model('Relation')->load_relations($release); 
    125130    $c->stash->{tags}           = $c->model('Tag')->top_tags($release); 

  • mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm

    r10177 r10178  
    4646    # Load the blog for the sidebar 
    4747    # 
    48     $c->stash->{blog} = $c->model('Feeds')->get_cached('musicbrainz', 'http://blog.musicbrainz.org/?feed=rss2'); 
     48    my $feed = $c->model('Feeds')->get_cached('musicbrainz', 'http://blog.musicbrainz.org/?feed=rss2'); 
     49    $feed->entries; 
    4950 
    5051    $c->stash->{template} = 'main/index.tt'; 

  • mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm

    r10163 r10178  
    1111 
    1212__PACKAGE__->mk_accessors( qw{ 
    13     artist 
     13    artist_id 
    1414    attributes 
    1515    cover_art_url 
    …… 
    5959 
    6060    return $class->new({ 
    61         artist             => MusicBrainz::Server::Facade::Artist->new({ id => $release->GetArtist }), 
     61        artist_id          => $release->GetArtist, 
    6262        attributes         => [ map { $release->GetAttributeName($_) } @attributes ], 
    6363        cover_art_url      => $release->GetCoverartURL, 

  • mb_server/branches/TemplateToolkit/root/components/relations.tt

    r10145 r10178  
    3737 
    3838[%- UNLESS justlist -%] 
     39[%- IF showall -%]<h1>Relationships for [% source.entity_type %] "[% source.name %]"</h1>[% END %] 
    3940<div class="RelationshipBox"> 
    4041  [%- IF relations.size -%] 

  • mb_server/branches/TemplateToolkit/root/css/entity.css

    r10171 r10178  
    2525} 
    2626 
    27 .entity_header .track  { background: url(/static/images/ticon_lg.png) no-repeat 5px top; } 
    28 .entity_header .artist { background: url(/static/images/aicon_lg.png) no-repeat 5px top; } 
    29 .entity_header .label  { background: url(/static/images/licon_lg.png) no-repeat 5px top; } 
     27.entity_header .track   { background: url(/static/images/ticon_lg.png) no-repeat 5px top; } 
     28.entity_header .artist  { background: url(/static/images/aicon_lg.png) no-repeat 5px top; } 
     29.entity_header .label   { background: url(/static/images/bicon_lg.png) no-repeat 5px top; } 
     30.entity_header .album   { background: url(/static/images/licon_lg.png) no-repeat 5px top; } 
    3031 
    3132.entity_header div.title { 

  • mb_server/branches/TemplateToolkit/root/releases/details.tt

    r10137 r10178  
    1 [%- WRAPPER "layout.tt" title="Details" -%] 
     1[%- WRAPPER "releases/layout.tt" title="Details" -%] 
    22[%- WRAPPER "components/box.tt" header="Release details" -%] 
    33  <table class="details"> 

  • mb_server/branches/TemplateToolkit/root/releases/full.tt

    r10160 r10178  
    1 [%- info_links = [ 
    2         { link => entity_url(release, 'perma'), text => "Permanent link" }, 
    3         { link => entity_url(release, 'details'), text => "Details" }, 
    4         { link => entity_url(release, 'tags'), text => "Tags" }, 
    5  
    6         { 
    7             link => entity_url(release, 'show', { artist => 1, rel = show_relationships }), 
    8             text => "Show artists", 
    9             hide => show_artists, 
    10         }, 
    11         { 
    12             link => entity_url(release, 'show', { artist => 0, rel = show_relationships }), 
    13             text => "Hide artists", 
    14             hide => !show_artists, 
    15         }, 
    16  
    17  
    18         { 
    19             link => entity_url(release, 'show', { rel => 1, artist = show_artists }), 
    20             text => "Show relationships", 
    21             hide => show_relationships, 
    22         }, 
    23         { 
    24             link => entity_url(release, 'show', { rel => 0, artist = show_artists }), 
    25             text => "Hide relationships", 
    26             hide => !show_relationships, 
    27         }, 
    28  
    29         { link => entity_url(release, 'google'), text => "Search Google" }, 
    30     ] -%] 
    31  
    321[% INCLUDE "components/relations.tt" source=release %] 
    332 
    …… 
    409      </div> 
    4110    [%- END -%] 
    42     <div class="infoLinks"> 
    43       Info: [% INCLUDE "components/piped-list.tt" list=info_links %] 
    44     </div> 
    45     <div class="editLinks"> 
    46       Edit:  
    47       [%- IF c.user_exists -%] 
    48         [%- edit_links = [ 
    49               { link => '', text => 'Add relationship' }, 
    50               { link => '', text => 'Relate to URL' }, 
    51               { link => '', text => 'Add CC license' }, 
    52             ] -%] 
    53         [% INCLUDE "components/piped-list.tt" list=edit_links %] 
    54       [%- ELSE -%] 
    55         Please <a href="[% c.uri_for('/user/login') %]">log in</a> to edit this release 
    56       [%- END -%] 
    57     </div> 
     11    [% INCLUDE "releases/info-links.tt" %] 
     12    [% INCLUDE "releases/edit-links.tt" %] 
    5813    <div class="releasetags"> 
    5914      [% INCLUDE "tag/summary.tt" tags=tags source=release %] 
    …… 
    6621          <td class="number">[% track.number %]</td> 
    6722          <td class="title"> 
    68             [% track.name | html %] 
     23            [% INCLUDE "components/entity-link.tt" entity=track noicon=1 %] 
    6924            [% INCLUDE "components/relations.tt" source=track relations=track.relations justlist=1 
    7025                                                 nocompact=1 

  • mb_server/branches/TemplateToolkit/root/releases/perma.tt

    r10135 r10178  
    1 [%- WRAPPER 'layout.tt' title="Permanant Link" -%] 
     1[%- WRAPPER 'releases/layout.tt' title="Permanant Link" -%] 
    22[%- INCLUDE "components/perma-link.tt" entity=release -%] 
    33[%- END -%] 

  • mb_server/branches/TemplateToolkit/root/releases/relations.tt

    r10135 r10178  
    1 [%- WRAPPER 'layout.tt' title="Relationships for \"${release.name}\"" -%] 
    2 <h1>Relationships for "[% release.name | html %]"</h1> 
     1[%- WRAPPER 'releases/layout.tt' title="Relationships for \"${release.name}\"" -%] 
    32[%- INCLUDE "components/relations.tt" source=release showall=1 -%] 
    43[%- END -%] 

  • mb_server/branches/TemplateToolkit/root/releases/tags.tt

    r10133 r10178  
    1 [% WRAPPER "layout.tt" title="Tags for ${release.name}" %] 
     1[% WRAPPER "releases/layout.tt" title="Tags for ${release.name}" %] 
    22[% INCLUDE "tag/entity-tags.tt" entity=release %] 
    33[% END %] 

  • mb_server/branches/TemplateToolkit/root/track/header.tt

    r10171 r10178  
    1717 
    1818  <div class="infoLinks"> Info: [% INCLUDE "components/piped-list.tt" list=info_links %]</div> 
     19 
     20  <div class="editLinks"> 
     21    Edit:  
     22      Please <a href="[% c.uri_for('/user/login') %]">log in</a> to edit this artist 
     23  </div> 
    1924</div> 

  • mb_server/branches/TemplateToolkit/root/track/relations.tt

    r10171 r10178  
    11[%- WRAPPER "layout.tt" title="Relationships for \"${track.name}\"" -%] 
    22[% INCLUDE "track/header.tt" %] 
    3 <h1>Relationships for "[% track.name %]"</h1> 
    43[%- INCLUDE "components/relations.tt" source=track showall=1 -%] 
    54[%- END -%]