Index: admin/js/_media.js =================================================================== --- admin/js/_media.js (revision 1320) +++ admin/js/_media.js (revision 1325) @@ -12,4 +12,17 @@ } + function displayMessageInQueue(n) { + var msg = ''; + if (n==1) { + msg = dotclear.jsUpload.msg.file_in_queue; + } else if (n>1) { + msg = dotclear.jsUpload.msg.files_in_queue; + msg = msg.replace(/%d/,n); + } else { + msg = dotclear.jsUpload.msg.no_file_in_queue; + } + $('.queue-message','#fileupload').html(msg); + } + $('.button.add').click(function(e) { // Use the native click() of the file input. @@ -21,4 +34,5 @@ $('.button.cancel','#fileupload .fileupload-buttonbar').hide(); disableButton($('.button.start','#fileupload .fileupload-buttonbar')); + displayMessageInQueue(0); }); @@ -28,4 +42,5 @@ disableButton($('.button.start','#fileupload .fileupload-buttonbar')); } + displayMessageInQueue($('.files .template-upload','#fileupload').length); }); @@ -46,4 +61,6 @@ $('.button.cancel','#fileupload .fileupload-buttonbar').show(); enableButton($('.button.start','#fileupload .fileupload-buttonbar')); + }).bind('fileuploadadded', function(e, data) { + displayMessageInQueue($('.files .template-upload','#fileupload').length); }).bind('fileuploaddone', function(e, data) { if (data.result.files[0].html !==undefined) { @@ -52,8 +69,9 @@ $('.button.clean','#fileupload').show(); }).bind('fileuploadalways', function(e, data) { - if ($('.fileupload-ctrl .files .template-upload', '#fileupload').length==0) { - $('.button.cancel','#fileupload .fileupload-buttonbar').hide(); - disableButton($('.button.start','#fileupload .fileupload-buttonbar')); - } + displayMessageInQueue($('.files .template-upload','#fileupload').length); + if ($('.fileupload-ctrl .files .template-upload','#fileupload').length==0) { + $('.button.cancel','#fileupload .fileupload-buttonbar').hide(); + disableButton($('.button.start','#fileupload .fileupload-buttonbar')); + } }); @@ -65,4 +83,5 @@ label = dotclear.jsUpload.msg.choose_files; $('#fileupload').fileupload({disabled:false}); + displayMessageInQueue(0); disableButton($('.button.start','#fileupload .fileupload-buttonbar')); } else { @@ -82,4 +101,5 @@ $('.button.cancel,.button.clean','#fileupload .fileupload-buttonbar').hide(); $('#fileupload').fileupload({disabled:true}); + $('.queue-message','#fileupload').html('').hide(); } else { $msg = dotclear.msg.enhanced_uploader_disable; @@ -90,4 +110,6 @@ startButton.show(); $('#fileupload').fileupload({disabled:false}); + $('.queue-message','#fileupload').show(); + displayMessageInQueue(0); } $(this).find('a').text($msg); Index: admin/media.php =================================================================== --- admin/media.php (revision 1280) +++ admin/media.php (revision 1325) @@ -340,5 +340,5 @@ '