Added global progressbar for all uploads

diff --git a/files/css/files.css b/files/css/files.css
index 512e462cb6f9f4395e6e752365231374e73af560..60851b6f57ea2aa1ff46056fb60bfad7906493e6 100644 (file)
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -30,6 +30,7 @@
 .file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
 .file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; }
 
+#uploadprogressbar { position:absolute; right:14.5em; display:inline-block; width:10em; height:1.5em; top:.4em; }
 
 .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
 

diff --git a/files/js/files.js b/files/js/files.js
index 666e0c7602ff31b96131c6800caa51079e2656c8..5f61bdd2ac371568190a6b4022a38be08c4f83c0 100644 (file)
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -223,7 +223,19 @@ $(document).ready(function() {
                                // TODO: cancel upload & display error notification
                        },
                        progress: function(e, data) {
-                               // TODO: show nice progress bar
+                               // TODO: show nice progress bar in file row
+                       },
+                       progressall: function(e, data) {
+                               var progress = (data.loaded/data.total)*100;
+                               $('#uploadprogressbar').progressbar('value',progress);
+                       },
+                       start: function(e, data) {
+                                      $('#uploadprogressbar').progressbar({value:0});
+                                      $('#uploadprogressbar').fadeIn();
+                       },
+                       stop: function(e, data) {
+                                     $('#uploadprogressbar').progressbar('value',100);
+                                     $('#uploadprogressbar').fadeOut();
                        }
                })
        });

diff --git a/files/templates/index.php b/files/templates/index.php
index 7fc51c288e1c7402c6edbb3df47281d71f9939f6..abcbd2692110be0400c377bbec85347681694a87 100644 (file)
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -21,6 +21,7 @@
                                        <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
                                </form>
                        </div>
+                       <div id="uploadprogressbar"></div>
                </div>
                <div id="file_action_panel"></div>
        <?php else:?>