[mb-commits] branch, caa-additions, updated. Remove a stray <a> tag
MusicBrainz Git Server <[email protected]> Wed, 06 Feb 2013 13:52:52 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1U35Qi-0008S8-Us@wiley> |
The branch, caa-additions has been updated
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cb8cd6dc7fbff10377d54ce124c0d2ee7f6f0b7a (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f3ffdb106b6909c6757a685a1efa7b1fcd6849e9 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2621a425f7fc3f3c129e4941bddf5b575ef4d8b4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e569a224b00480d333ae45b8a71a36df427cda08 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7d071838002991954146e84cdbdaa4172d077e33 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=27e128d567e0552cba67f9f8d5f73bd43c6726cf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1ee8d3a5248a54f6caf0f5fb8a489026a870749f (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (cb8cd6dc7fbff10377d54ce124c0d2ee7f6f0b7a)
\
N -- N -- N (e569a224b00480d333ae45b8a71a36df427cda08)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
root/components/common-macros.tt | 1 -
root/main/index.tt | 18 ++----------------
root/static/styles/extra/homepage.css | 1 +
root/static/styles/layout.css | 1 -
4 files changed, 3 insertions(+), 18 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e569a224b00480d333ae45b8a71a36df427cda08
Author: Oliver Charles <[email protected]>
Date: Wed Feb 6 17:52:55 2013 +0000
Remove a stray <a> tag
diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index 3b65c4d..2cce1b9 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -80,7 +80,6 @@ END; -%]
[%- USE JavaScript -%]
[%- MACRO display_artwork_image(artwork, fallback, message, rel) BLOCK -%]
- <a title="[% artwork_hover(artwork) %]" href="[% artwork.image %]"[% IF rel %] rel="[% rel %]"[% END %] class="thickbox">
[%- IF no_javascript -%]
<img src="[% artwork.small_thumbnail %]" />
[%- ELSE -%]
commit 7d071838002991954146e84cdbdaa4172d077e33
Author: Oliver Charles <[email protected]>
Date: Wed Feb 6 16:10:08 2013 +0000
Updating since DBDefs changes
diff --git a/lib/MusicBrainz/Server/Data/Release.pm b/lib/MusicBrainz/Server/Data/Release.pm
index 0e65874..3aab0fd 100644
--- a/lib/MusicBrainz/Server/Data/Release.pm
+++ b/lib/MusicBrainz/Server/Data/Release.pm
@@ -4,6 +4,7 @@ use Moose;
use namespace::autoclean -also => [qw( _where_status_in _where_type_in )];
use Carp 'confess';
+use DBDefs;
use List::UtilsBy qw( partition_by );
use MusicBrainz::Server::Constants qw( :quality $EDIT_RELEASE_CREATE $STATUS_APPLIED );
use MusicBrainz::Server::Entity::Barcode;
@@ -988,7 +989,7 @@ sub newest_releases_with_artwork {
my $row = shift;
my $release = $self->_new_from_row($row);
my $mbid = $release->gid;
- my $prefix = DBDefs::COVER_ART_ARCHIVE_DOWNLOAD_PREFIX."/release/$mbid";
+ my $prefix = DBDefs->COVER_ART_ARCHIVE_DOWNLOAD_PREFIX."/release/$mbid";
my $caa_id = $row->{cover_art_id};
return {
release => $self->_new_from_row($row),
commit 27e128d567e0552cba67f9f8d5f73bd43c6726cf
Author: Oliver Charles <[email protected]>
Date: Sat Aug 18 14:00:27 2012 +0100
Link images to the release page, not a lightbox
diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index 5bed815..3b65c4d 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -79,7 +79,7 @@ END; -%]
[%- END -%]
[%- USE JavaScript -%]
-[%- MACRO display_artwork(artwork, fallback, message, rel) BLOCK -%]
+[%- MACRO display_artwork_image(artwork, fallback, message, rel) BLOCK -%]
<a title="[% artwork_hover(artwork) %]" href="[% artwork.image %]"[% IF rel %] rel="[% rel %]"[% END %] class="thickbox">
[%- IF no_javascript -%]
<img src="[% artwork.small_thumbnail %]" />
@@ -106,6 +106,11 @@ END; -%]
}).attr ("src", "[% artwork.small_thumbnail %]");
</script>
[%- END -%]
+[% END %]
+
+[%- MACRO display_artwork(artwork, fallback, message) BLOCK -%]
+ <a href="[% artwork.image %]" class="thickbox">
+ [% display_artwork_image(artwork, fallback, message) %]
</a>
[%- END -%]
diff --git a/root/main/index.tt b/root/main/index.tt
index e652c1b..b7a6d2f 100644
--- a/root/main/index.tt
+++ b/root/main/index.tt
@@ -123,7 +123,9 @@
[% FOR release=releases %]
<div class="artwork-cont" style="text-align: center">
<div class="artwork">
- [%- display_artwork (release.artwork, release.cover_art_url, cover_art_message) -%]
+ <a href="[% c.uri_for_action('/release/show', [ release.release.gid ]) %]">
+ [%- display_artwork_image(release.artwork, release.cover_art_url, cover_art_message) -%]
+ </a>
[% descriptive_link(release.release) %]
</div>
</div>
commit 1ee8d3a5248a54f6caf0f5fb8a489026a870749f
Author: Oliver Charles <[email protected]>
Date: Sat Aug 18 13:46:36 2012 +0100
Show latest releases with cover art on the homepage
diff --git a/lib/MusicBrainz/Server/Controller/Root.pm b/lib/MusicBrainz/Server/Controller/Root.pm
index 6af82fe..e075154 100644
--- a/lib/MusicBrainz/Server/Controller/Root.pm
+++ b/lib/MusicBrainz/Server/Controller/Root.pm
@@ -41,9 +41,14 @@ other than the blog feed.
sub index : Path Args(0)
{
my ($self, $c) = @_;
+
+ my @newest_releases = $c->model('Release')->newest_releases_with_artwork;
+ $c->model('ArtistCredit')->load(map { $_->{release} } @newest_releases);
+
$c->stash(
blog => $c->model('Blog')->get_latest_entries,
- template => 'main/index.tt'
+ template => 'main/index.tt',
+ releases => \@newest_releases
);
}
diff --git a/lib/MusicBrainz/Server/Data/Release.pm b/lib/MusicBrainz/Server/Data/Release.pm
index 9238f0a..0e65874 100644
--- a/lib/MusicBrainz/Server/Data/Release.pm
+++ b/lib/MusicBrainz/Server/Data/Release.pm
@@ -5,7 +5,7 @@ use namespace::autoclean -also => [qw( _where_status_in _where_type_in )];
use Carp 'confess';
use List::UtilsBy qw( partition_by );
-use MusicBrainz::Server::Constants qw( :quality );
+use MusicBrainz::Server::Constants qw( :quality $EDIT_RELEASE_CREATE $STATUS_APPLIED );
use MusicBrainz::Server::Entity::Barcode;
use MusicBrainz::Server::Entity::PartialDate;
use MusicBrainz::Server::Entity::Release;
@@ -22,6 +22,7 @@ use MusicBrainz::Server::Data::Utils qw(
query_to_list_limited
);
use MusicBrainz::Server::Log qw( log_debug );
+use Net::CoverArtArchive::CoverArt;
extends 'MusicBrainz::Server::Data::CoreEntity';
with 'MusicBrainz::Server::Data::Role::Annotation' => { type => 'release' };
@@ -963,6 +964,46 @@ sub filter_barcode_changes {
};
}
+sub newest_releases_with_artwork {
+ my $self = shift;
+ my $query = '
+ SELECT DISTINCT ON (edit.id) ' . $self->_columns . ',
+ cover_art.id AS cover_art_id
+ FROM ' . $self->_table . '
+ JOIN cover_art_archive.cover_art ON (cover_art.release = release.id)
+ JOIN cover_art_archive.cover_art_type
+ ON (cover_art.id = cover_art_type.id)
+ JOIN edit_release ON edit_release.release = release.id
+ JOIN edit ON edit.id = edit_release.edit
+ WHERE cover_art_type.type_id = ?
+ AND cover_art.ordering = 1
+ AND edit.status = ?
+ AND edit.type = ?
+ ORDER BY edit.id DESC
+ LIMIT 4';
+
+ my $FRONT = 1;
+ return query_to_list(
+ $self->c->sql, sub {
+ my $row = shift;
+ my $release = $self->_new_from_row($row);
+ my $mbid = $release->gid;
+ my $prefix = DBDefs::COVER_ART_ARCHIVE_DOWNLOAD_PREFIX."/release/$mbid";
+ my $caa_id = $row->{cover_art_id};
+ return {
+ release => $self->_new_from_row($row),
+ artwork => Net::CoverArtArchive::CoverArt->new(
+ id => $caa_id,
+ image => sprintf('%s/%s.jpg', $prefix, $caa_id),
+ large_thumbnail => sprintf('%s/%s-500.jpg', $prefix, $caa_id),
+ small_thumbnail => sprintf('%s/%s-250.jpg', $prefix, $caa_id),
+ )
+ }
+ },
+ $query, $FRONT, $STATUS_APPLIED, $EDIT_RELEASE_CREATE
+ );
+}
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
diff --git a/root/main/index.tt b/root/main/index.tt
index 9ba10ac..e652c1b 100644
--- a/root/main/index.tt
+++ b/root/main/index.tt
@@ -1,7 +1,7 @@
[% WRAPPER "layout.tt" nosuffix=1 title=l("MusicBrainz - The Open Music Encyclopedia") homepage=1 %]
<div class="sidebar" id="sidebar">
- <div class="information">
- <div id="taggers" class="triple-column">
+ <div style="float: right;">
+ <div id="taggers" class="triple-column feature-column">
<h2 class="taggers">[% l('Tag Your Music') %]</h2>
<img src="[% c.uri_for('/static/images/logos/musicbrainz-picard.png') %]" alt="MusicBrainz Picard logo" />
<ul>
@@ -13,7 +13,7 @@
</ul>
</div>
- <div id="quick-start" class="triple-column">
+ <div id="quick-start" class="triple-column feature-column">
<h2>[% l('Quick Start') %]</h2>
<img src="[% c.uri_for('/static/images/layout/quick-start.png') %]" alt="quick start icon" />
<ul>
@@ -27,7 +27,7 @@
</div>
<div class="sidebar" id="sidebar2">
- <div id="blog-feed" class="triple-column">
+ <div id="blog-feed" class="triple-column feature-column">
<h2>[% l('MusicBrainz Blog') %]</h2>
[% IF blog.defined %]
<p style="margin: 1em 0 0;"><strong>[% l('Latest posts:') %]</strong></p>
@@ -89,7 +89,7 @@
</div>
<div id="triple">
- <div id="community" class="triple-column first-column">
+ <div id="community" class="triple-column first-column feature-column">
<h2 class="community">[% l('Community') %]</h2>
<img src="[% c.uri_for('/static/images/layout/community.png') %]" alt="community icon" />
<p>
@@ -97,7 +97,7 @@
</p>
</div>
- <div id="products" class="triple-column">
+ <div id="products" class="triple-column feature-column">
<h2 class="products">[% l('MusicBrainz Database') %]</h2>
<img src="[% c.uri_for('/static/images/layout/download.png') %]" alt="download icon" />
<p>
@@ -105,7 +105,7 @@
</p>
</div>
- <div id="developers" class="triple-column last-column">
+ <div id="developers" class="triple-column last-column feature-column">
<h2 class="developers">[% l('Developers') %]</h2>
<img src="[% c.uri_for('/static/images/layout/developer.png') %]" alt="developers icon" />
<p>
@@ -113,4 +113,21 @@
</p>
</div>
</div>
+
+ <div style="clear: both; padding-top: 1%;" class="feature-column">
+ <h2>[% l('Latest Additions') %]</h2>
+ <p>[% l("MusicBrainz editors add an average of 250 releases <em>every
+ day</em>. Here's some of the latest releases that have been
+ added:") %]</p>
+ <div style="text-align: center">
+ [% FOR release=releases %]
+ <div class="artwork-cont" style="text-align: center">
+ <div class="artwork">
+ [%- display_artwork (release.artwork, release.cover_art_url, cover_art_message) -%]
+ [% descriptive_link(release.release) %]
+ </div>
+ </div>
+ [% END %]
+ </div>
+ </div>
[% END %]
diff --git a/root/static/styles/extra/homepage.css b/root/static/styles/extra/homepage.css
index b77ac19..490799b 100644
--- a/root/static/styles/extra/homepage.css
+++ b/root/static/styles/extra/homepage.css
@@ -6,6 +6,7 @@
#triple {
clear: both;
margin-top: 20px;
+ overflow: auto;
}
#triple .triple-column {
@@ -37,7 +38,7 @@
margin-left: 60px;
}
-.triple-column h2 {
+.feature-column h2 {
color: #FFFFFF;
background-color: #736DAB;
padding: 5px 0 5px 7px;
diff --git a/root/static/styles/layout.css b/root/static/styles/layout.css
index b3473c1..271ac18 100644
--- a/root/static/styles/layout.css
+++ b/root/static/styles/layout.css
@@ -385,7 +385,6 @@ div.warning img.warning {
#page.homepage .sidebar {
float: right;
font-size: 95%;
- margin-top: 34px;
width: auto;
}
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server