diff options
| -rw-r--r-- | view/css/mod_cloud.css | 3 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 8 | ||||
| -rw-r--r-- | view/js/mod_cloud.js | 10 | ||||
| -rw-r--r-- | view/js/mod_photos.js | 9 |
4 files changed, 17 insertions, 13 deletions
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index 8dce7f180..94a01eeef 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -82,10 +82,7 @@ } .upload-progress-bar { - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOM2RFTDwAE2QHxFMHIIwAAAABJRU5ErkJggg==') repeat-y; - background-size: 0px; padding: 0px !important; - height: 3px; } .bootstrap-tagsinput input[type=text] { diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 8a189e9e5..c8fb335c9 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -43,8 +43,11 @@ padding: 7px 3px 7px 10px; } +#upload-index td:nth-child(3){ + padding: 7px 3px; +} + #upload-index td:nth-child(4){ - padding: 7px 10px 7px 3px; white-space: nowrap; } @@ -55,8 +58,5 @@ } .upload-progress-bar { - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOM2RFTDwAE2QHxFMHIIwAAAABJRU5ErkJggg==') repeat-y; - background-size: 0px; padding: 0px !important; - height: 3px; } diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 08fdbd677..1f444e4fe 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -462,7 +462,7 @@ function UploadInit() { // Dynamically update the percentage complete displayed in the file upload list $('#upload-progress-' + id).html(Math.round(data.loaded / data.total * 100) + '%'); - $('#upload-progress-bar-' + id).css('background-size', Math.round(data.loaded / data.total * 100) + '%'); + $('#upload-progress-bar-' + id).css('width', Math.round(data.loaded / data.total * 100) + '%'); }, @@ -478,8 +478,6 @@ function UploadInit() { } - - function prepareHtml(f) { var num = f.idx - 1; var i = f.idx; @@ -492,7 +490,11 @@ function prepareHtml(f) { '<td class="d-none d-md-table-cell">' + formatSizeUnits(f.size) + '</td><td class="d-none d-md-table-cell"></td>' + '</tr>' + '<tr id="new-upload-progress-bar-' + i + '" class="new-upload">' + - '<td id="upload-progress-bar-' + i + '" colspan="9" class="upload-progress-bar"></td>' + + '<td colspan="9" class="upload-progress-bar">' + + '<div class="progress" style="height: 1px;">' + + '<div id="upload-progress-bar-' + i + '" class="progress-bar bg-info" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>' + + '</div>' + + '</td>' + '</tr>' ); } diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index faf14982b..c487fc417 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -82,7 +82,7 @@ function UploadInit() { // Dynamically update the percentage complete displayed in the file upload list $('#upload-progress-' + id).html(Math.round(data.loaded / data.total * 100) + '%'); - $('#upload-progress-bar-' + id).css('background-size', Math.round(data.loaded / data.total * 100) + '%'); + $('#upload-progress-bar-' + id).css('width', Math.round(data.loaded / data.total * 100) + '%'); }, stop: function(e,data) { @@ -97,6 +97,7 @@ function UploadInit() { } + function prepareHtml(f) { var num = f.idx - 1; var i = f.idx; @@ -109,7 +110,11 @@ function prepareHtml(f) { '<td class="d-none d-md-table-cell">' + formatSizeUnits(f.size) + '</td><td class="d-none d-md-table-cell"></td>' + '</tr>' + '<tr id="new-upload-progress-bar-' + i + '" class="new-upload">' + - '<td id="upload-progress-bar-' + i + '" colspan="9" class="upload-progress-bar"></td>' + + '<td colspan="8" class="upload-progress-bar">' + + '<div class="progress" style="height: 1px;">' + + '<div id="upload-progress-bar-' + i + '" class="progress-bar bg-info" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>' + + '</div>' + + '</td>' + '</tr>' ); } |