Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
robjoyce · Apr 9, 2014 · 9eeacad · 9eeacad
2 parents 1b9a1e8 + 0a4fe80
commit 9eeacad
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/files/renderer.php b/files/renderer.php
@@ -210,6 +210,7 @@ private function fm_print_generallayout($fm) {
                 <div class="fp-btn-download">
                     <a role="button" title="'.$strdownload.'" href="#"><img src="'.$this->pix_url('a/download_all').'" alt="" /></a>
                 </div>
+                <img class="fp-img-downloading" src="'.$this->pix_url('i/loading_small').'" alt="" />
             </div>
             <div class="fp-viewbar">
                 <a title="'. get_string('displayicons', 'repository') .'" class="fp-vb-icons" href="#">

diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
@@ -366,11 +366,21 @@ M.form_filemanager.init = function(Y, options) {
                     return;
                 }
                 var scope = this;
+
+                var image_downloading = this.filemanager.one('.fp-img-downloading');
+                if (image_downloading.getStyle('display')=='inline'){
+                    return;
+                }
+                image_downloading.setStyle('display', 'inline');
+
                 // perform downloaddir ajax request
                 this.request({
                     action: 'downloaddir',
                     scope: scope,
                     callback: function(id, obj, args) {
+                        var image_downloading = scope.filemanager.one('.fp-img-downloading');
+                        image_downloading.setStyle('display', 'none');
+
                         if (obj) {
                             scope.refresh(obj.filepath);
                             node = Y.Node.create('<iframe></iframe>').setStyles({

diff --git a/theme/base/style/filemanager.css b/theme/base/style/filemanager.css
@@ -278,6 +278,7 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
 .fitem.disabled .filemanager .fp-pathbar,
 .fitem.disabled .filemanager .fp-restrictions,
 .fitem.disabled .filemanager .fm-content-wrapper {display:none;}
+.filemanager .fp-img-downloading {display:none;padding-top: 3px;}
 
  /*
  * File Manager layout

diff --git a/theme/bootstrapbase/less/moodle/filemanager.less b/theme/bootstrapbase/less/moodle/filemanager.less
@@ -766,6 +766,10 @@ a.ygtvspacer:hover {
 .filemanager.fm-noitems .filemanager-container .fp-content {
     display: none;
 }
+.filemanager .fp-img-downloading {
+    display: none;
+    padding-top: 7px;
+}
 .filemanager .filemanager-updating {
     display: none;
     text-align: center;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css