Removed global progress bar

This commit is contained in:
Pierre-Olivier Latour 2014-04-01 13:19:03 -07:00
parent 22d12406c8
commit 73ff754de4
3 changed files with 18 additions and 40 deletions

View File

@ -64,21 +64,19 @@
font-size: 0.9em;
}
#reload {
float: right;
}
/* Bootstrap overrides */
.btn:focus {
outline: none; /* FIXME: Work around for Chrome only but still draws focus ring while button pressed */
}
.row > div > p {
text-align: right;
margin-top: 8px;
margin-bottom: 0px;
}
.progress {
margin-top: 8px;
margin-bottom: 0px;
.btn-toolbar {
margin-top: 30px;
margin-bottom: 20px;
}
.table .progress {
@ -87,11 +85,6 @@
height: 16px;
}
.row {
margin-top: 30px;
margin-bottom: 20px;
}
.panel-default > .panel-heading {
color: #555;
}

View File

@ -64,26 +64,17 @@
<div id="alerts"></div>
<div class="row">
<div class="col-sm-8">
<div class="btn-toolbar">
<button type="button" class="btn btn-primary fileinput-button">
<span class="glyphicon glyphicon-upload"></span> Upload Files&hellip;
<input id="fileupload" type="file" name="files[]" multiple>
</button>
<button type="button" class="btn btn-success" id="create-folder">
<span class="glyphicon glyphicon-folder-close"></span> Create Folder&hellip;
</button>
<button type="button" class="btn btn-default" id="reload">
<span class="glyphicon glyphicon-refresh"></span> Refresh
</button>
</div>
</div>
<div class="col-sm-4">
<div class="progress progress-striped active uploading">
<div class="progress-bar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" id="progress-bar"></div>
</div>
</div>
<div class="btn-toolbar">
<button type="button" class="btn btn-primary fileinput-button">
<span class="glyphicon glyphicon-upload"></span> Upload Files&hellip;
<input id="fileupload" type="file" name="files[]" multiple>
</button>
<button type="button" class="btn btn-success" id="create-folder">
<span class="glyphicon glyphicon-folder-close"></span> Create Folder&hellip;
</button>
<button type="button" class="btn btn-default" id="reload">
<span class="glyphicon glyphicon-refresh"></span> Refresh
</button>
</div>
<div class="panel panel-default uploading">

View File

@ -146,15 +146,9 @@ $(document).ready(function() {
dataType: 'json',
start: function(e) {
$("#progress-bar").css("width", "0%");
$(".uploading").show();
},
progressall: function(e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
$("#progress-bar").css("width", progress + "%"); // .text(progress + "%")
},
stop: function(e) {
$(".uploading").hide();
},