[mb-commits] branch, mbs-4376, updated. MBS-4376, Improve feedback during upload process by hiding edit inputs ( only ...
MusicBrainz Git Server <[email protected]> Sat, 29 Dec 2012 12:02:48 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tov7o-00079a-J7@wiley> |
The branch, mbs-4376 has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d8f7cba6ae782f95d0b69f9f571edd8a9adf07d9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0b90aa2882a7be1de2977686387abf9ef641683b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=19ec55ea455a45080e705166df802a83bb66b497 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9b56ecf4985cfdc6186e568fcf795564a357c720 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=73ec9401e542f144452666f146e236c40480cdb5 (commit)
Summary of changes:
lib/MusicBrainz/Server/Controller/WS/js.pm | 2 +-
lib/MusicBrainz/Server/Data/CoverArtArchive.pm | 2 +-
root/release/add_cover_art.tt | 8 ++++++-
root/static/scripts/edit/MB/CoverArt.js | 27 ++++++++++++++++++++++++
4 files changed, 36 insertions(+), 3 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 d8f7cba6ae782f95d0b69f9f571edd8a9adf07d9
Author: warp <[email protected]>
Date: Fri Dec 28 16:49:12 2012 +0100
MBS-4376, Improve feedback during upload process by hiding edit inputs (only leaving filename and progressbar for each image) and showing a status line.
diff --git a/root/release/add_cover_art.tt b/root/release/add_cover_art.tt
index 14d75ee..66818c3 100644
--- a/root/release/add_cover_art.tt
+++ b/root/release/add_cover_art.tt
@@ -93,7 +93,7 @@
[%- IF images.size > 0 -%]
<div class="row" id="cover-art-position-row">
- <label id="cover-art-position-label" class="required">Position:</label>
+ <label id="cover-art-position-label" class="required">[%- l('Position:') -%]</label>
<div class="image-position">
[%- FOR image = images -%]
@@ -118,6 +118,11 @@
</div>
[%- END -%]
+ <div class="row" id="cover-art-upload-status" style="display: none">
+ <label id="cover-art-position-label">[%- l('Status:') -%]</label>
+ <span id="cover-art-upload-log"></span>
+ </div>
+
<div style="clear: left;"> </div>
[%- INCLUDE 'forms/edit-note.tt' -%]
diff --git a/root/static/scripts/edit/MB/CoverArt.js b/root/static/scripts/edit/MB/CoverArt.js
index 732e910..9ddcfa0 100644
--- a/root/static/scripts/edit/MB/CoverArt.js
+++ b/root/static/scripts/edit/MB/CoverArt.js
@@ -23,6 +23,11 @@ MB.CoverArt = {};
MB.CoverArt.lastCheck;
+MB.CoverArt.update_status = function (image, msg) {
+ console.log (image, "status:", msg);
+ $('#cover-art-upload-log').text (msg + " (" + image + ")");
+};
+
MB.CoverArt.validate_cover_art_file = function () {
var filename = $('iframe').contents ().find ('#file').val ();
var invalid = (filename == ""
@@ -188,6 +193,8 @@ MB.CoverArt.upload_image = function ($filebox, gid, position) {
var formdata = new FormData();
formdata.append("file", $filebox.data ('file'));
+ MB.CoverArt.update_status ($filebox.data ('file').name, "Requesting image identifier");
+
var postfields = $.getJSON('/ws/js/cover-art-upload/' + gid);
postfields.done (function (data, status, jqxhr) {
$filebox.data('image-id', data.image_id);
@@ -208,6 +215,8 @@ MB.CoverArt.upload_image = function ($filebox, gid, position) {
{
set_progress ($filebox, 100);
+ MB.CoverArt.update_status ($filebox.data ('file').name, "Create edit");
+
var edit_promise = MB.CoverArt.create_edit ($filebox, gid, position);
edit_promise.done (deferred.resolve);
edit_promise.fail (deferred.reject);
@@ -231,6 +240,8 @@ MB.CoverArt.upload_image = function ($filebox, gid, position) {
});
xhr.open ("POST", data.action);
+
+ MB.CoverArt.update_status ($filebox.data ('file').name, "Uploading image");
xhr.send (formdata);
});
@@ -287,6 +298,14 @@ MB.CoverArt.add_cover_art_submit = function (gid) {
if (! $('.file-box').not('.template').length)
return; /* no files selected. */
+ $('#cover-art-position-row').hide ();
+ $('div.cover-art-types.row').hide ();
+ $('div.cover-art-types-help.row').hide ();
+ $('div.comment.row').hide ();
+ $('div.file-info.row input.icon').hide ();
+ $('#cover-art-upload-status').show ();
+ $('html').animate({ scrollTop: 0 }, 500);
+
$('.file-box').not('.template').each (function (idx, elem) {
queue.push (function () {
return MB.CoverArt.upload_image ($(elem), gid, position++);
commit 0b90aa2882a7be1de2977686387abf9ef641683b
Author: warp <[email protected]>
Date: Fri Dec 28 15:20:20 2012 +0100
MBS-4376, fix coverart uploader js webservice to use DBDefs correctly and not include the redirect in policy.
diff --git a/lib/MusicBrainz/Server/Controller/WS/js.pm b/lib/MusicBrainz/Server/Controller/WS/js.pm
index 309c4ce..f018a86 100644
--- a/lib/MusicBrainz/Server/Controller/WS/js.pm
+++ b/lib/MusicBrainz/Server/Controller/WS/js.pm
@@ -326,7 +326,7 @@ sub cover_art_upload : Chained('root') PathPart('cover-art-upload') Args(1)
my $bucket = 'mbid-' . $gid;
my $data = {
- action => DBDefs::COVER_ART_ARCHIVE_UPLOAD_PREFIXER($bucket),
+ action => DBDefs->COVER_ART_ARCHIVE_UPLOAD_PREFIXER($bucket),
image_id => "$id",
formdata => $c->model ('CoverArtArchive')->post_fields ($bucket, $gid, $id)
};
diff --git a/lib/MusicBrainz/Server/Data/CoverArtArchive.pm b/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
index 56e685a..cbc0d43 100644
--- a/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
+++ b/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
@@ -61,7 +61,7 @@ sub post_fields
$policy->add ({'bucket' => $bucket});
$policy->add ({'acl' => 'public-read'});
- $policy->add ({'success_action_redirect' => $redirect});
+ $policy->add ({'success_action_redirect' => $redirect}) if $redirect;
$policy->add ('$key eq '.$filename);
$policy->add ('$content-type starts-with image/jpeg');
commit 19ec55ea455a45080e705166df802a83bb66b497
Author: warp <[email protected]>
Date: Fri Dec 28 12:27:12 2012 +0100
MBS-4376, do not submit add-cover-art when no images have been selected.
diff --git a/root/static/scripts/edit/MB/CoverArt.js b/root/static/scripts/edit/MB/CoverArt.js
index bb7a616..732e910 100644
--- a/root/static/scripts/edit/MB/CoverArt.js
+++ b/root/static/scripts/edit/MB/CoverArt.js
@@ -284,6 +284,9 @@ MB.CoverArt.add_cover_art_submit = function (gid) {
var position = parseInt ($('#id-add-cover-art\\.position').val (), 10);
+ if (! $('.file-box').not('.template').length)
+ return; /* no files selected. */
+
$('.file-box').not('.template').each (function (idx, elem) {
queue.push (function () {
return MB.CoverArt.upload_image ($(elem), gid, position++);
commit 9b56ecf4985cfdc6186e568fcf795564a357c720
Author: warp <[email protected]>
Date: Fri Dec 28 12:26:17 2012 +0100
MBS-4376, add cancel button to each selected file to remove a file from the upload list.
diff --git a/root/release/add_cover_art.tt b/root/release/add_cover_art.tt
index fb768b8..14d75ee 100644
--- a/root/release/add_cover_art.tt
+++ b/root/release/add_cover_art.tt
@@ -68,6 +68,7 @@
<div class="comment row">
<label>[%- l('Comment:') -%]</label>
<input class="comment" type="text" size="47" />
+ <button type="button" class="cancel-file" style="float: right;">[%- l('Cancel') -%]</button>
</div>
<div class="upload-error row" style="display: none;">
<label>[%- warning_icon() -%]</label>
diff --git a/root/static/scripts/edit/MB/CoverArt.js b/root/static/scripts/edit/MB/CoverArt.js
index 5567859..bb7a616 100644
--- a/root/static/scripts/edit/MB/CoverArt.js
+++ b/root/static/scripts/edit/MB/CoverArt.js
@@ -303,6 +303,11 @@ MB.CoverArt.add_cover_art = function (gid)
$('#add-cover-art-submit').removeAttr('disabled');
$('form.add-cover-art').show ();
+ $(document).on ('click', 'button.cancel-file', function (event) {
+ event.preventDefault ();
+ $(this).closest ('.file-box').remove ();
+ });
+
if (typeof (FormData) === "function")
{
/* FormData is supported, so we can present the multifile ajax
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server