[mb-commits] r12236 - in mb_server/trunk: lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Plugin root/release root/scripts root/static/scripts root/static/scripts/MB/Control root/static/styles
root at musicbrainz.org
root at musicbrainz.org
Sat Oct 17 15:12:04 UTC 2009
Author: acid2
Date: 2009-10-17 15:12:04 +0000 (Sat, 17 Oct 2009)
New Revision: 12236
Added:
mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm
mb_server/trunk/lib/MusicBrainz/Server/Plugin/FormRenderer.pm
mb_server/trunk/root/release/edit.tt
mb_server/trunk/root/scripts/text_strings.tt
mb_server/trunk/root/static/scripts/MB/Control/Lookup.js
mb_server/trunk/root/static/scripts/MB/Control/ToggleButton.js
mb_server/trunk/root/static/scripts/release_editor.js
mb_server/trunk/root/static/styles/release-editor.css
Log:
Merge artist credit editor. See review 442
Merge branch 'ac-editor'
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm 2009-10-17 15:12:04 UTC (rev 12236)
@@ -2,6 +2,7 @@
BEGIN { use Moose; extends 'Catalyst::Controller' };
use List::Util qw( min );
+use Encode qw(decode_utf8);
sub search : Local
{
@@ -21,7 +22,8 @@
$json = {
results => [ map {
- my $name_is_latin = $_->entity->name =~ /^[\p{Latin}\p{Common}\p{Inherited}]+$/;
+ my $dec_name = decode_utf8($_->entity->name);
+ my $name_is_latin = $dec_name =~ /^[\p{Latin}\p{Common}\p{Inherited}]+$/;
my $r = {
name => $_->entity->name,
Modified: mb_server/trunk/lib/MusicBrainz/Server/Plugin/FormRenderer.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Plugin/FormRenderer.pm 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/lib/MusicBrainz/Server/Plugin/FormRenderer.pm 2009-10-17 15:12:04 UTC (rev 12236)
@@ -186,25 +186,11 @@
$self->_render_input($_->field('join_phrase'), 'text', class => 'join')
] } $field->field('names')->fields;
- my $editor = $self->h->div({ class => 'credits' }, [
+ return $self->h->div({ id => $field->html_name, class => 'artist-credit' }, [
map {
$self->h->div({ class => 'credit' }, $_)
} @credits
]);
-
- # Preview
- return $self->h->div({ class => 'container', id => $field->html_name }, [
- $self->h->p({ class => 'preview' }, [
- map {
- my $name = $_->artist
- ? $self->h->a({ href => "/artist/" . $_->artist->gid }, [ $_->name ])
- : $_->name;
-
- ($name, $_->join_phrase);
- } @{ $preview->names }
- ]),
- $editor
- ]);
}
1;
Modified: mb_server/trunk/root/release/edit.tt
===================================================================
--- mb_server/trunk/root/release/edit.tt 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/release/edit.tt 2009-10-17 15:12:04 UTC (rev 12236)
@@ -3,6 +3,7 @@
<script src="[% c.uri_for('/static/scripts/MB/html.js') %]" type="text/javascript"></script>
<script src="[% c.uri_for('/static/scripts/MB/utility.js') %]" type="text/javascript"></script>
<script src="[% c.uri_for('/static/scripts/MB/predicate.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/ArtistCreditEditor.js') %]" type="text/javascript"></script>
<script src="[% c.uri_for('/static/scripts/MB/Control/InlineDialog.js') %]" type="text/javascript"></script>
<script src="[% c.uri_for('/static/scripts/MB/Control/Lookup.js') %]" type="text/javascript"></script>
<script src="[% c.uri_for('/static/scripts/MB/Control/Overlay.js') %]" type="text/javascript"></script>
Modified: mb_server/trunk/root/scripts/text_strings.tt
===================================================================
--- mb_server/trunk/root/scripts/text_strings.tt 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/scripts/text_strings.tt 2009-10-17 15:12:04 UTC (rev 12236)
@@ -23,14 +23,14 @@
JoinPhrase: '[% l('Join Phrase') %]',
Cancel: '[% l('Cancel') %]',
Done: '[% l('Done') %]',
- UseAltNames: '[% l('Alternative Names') %]',
+ UseAltNames: '[% l('Some artists credited with alternative names') %]',
Preview: '[% l('Preview: ') %]',
UnknownPlaceholder: '[% l('[ Unknown ]') %]',
DisambiguationComment: '[% l('add a disambiguation comment') %]',
Next: '[% l('Next') %]',
Previous: '[% l('Previous') %]',
NoResults: '[% l('No results') %]',
- SearchInfoFormat: '[% l('Matches found: <strong>{matches}</strong>. Showing results <strong>{start}<strong>–<strong>{end}</strong>', { matches => '#matches#', start => '#start#', end => '#end#' }) %]',
+ SearchInfoFormat: '[% l('Showing results <strong>{start}</strong>–<strong>{end}</strong> of <strong>{matches}</strong>', { matches => '#matches#', start => '#start#', end => '#end#' }) %]',
Searching: '[% l('Searching…') %]',
PleaseSelectARSubtype : "[% l("Please select a subtype of the currently selected relationship type. The selected relationship type is only used for grouping subtypes.") %]",
PleaseSelectARType : "[% l("Please select a relationship type.") %]",
Modified: mb_server/trunk/root/static/scripts/MB/Control/Lookup.js
===================================================================
--- mb_server/trunk/root/static/scripts/MB/Control/Lookup.js 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/static/scripts/MB/Control/Lookup.js 2009-10-17 15:12:04 UTC (rev 12236)
@@ -98,6 +98,7 @@
event.preventDefault();
var selected = $(event.target).closest('li').data('result');
$(options.idInput).val(selected.id);
+ self.query.val(selected.name);
self.hideResults();
if (options.selection) {
@@ -107,10 +108,12 @@
function resultRow(result) {
var contents = MB.html.strong({}, result.name);
- var info = $.grep([ result.sort_name, result.comment ], MB.predicate.isTrue);
- if (info) {
+ if(result.comment) {
+ contents += ' (' + result.comment + ')';
+ }
+ if (result.sort_name) {
contents += MB.html.br();
- contents += MB.html.span({ 'class': 'info' }, info.join(' / '));
+ contents += MB.html.span({ 'class': 'info' }, result.sort_name);
}
var row = $(MB.html.li({}, contents));
return row.data('result', result).click(function(event) { makeSelection(event); });
Modified: mb_server/trunk/root/static/scripts/MB/Control/ToggleButton.js
===================================================================
--- mb_server/trunk/root/static/scripts/MB/Control/ToggleButton.js 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/static/scripts/MB/Control/ToggleButton.js 2009-10-17 15:12:04 UTC (rev 12236)
@@ -36,7 +36,6 @@
var state = options.defaultOn;
var input;
- fireCallback();
self.image = $(MB.html.img({
'class': 'image-button',
Modified: mb_server/trunk/root/static/scripts/release_editor.js
===================================================================
--- mb_server/trunk/root/static/scripts/release_editor.js 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/static/scripts/release_editor.js 2009-10-17 15:12:04 UTC (rev 12236)
@@ -98,6 +98,12 @@
});
mediumSorter.addTables('table#mediums');
mediumSorter.activate();
+
+ // Editing artist credits
+ $('div.artist-credit').each(function() {
+ var acEditor = new MB.Control.ArtistCreditEditor($(this));
+ acEditor.textDisplay.addClass('overlay');
+ });
});
function overlayLabelLookup() {
Modified: mb_server/trunk/root/static/styles/release-editor.css
===================================================================
--- mb_server/trunk/root/static/styles/release-editor.css 2009-10-17 11:23:54 UTC (rev 12235)
+++ mb_server/trunk/root/static/styles/release-editor.css 2009-10-17 15:12:04 UTC (rev 12236)
@@ -90,3 +90,18 @@
table#mediums table.tbl {
margin: 6pt 0;
}
+
+.ac-editor table {
+ margin: 8pt 0;
+}
+.ac-editor th {
+ text-align: left;
+}
+.ac-editor input.join {
+ width: 2em;
+}
+
+div.ac-editor .buttons {
+ float: right;
+ margin-top: 8pt;
+}
More information about the MusicBrainz-commits
mailing list