BUG: fixed bug #218 Fixed the path

Added loading image in the upload button

Author: Charles Ma

core/layouts/layout.phtml

@@ -186,7 +186,8 @@ echo $this->doctype()
         <div class="HeaderAction">
           <ul>
             <li class="uploadFile" title="Upload" rel="<?php echo $this->webroot?>/upload/simpleupload">
-              <a href="#"><img src="<?= $this->coreWebroot ?>/public/images/icons/addfile.png" alt="Upload a file"/>
+              <a href="#"><img id="uploadAFile" src="<?= $this->coreWebroot ?>/public/images/icons/addfile.png" alt="Upload a file"/>
+              <img id="uploadAFileLoadiing" style="margin-top:5px;display:none;" src="<?= $this->coreWebroot ?>/public/images/icons/loading.gif" alt="Upload a file"/>
                 Upload
               </a>
             </li>

core/public/js/browse/browse.movecopy.js

@@ -21,7 +21,8 @@
     var ajaxSelectRequest='';
     function callbackSelect(node)
     {
-      var selectedElement = node.find('span:last').html();
+      console.log(node);
+      var selectedElement = node.find('span:eq(1)').html();
 
       var parent = true;
       var current = node;
@@ -39,7 +40,7 @@
           }
         if(parent != null)
           {
-          selectedElement = parent.find('span:last').html()+'/'+selectedElement;
+          selectedElement = parent.find('span:eq(1)').html()+'/'+selectedElement;
           current = parent;
           }
         }       

core/public/js/layout/main.js

@@ -206,12 +206,17 @@ $(function() {
     }
   });
 
+  var uploadPageLoaded = false;
   $('div.HeaderAction li.uploadFile').click(function()
   {
     if(json.global.logged)
     {
-     // loadDialog("upload","/upload/simpleupload");
-     // showDialog("Upload",false);
+    if(!uploadPageLoaded)
+      {
+      $('img#uploadAFile').hide();
+      $('img#uploadAFileLoadiing').show();
+      uploadPageLoaded = true;
+      }    
     }
     else
     {

core/public/js/upload/upload.simpleupload.js

@@ -1,7 +1,9 @@
 
 
     var swfu;
-      
+    
+    $('img#uploadAFile').show();
+    $('img#uploadAFileLoadiing').hide();
       function uploadPreStart(file)
       {
         swfu.setPostParams({"sid" : $('.sessionId').val(),"parent": $('#destinationId').val(),'license': $('select[name=licenseSelect]').val()});