added fixes from hotfixes branch, added minimize uploadqueue button, …

…display number of uploads left, only show 20 files in upload queue, added cancel all uploads (not hooked to button yet), improved speed of reading files

plugins-client/ext.dragdrop/dragdrop.js

@@ -30,8 +30,9 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
         label.textContent = "Drop files here to upload";
         dropbox.appendChild(label);
 
-        function decorateNode(holder) {
+        function decorateNode(holder, id) {
             dropbox = holder.dropbox = dropbox.cloneNode(true);
+            dropbox.setAttribute("id", id);
             holder.appendChild(dropbox);
 
             holder.addEventListener("dragenter", dragEnter, false);
@@ -45,7 +46,7 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
 
         ide.addEventListener("init.ext/editors/editors", function(){
             _self.nodes.push(tabEditors.$ext);
-            decorateNode(tabEditors.$ext);
+            decorateNode(tabEditors.$ext, "tabEditorsDropArea");
         });
 
         ide.addEventListener("init.ext/tree/tree", function(){
@@ -64,7 +65,6 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
         ide.addEventListener("init.ext/uploadfiles/uploadfiles", function(){
             winUploadFiles.addEventListener("afterrender", function(){
                 _self.nodes.push(uploadDropArea);
-                //decorateNode(uploadDropArea.$ext);
 
                 uploadDropArea.addEventListener("dragenter", dragEnter, false);
                 uploadDropArea.addEventListener("dragleave", dragLeave, false);

plugins-client/ext.uploadfiles/skin.xml

@@ -12,12 +12,12 @@
             .list-uploadactivity>DIV.uploadactivity-items {
                 height: 100px;
                 max-height: 100px;
-                overflow      : hidden;
+                overflow: hidden;
             }
             
             .list-uploadactivity .item {
                 height      : 20px;
-                padding     : 0 12px 2px 5px;
+                padding     : 0 5px 2px 5px;
                 position    : relative;
                 cursor      : default;
                 border-bottom:1px solid transparent;
@@ -34,7 +34,7 @@
 
             .list-uploadactivity .item .uploadactivity-caption,
             .list-uploadactivity .item .uploadactivity-progress {
-                display     : inline-block;
+                display     : block;
                 height      : 18px;
                 padding     : 3px 0 0 0;
                 margin      : 0 0 0 5px;
@@ -50,14 +50,18 @@
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                padding-right: 30px;
             }
             .list-uploadactivity .item .uploadactivity-caption.bold {
                 font-weight: bold;
             }
             
             .list-uploadactivity .item .uploadactivity-progress {
-                display     : inline-block;
+                display     : block;
                 color       : #179439;
+                position: absolute;
+                right: 5px;
+                top: 1px;
             }
             
             .list-uploadactivity .item.hover {
@@ -106,7 +110,7 @@
         <a:style condition="apf.isChrome || apf.isSafari"><![CDATA[
             .list-uploadactivity .item .uploadactivity-caption {
                 height  : 17px;
-                padding : 4px 0 0 0;
+                padding : 4px 30px 0 0;
             }
         ]]></a:style>
 
@@ -134,4 +138,57 @@
             </a:empty>
         </a:presentation>
     </a:list>
+    <a:checkbox name="uploadactivity-switch">
+        <a:style><![CDATA[
+            .uploadactivity-switch {
+                position   : relative;
+                overflow   : visible;
+                width      : 9px;
+                height     : 15px;
+                top        : 4px;
+            }
+    
+            .uploadactivity-switch .checkbox {
+                width      : 9px;
+                height     : 15px;
+                overflow   : hidden;
+                position   : absolute;
+                background : url("images/list_uploadactivity_switch.png") no-repeat -18px 0;
+            }
+    
+            .uploadactivity-switchChecked.uploadactivity-switchDown .checkbox {
+                background-position : -9px 0;
+            }
+    
+            .uploadactivity-switchChecked .checkbox {
+                background-position : 0 0;
+            }
+    
+            .uploadactivity-switchError span {
+                background-color : #ffb500;
+                color            : #fbfbfb;
+            }
+    
+            .uploadactivity-switchDisabled .checkbox {
+                background-position : 0 0;
+            }
+    
+            .uploadactivity-switchDisabled span {
+                color : #bebebe;
+            }
+        ]]></a:style>
+        <a:style condition="apf.isWebkit"><![CDATA[
+            .uploadactivity-switch span {
+                top : -2px;
+            }
+        ]]></a:style>
+
+        <a:presentation>
+            <a:main label="span/text()" minheight="15" minwidth="9">
+                <div class='uploadactivity-switch'>
+                    <div class='checkbox'> </div>
+                </div>
+            </a:main>
+        </a:presentation>
+    </a:checkbox>
 </a:skin>

plugins-client/ext.uploadfiles/uploadfiles.css

@@ -1,17 +1,22 @@
 .uploadactivity-header {
+    width: 100%;
+    background: url(/static/ext/uploadfiles/style/images/list_uploadactivity_header_bg.png) no-repeat 0 0;
+    background-size: 100% 30px;
+}
+
+.uploadactivity-header .header, #uploadactivityNumFiles {
+    height: 30px;
     font-family: Arial;
     font-size: 11px;
     color: #606060;
     text-shadow: #ffffff 0 1px 0;
     line-height: 37px;
     font-weight: bold;
-    text-indent: 10px;
-    height: 30px;
-    width: 100%;
-    background: url(/static/ext/uploadfiles/style/images/list_uploadactivity_header_bg.png) no-repeat 0 0;
-    background-size: 100% 30px;
 }
 
+.uploadactivity-header .header {
+    text-indent: 10px;
+}
 .uploadDropArea {
     height: 95px;
     width: 335px;