diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/upload/upload-controller.js index 0b518dc8..0653931b 100644 --- a/res/app/control-panes/dashboard/upload/upload-controller.js +++ b/res/app/control-panes/dashboard/upload/upload-controller.js @@ -1,9 +1,13 @@ -module.exports = function UploadCtrl($scope) { +module.exports = function UploadCtrl($scope, $rootScope) { $scope.installation = null - $scope.install = function ($files) { - return $scope.control.install($files) + $scope.clear = function () { + $scope.installation = null + } + + $rootScope.install = function ($files) { + return $rootScope.control.install($files) .then(function (tx) { return tx.promise .progressed(function (result) { diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade index 66774fcc..409b4181 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/upload/upload.jade @@ -2,5 +2,8 @@ .heading i.fa.fa-upload span(translate) Upload + clear-button(ng-click='clear()', ng-disabled='!installation').btn-xs .widget-content.padded - div + div(ng-show='installation') + strong {{ installation.lastData }} + progressbar(max='100', value='installation.progress') {{installation.progress}}% \ No newline at end of file diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index f057f1ce..82bfbb81 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -14,8 +14,7 @@ - div(ng-if='installation') - strong Installation status: {{ installation.progress}}% ({{ installation.lastData }}) + .as-row.fill-height div(ng-controller='DeviceScreenCtrl', ng-file-drop='$root.install($files)')