cuong/GCDWebServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed global progress bar

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

21
GCDWebUploader/GCDWebUploader.bundle/css/index.css
View File

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

31
GCDWebUploader/GCDWebUploader.bundle/index.html
View File

@ -64,26 +64,17 @@
<div id="alerts"></div> <div id="alerts"></div>
<div class="row"> <div class="btn-toolbar">
<div class="col-sm-8"> <button type="button" class="btn btn-primary fileinput-button">
<div class="btn-toolbar"> <span class="glyphicon glyphicon-upload"></span> Upload Files&hellip;
<button type="button" class="btn btn-primary fileinput-button"> <input id="fileupload" type="file" name="files[]" multiple>
<span class="glyphicon glyphicon-upload"></span> Upload Files&hellip; </button>
<input id="fileupload" type="file" name="files[]" multiple> <button type="button" class="btn btn-success" id="create-folder">
</button> <span class="glyphicon glyphicon-folder-close"></span> Create Folder&hellip;
<button type="button" class="btn btn-success" id="create-folder"> </button>
<span class="glyphicon glyphicon-folder-close"></span> Create Folder&hellip; <button type="button" class="btn btn-default" id="reload">
</button> <span class="glyphicon glyphicon-refresh"></span> Refresh
<button type="button" class="btn btn-default" id="reload"> </button>
<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> </div>
<div class="panel panel-default uploading"> <div class="panel panel-default uploading">

6
GCDWebUploader/GCDWebUploader.bundle/js/index.js
View File

@ -146,15 +146,9 @@ $(document).ready(function() {
dataType: 'json', dataType: 'json',
start: function(e) { start: function(e) {
$("#progress-bar").css("width", "0%");
$(".uploading").show(); $(".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) { stop: function(e) {
$(".uploading").hide(); $(".uploading").hide();
}, },