CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor, css

Browse Source
This commit is contained in:
Sanj 2011-06-01 16:21:25 +05:30
parent eec30e7095
commit 5f261ac580
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
edgware/static/js/upload/upload.js
View File

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

15
edgware/templates/upload_files.html
View File

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