diff --git a/bower.json b/bower.json index 9ee9f36c..210d0be0 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,8 @@ "angular-dialog-service": "~3.1.0", "ng-file-upload": "~1.2.11", "angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3", - "bluebird": "~1.1.1" + "bluebird": "~1.1.1", + "angular-tree-control": "~0.1.4" }, "private": true, "resolutions": { diff --git a/res/app/components/stf/control/control-service.js b/res/app/components/stf/control/control-service.js index 1bf1ac43..4ca46cc9 100644 --- a/res/app/components/stf/control/control-service.js +++ b/res/app/components/stf/control/control-service.js @@ -118,6 +118,8 @@ module.exports = function ControlServiceFactory( var manifest = response.data.manifest var app = manifest.application var tx = TransactionService.create(target) + console.log('resp',response) + console.log(manifest) var params = { url: response.data.url } diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/upload/upload-controller.js index 3cfddf01..a7bb6272 100644 --- a/res/app/control-panes/dashboard/upload/upload-controller.js +++ b/res/app/control-panes/dashboard/upload/upload-controller.js @@ -20,21 +20,13 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettex .then(function (result) { $scope.$apply(function () { result.manifest = manifest + console.log(manifest) $scope.installation = result }) }) }) } - $scope.progressMessage = function (code) { - return { - 'pushing_app': gettext('Pushing app...'), - 'installing_app': gettext('Installing app...'), - 'launching_app': gettext('Launching activity...'), - 'success': gettext('Installation complete'), - 'fail': gettext('Installation failed') - }[code] - } // // $scope.installEnabled = true // SettingsService.bind($scope, { diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade index 963e9a38..694c467b 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/upload/upload.jade @@ -12,12 +12,6 @@ .widget-content.padded - //.input-group.form-inline - input(type=text, ng-model='remoteUrl', ng-enter='$root.install(remoteUrl)', placeholder='http://...').form-control - span.input-group-btn - button.btn.btn-primary-outline(ng-click='$root.install(remoteUrl)', tooltip='Upload From Link', ng-disabled='!remoteUrl') - i.fa.fa-upload - .drop-area(ng-file-drop='$root.install($files)').file-input.btn-file input(type='file', ng-file-select='$root.install($files)') @@ -26,13 +20,34 @@ .col-md-10.col-md-offset-1 .input-group.form-inline - input(type=text, ng-model='remoteUrl', ng-enter='$root.install(remoteUrl)', placeholder='http://...').form-control + input(type=text, ng-model='remoteUrl', ng-enter='$root.install(remoteUrl)', + placeholder='http://...').form-control span.input-group-btn - button.btn.btn-primary-outline(ng-click='$root.install(remoteUrl)', tooltip='Upload From Link', ng-disabled='!remoteUrl') + button.btn.btn-primary-outline(ng-click='$root.install(remoteUrl)', + tooltip='Upload From Link', ng-disabled='!remoteUrl') i.fa.fa-upload .upload-status(ng-if='installation') - p - strong {{ progressMessage(installation.lastData) }} - span ({{installation.progress}}%) - progressbar(max='100', value='installation.progress', ng-if='!installation.settled') + + accordion(close-others='false') + accordion-group(is-open='true') + accordion-heading + i.fa.fa-file-o + span {{installation.manifest.application.name}} + + div(ng-switch='installation.lastData') + strong(ng-switch-when='pushing_app') + span(translate) Pushing app... + strong(ng-switch-when='installing_app') + span(translate) Installing app... + strong(ng-switch-when='launching_app') + span(translate) Launching activity... + strong(ng-switch-when='success') + //pre {{ installation.manifest }} + + strong(ng-switch-when='fail') + span(translate) Installation failed + span(ng-hide='installation.settled') ({{installation.progress}}%) + + progressbar(max='100', value='installation.progress', ng-if='!installation.settled', + ng-class='{"active": !installation.settled}').progress-striped