diff options
Diffstat (limited to 'client')
| -rwxr-xr-x | client/index.html | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | client/js/controllers/image/edit.js | 13 | ||||
| -rwxr-xr-x | client/partials/image/edit.html | 8 |
3 files changed, 23 insertions, 2 deletions
diff --git a/client/index.html b/client/index.html index 3dd501a..ad51d8d 100755 --- a/client/index.html +++ b/client/index.html @@ -10,6 +10,7 @@ <link rel="stylesheet" href="./vendors/bootstrap/css/bootstrap.css"> <link rel="stylesheet" href="./css/style.css"> <link rel="stylesheet" href="./vendors/jointjs/css/joint.min.css"> + <link rel="stylesheet" href="./vendors/jquery-File-Upload/jquery.fileupload.css"> <link rel="stylesheet" href="./css/graph.css"> @@ -70,6 +71,9 @@ <!-- Include JQuery --> <script src="./vendors/jquery/jquery-2.2.0.min.js"></script> + <script src="./vendors/jquery-File-Upload/jquery.ui.widget.js"></script> + <script src="./vendors/jquery-File-Upload/jquery.iframe-transport.js"></script> + <script src="./vendors/jquery-File-Upload/jquery.fileupload.js"></script> <script src="./vendors/jquery/dmuploader.min.js"></script> <!-- Include Bootstrap --> diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index 776f88f..e1da271 100644..100755 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -20,6 +20,17 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', ' $scope.axioms = axioms; $('#editImageModal').modal('show'); + $("#fileupload").fileupload({ + formData: {task: "image", token: Identity.getToken(), action: "uploadImage", id: $scope.data.id}, + /* ... */ + progressall: function (e, data) { + var progress = parseInt(data.loaded / data.total * 100, 10); + $('#progress .bar').css( + 'width', + progress + '%' + ); + } + }); }); $scope.applyEdition = function (id) { @@ -34,4 +45,6 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', ' $scope.getToken = function () { return Identity.getToken(); } + + }]); diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index 3b37c3b..d5c3621 100755 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -34,7 +34,11 @@ </fieldset> </form> - <form action="../server/index.php" enctype="multipart/form-data" method="post" ng-if='image.status == "queued"'> + <input id="fileupload" type="file" name="files" data-url="../server/index.php"> + <div id="progress"> + <div class="bar" style="width: 0%;"></div> + </div> + <!-- <form action="../server/index.php" enctype="multipart/form-data" method="post" ng-if='image.status == "queued"'> <input type="hidden" name="task" value="image" /> <input type="hidden" name="token" value="{{ getToken()}}" /> <input type="hidden" name="action" value="uploadImage" /> @@ -48,7 +52,7 @@ <input type="submit" value="Upload"/> </fieldset> - </form> + </form> --> <div class="modal-footer"> <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>--> |