Changeset 1325:fac01f6f20b0

Timestamp:

08/10/13 16:02:01 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue 1486 : add number of files that will be uploaded.

Location:

admin

Files:

• js/_media.js (modified) (8 diffs)
• media.php (modified) (1 diff)
• style/jsUpload/style.css (modified) (1 diff)

admin/js/_media.js

@@ -12 +12 @@
      }
 
+     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 +34 @@
           $('.button.cancel','#fileupload .fileupload-buttonbar').hide();
           disableButton($('.button.start','#fileupload .fileupload-buttonbar'));
+          displayMessageInQueue(0);
      });
 
@@ -28 +42 @@
                disableButton($('.button.start','#fileupload .fileupload-buttonbar'));
           }
+          displayMessageInQueue($('.files .template-upload','#fileupload').length);
      });
 
@@ -46 +61 @@
           $('.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 +69 @@
           $('.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 +83 @@
           label = dotclear.jsUpload.msg.choose_files;
           $('#fileupload').fileupload({disabled:false});
+          displayMessageInQueue(0);
           disableButton($('.button.start','#fileupload .fileupload-buttonbar'));
      } else {
@@ -82 +101 @@
                $('.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 +110 @@
                startButton.show();
                $('#fileupload').fileupload({disabled:false});
+               $('.queue-message','#fileupload').show();
+               displayMessageInQueue(0);
           }
           $(this).find('a').text($msg);

admin/media.php

@@ -340 +340 @@
      '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
      $core->formNonce().'</div>'.
-     '<div class="fileupload-ctrl"><div class="files"></div></div>';
+     '<div class="fileupload-ctrl"><div class="queue-message"></div><div class="files"></div></div>';
 
      echo

admin/style/jsUpload/style.css

@@ -170 +170 @@
      clear: both;
 }
+
+.queue-message {
+     font-weight: bold;
+     margin: 0 0 1em 16px;
+}