minor, css

edgware/static/js/upload/upload.js

@@ -317,6 +317,7 @@ var UploadQueue = function() {
   this.allFiles = [];
   this.isUploading = false;
   this.$list = $('#filesList');
+  this.$progress = $('#progressbar');
   this.len = function() {
     return this.allFiles.length;
   };
@@ -327,10 +328,10 @@ var UploadQueue = function() {
 }
 
 UploadQueue.prototype.init = function() {
-  $('#progressbar').show();
+//  $('#progressbar').show();
   $('#progressbar').width(200);
-  $('#progressbar').css('background-color', '#eee');
-  $('#progressbar').html('<div id="progress" style="background-color: #666;height:20px;width:0%" /><div id="progressstatus" style="background-color: #fff;">uploading</div>');
+//  $('#progressbar').css('background-color', '#80ADB0');
+  $('#progressbar').html('<div id="progress" style="height:20px;width:0%" /><div id="progressstatus" style="">uploading</div>');
 }
 
 /* param f = file */
@@ -375,16 +376,18 @@ UploadQueue.prototype.markDone = function(no) {
     this.upload(no + 1);
   } else {
     this.isUploading = false;
+    $('#progressbar').hide();
   }
 };
 
 UploadQueue.prototype.upload = function(no) {
   var that = this;
   var fil = this.allFiles[no];
-  console.log("uploading", fil);
+//  console.log("uploading", fil);
   var data = this.getData(fil);
   var $li = this.getLi(no);
   this.isUploading = true;
+  $('#progressbar').show();
   $li.addClass("uploading");
   ogg = FirefoggUploader(fil, add_url, data, function(ogg) {
     if (ogg.resultUrl) {

edgware/templates/upload_files.html

@@ -59,12 +59,6 @@ $(function() {
   </script>
 
   <style type="text/css">
-#fileList {
-  width: 400px;
-  min-height: 400px;
-  background: #666;
-}
-
 #addFilesWrapper {
   display: none;
 }
@@ -77,6 +71,15 @@ $(function() {
   background-color: green;
 }
 
+#progressbar {
+  display: none;
+  background-color: #80ADB0;
+}
+
+#progressstatus {
+  background-color: #005740;
+}
+
   </style>
 {% endblock %}