diff options
| -rw-r--r-- | www/index.html | 4 | ||||
| -rw-r--r-- | www/js/jingles.js | 6 | ||||
| -rw-r--r-- | www/js/musicpools.js | 6 | ||||
| -rw-r--r-- | www/js/shows.js | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/www/index.html b/www/index.html index d1bc9d8..835d928 100644 --- a/www/index.html +++ b/www/index.html @@ -354,7 +354,7 @@ beginne... </td> <td> - <div class="progress"><div class="bar" style="width: 0%;"></div></div> + <div class="progress"><div class="progress-bar" style="width: 0%;"></div></div> </td> <td> <button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Abbrechen</button> @@ -374,7 +374,7 @@ beginne... </td> <td colspan="3"> - <div class="progress"><div class="bar" style="width: 0%;"></div></div> + <div class="progress"><div class="progress-bar" style="width: 0%;"></div></div> </td> <td> <button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Abbrechen</button> diff --git a/www/js/jingles.js b/www/js/jingles.js index e2de6da..04736e4 100644 --- a/www/js/jingles.js +++ b/www/js/jingles.js @@ -133,11 +133,11 @@ Rivendell.JingleGroupView.prototype.uploadProgress = function(file) { var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + Number((file.upload.total/1024)/1024).toFixed(1) + " MB"; $cut.find('.file-bytes').text(bytes_str); - $cut.find('.progress .bar').css("width", file.upload.progress + "%"); + $cut.find('.progress .progress-bar').css("width", file.upload.progress + "%"); } else { $cut.find('.file-bytes').text('importiere...'); - $cut.find('.progress .bar').css('width', '100%'); - $cut.find('.progress').addClass('progress-striped').addClass('active'); + $cut.find('.progress .progress-bar').css('width', '100%'); + $cut.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active'); } }; diff --git a/www/js/musicpools.js b/www/js/musicpools.js index a524072..301ce07 100644 --- a/www/js/musicpools.js +++ b/www/js/musicpools.js @@ -169,11 +169,11 @@ Rivendell.MusicpoolView.prototype.uploadProgress = function(file) { var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + Number((file.upload.total/1024)/1024).toFixed(1) + " MB"; $cart.find('.file-bytes').text(bytes_str); - $cart.find('.progress .bar').css("width", file.upload.progress + "%"); + $cart.find('.progress .progress-bar').css("width", file.upload.progress + "%"); } else { $cart.find('.file-bytes').text('importiere...'); - $cart.find('.progress .bar').css('width', '100%'); - $cart.find('.progress').addClass('progress-striped').addClass('active'); + $cart.find('.progress .progress-bar').css('width', '100%'); + $cart.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active'); } }; diff --git a/www/js/shows.js b/www/js/shows.js index 07a906d..c140fe2 100644 --- a/www/js/shows.js +++ b/www/js/shows.js @@ -77,11 +77,11 @@ function shows_importUpdateProgress(file, stats) { var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + Number((file.upload.total/1024)/1024).toFixed(1) + " MB"; stats.find('.file-bytes').text(bytes_str); - stats.find('.progress .bar').css("width", file.upload.progress + "%"); + stats.find('.progress .progress-bar').css("width", file.upload.progress + "%"); } else { stats.find('.file-bytes').text('importiere...'); - stats.find('.progress .bar').css('width', '100%'); - stats.find('.progress').addClass('progress-striped').addClass('active'); + stats.find('.progress .progress-bar').css('width', '100%'); + stats.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active'); } } @@ -182,7 +182,7 @@ function shows_newCartEntry(elem) { } function shows_newImportingEntry(cart) { - var progress_bar = '<div class="progress"><div class="bar" style="width: 0%;"></div></div>'; + var progress_bar = '<div class="progress"><div class="progress-bar" style="width: 0%;"><span class="sr-only">0% Complete</span></div></div>'; var cancel_button = '<button class="btn btn-danger btn-xs">' + '<span class="glyphicon glyphicon-remove"></span> Abbrechen</button>'; |