[mb-commits] branch, beta, updated. MBS-5777: Fix syntax error by addding trailing comma
MusicBrainz Git Server <[email protected]> Mon, 28 Jan 2013 12:09:17 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TznWX-0002DT-9L@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5f88531f09071c87dd2a47491023b5f6b124d71b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5c0c66a3fce3fe2345a0496cd67327cd70d19d1a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8a33d1a9c8a339371000d617549ae2fe19683a29 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=eab3634effcbfa58bac4d45e554062d1fef0d057 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c3c65e958b8b2fecfbba241ed8124d4b1924947b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3cf8870129d7987e1cdc748d0f9a18441a21502b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9e825c3edb928eb14de1e64c676c85fd14c51eb8 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0aa22d8770b2311a66046664f3347aa46a85a13c (commit)
Summary of changes:
lib/MusicBrainz/Server/Data/URL.pm | 1 +
.../Server/Entity/URL/{45cat.pm => GooglePlus.pm} | 6 +++---
root/components/common-macros.tt | 1 +
root/static/images/favicons/googleplus-16.png | Bin 0 -> 653 bytes
root/static/scripts/edit/MB/Control/URLCleanup.js | 4 ++--
root/static/scripts/tests/Control/URLCleanup.js | 5 +++++
root/static/styles/layout.css | 4 ++++
root/user/ratings.tt | 4 ++--
8 files changed, 18 insertions(+), 7 deletions(-)
copy lib/MusicBrainz/Server/Entity/URL/{45cat.pm => GooglePlus.pm} (88%)
create mode 100644 root/static/images/favicons/googleplus-16.png
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 5f88531f09071c87dd2a47491023b5f6b124d71b
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 12:08:13 2013 +0000
MBS-5777: Fix syntax error by addding trailing comma
diff --git a/root/user/ratings.tt b/root/user/ratings.tt
index 673927b..47f4c56 100644
--- a/root/user/ratings.tt
+++ b/root/user/ratings.tt
@@ -2,7 +2,7 @@
titles = { 'artist' => l('Artist ratings'),
'label' => l('Label ratings'),
'recording' => l('Recording ratings'),
- 'release_group' => l('Release group ratings')
+ 'release_group' => l('Release group ratings'),
'work' => l('Work ratings')
};
title = titles.${ type };
commit 5c0c66a3fce3fe2345a0496cd67327cd70d19d1a
Merge: 8a33d1a c3c65e9
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 12:07:11 2013 +0000
Merge remote-tracking branch 'reosarevok/mbs-5777' into beta
* reosarevok/mbs-5777:
Added work ratings h2, removed releases since releases have no ratings
commit 8a33d1a9c8a339371000d617549ae2fe19683a29
Merge: eab3634 3cf8870
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 12:06:48 2013 +0000
Merge remote-tracking branch 'reosarevok/mbs-4902' into beta
* reosarevok/mbs-4902:
Add Google+ to the sidebar
Conflicts:
root/components/common-macros.tt
diff --cc root/components/common-macros.tt
index 5bed815,6e2bb3a..50af681
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@@ -716,10 -718,10 +716,11 @@@ END -%
ELSIF url.url.host.search('ocremix.org'); 'ocremix';
ELSIF url.url.host.search('musik-sammler.de'); 'musiksammler';
ELSIF url.url.host.search('encyclopedisque.fr'); 'encyclopedisque';
- ELSIF url.url.host.search('trove.nla.gov.au'); 'trove';
+ ELSIF url.url.host.search('nla.gov.au'); 'trove';
ELSIF url.url.host.search('rockinchina.com'); 'ric';
ELSIF url.url.host.search('dhhu.dk'); 'dhhu';
+ ELSIF url.url.host.search('thesession.org'); 'thesession';
+ ELSIF url.url.host.search('plus.google.com'); 'googleplus';
ELSIF url.url.as_string.search('recmusic.org/lieder'); 'lieder';
ELSE; '';
END -%]
commit eab3634effcbfa58bac4d45e554062d1fef0d057
Merge: 0aa22d8 9e825c3
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 12:04:48 2013 +0000
Merge remote-tracking branch 'reosarevok/mbs-5775' into beta
* reosarevok/mbs-5775:
Modify Facebook cleanup to use https as per their redirecting.
commit c3c65e958b8b2fecfbba241ed8124d4b1924947b
Author: reosarevok <[email protected]>
Date: Sat Jan 26 20:14:17 2013 +0000
Added work ratings h2, removed releases since releases have no ratings
diff --git a/root/user/ratings.tt b/root/user/ratings.tt
index 889fc30..673927b 100644
--- a/root/user/ratings.tt
+++ b/root/user/ratings.tt
@@ -2,8 +2,8 @@
titles = { 'artist' => l('Artist ratings'),
'label' => l('Label ratings'),
'recording' => l('Recording ratings'),
- 'release' => l('Release ratings'),
'release_group' => l('Release group ratings')
+ 'work' => l('Work ratings')
};
title = titles.${ type };
-%]
commit 3cf8870129d7987e1cdc748d0f9a18441a21502b
Author: reosarevok <[email protected]>
Date: Fri Jan 25 19:07:34 2013 +0000
Add Google+ to the sidebar
diff --git a/lib/MusicBrainz/Server/Data/URL.pm b/lib/MusicBrainz/Server/Data/URL.pm
index 13f7c56..44708eb 100644
--- a/lib/MusicBrainz/Server/Data/URL.pm
+++ b/lib/MusicBrainz/Server/Data/URL.pm
@@ -27,6 +27,7 @@ my %URL_SPECIALIZATIONS = (
'ESTERTallinn' => qr{^https?://tallinn.ester.ee/}i,
'ESTERTartu' => qr{^https?://tartu.ester.ee/}i,
'Facebook' => qr{^https?://(?:www.)?facebook.com/}i,
+ 'GooglePlus' => qr{^https?://(?:www.)?plus.google.com/}i,
'IBDb' => qr{^https?://(?:www.)?ibdb.com/}i,
'IMDb' => qr{^https?://(?:www.)?imdb.com/}i,
'IMSLP' => qr{^https?://(?:www.)?imslp.org/wiki/}i,
diff --git a/lib/MusicBrainz/Server/Entity/URL/GooglePlus.pm b/lib/MusicBrainz/Server/Entity/URL/GooglePlus.pm
new file mode 100644
index 0000000..f7da6d9
--- /dev/null
+++ b/lib/MusicBrainz/Server/Entity/URL/GooglePlus.pm
@@ -0,0 +1,36 @@
+package MusicBrainz::Server::Entity::URL::GooglePlus;
+
+use Moose;
+
+extends 'MusicBrainz::Server::Entity::URL';
+with 'MusicBrainz::Server::Entity::URL::Sidebar';
+
+sub sidebar_name {
+ my $self = shift;
+
+ return "Google+";
+}
+
+__PACKAGE__->meta->make_immutable;
+no Moose;
+1;
+
+=head1 COPYRIGHT
+
+Copyright (C) 2013 MetaBrainz Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+=cut
diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index ee84d23..6e2bb3a 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -721,6 +721,7 @@ END -%]
ELSIF url.url.host.search('trove.nla.gov.au'); 'trove';
ELSIF url.url.host.search('rockinchina.com'); 'ric';
ELSIF url.url.host.search('dhhu.dk'); 'dhhu';
+ ELSIF url.url.host.search('plus.google.com'); 'googleplus';
ELSIF url.url.as_string.search('recmusic.org/lieder'); 'lieder';
ELSE; '';
END -%]
diff --git a/root/static/images/favicons/googleplus-16.png b/root/static/images/favicons/googleplus-16.png
new file mode 100644
index 0000000..661cb5c
Binary files /dev/null and b/root/static/images/favicons/googleplus-16.png differ
diff --git a/root/static/styles/layout.css b/root/static/styles/layout.css
index 4b73fb4..d9e6322 100644
--- a/root/static/styles/layout.css
+++ b/root/static/styles/layout.css
@@ -559,6 +559,10 @@ div.warning img.warning {
background-image: url("../images/favicons/ric-16.png");
}
+#sidebar ul.external_links li.googleplus {
+ background-image: url("../images/favicons/googleplus-16.png");
+}
+
#sidebar ul.external_links li.dhhu {
background-image: url("../images/favicons/dhhu-16.png");
}
commit 9e825c3edb928eb14de1e64c676c85fd14c51eb8
Author: reosarevok <[email protected]>
Date: Fri Jan 25 17:53:12 2013 +0000
Modify Facebook cleanup to use https as per their redirecting.
diff --git a/root/static/scripts/edit/MB/Control/URLCleanup.js b/root/static/scripts/edit/MB/Control/URLCleanup.js
index 74966f8..4673d32 100644
--- a/root/static/scripts/edit/MB/Control/URLCleanup.js
+++ b/root/static/scripts/edit/MB/Control/URLCleanup.js
@@ -313,8 +313,8 @@ MB.constants.CLEANUPS = {
match: new RegExp("^(https?://)?([^/]+\\.)?(facebook\\.com|last\\.fm|lastfm\\.(at|br|de|es|fr|it|jp|pl|pt|ru|se|com\\.tr)|plus.google.com)/", "i"),
type: MB.constants.LINK_TYPES.socialnetwork,
clean: function(url) {
- url = url.replace(/^(https?:\/\/)?([^\/]+\.)?facebook\.com(\/#!)?/, "http://www.facebook.com");
- if (url.match (/^http:\/\/www\.facebook\.com.*$/))
+ url = url.replace(/^(https?:\/\/)?([^\/]+\.)?facebook\.com(\/#!)?/, "https://www.facebook.com");
+ if (url.match (/^https:\/\/www\.facebook\.com.*$/))
{
// Remove ref (where the user came from) and sk (subpages in a page, since we want the main link)
url = url.replace(/([&?])(sk|ref)=([^?&]*)/, "$1");
diff --git a/root/static/scripts/tests/Control/URLCleanup.js b/root/static/scripts/tests/Control/URLCleanup.js
index 3a81b83..d8f3795 100644
--- a/root/static/scripts/tests/Control/URLCleanup.js
+++ b/root/static/scripts/tests/Control/URLCleanup.js
@@ -273,6 +273,11 @@ MB.tests.URLCleanup.GuessType = function() {
'release'
],
[
+ 'http://www.facebook.com/sininemusic',
+ 'https://www.facebook.com/sininemusic',
+ 'artist'
+ ],
+ [
'http://plus.google.com/u/0/101821796946045393834/about',
'https://plus.google.com/101821796946045393834',
'artist'
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server