From 17c7d3a6f0f7c511dfc8c008e7be19d44c883396 Mon Sep 17 00:00:00 2001 From: Peter Grassberger Date: Tue, 1 Dec 2015 19:41:05 +0100 Subject: jingle: fix progress bar style diff --git a/www/index.html b/www/index.html index 4af12a1..071e96c 100644 --- a/www/index.html +++ b/www/index.html @@ -184,6 +184,19 @@ + + + + - + + +
+ + + + + + diff --git a/www/js/jingles.js b/www/js/jingles.js index 39b7471..13df2bf 100644 --- a/www/js/jingles.js +++ b/www/js/jingles.js @@ -198,31 +198,17 @@ JingleGroup.prototype.render = function() { $('table > tbody', self.$el).append(cut.render()); }); } - $('table > tbody', self.$el).append(this.renderProgressbar()); -}; - -JingleGroup.prototype.renderProgressbar = function() { - var progress_bar = '
'; - var cancel_button = ''; - - return $('').addClass('progressBar').hide() - .append($('').text('')) - .append($('').addClass('file-name').text('-')) - .append($('').addClass('file-bytes').text('??.? von ??.? MB')) - .append($('').append(progress_bar)) - .append($('').css('text-align', 'center').append(cancel_button)); }; JingleGroup.prototype.uploading = function() { console.log('uploading!'); - $('table > tbody .progressBar', this.$el).show(); + $('table > tfoot .progressBar', this.$el).removeClass('hidden'); }; JingleGroup.prototype.uploadProgress = function(file) { console.log('uploadProgress!'); - var stats = $('table > tbody .progressBar', this.$el); + var stats = $('table > tfoot .progressBar', this.$el); if(file.upload.progress < 99) { var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + -- cgit v0.10.2