starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-21 05:15:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show progress bar after 2nd upload.

Browse Source
This commit is contained in:
Gunther Brunner
2014-09-04 18:03:45 +09:00
parent 22d44dcc27
commit f91bf901fa
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/app/control-panes/dashboard/install/install-controller.js
View File

@@ -108,6 +108,12 @@ module.exports = function InstallCtrl(
$scope.maybeInstall = function (options) { $scope.maybeInstall = function (options) {
if ($scope.installEnabled) { if ($scope.installEnabled) {
if ($scope.installation) {
$scope.installation.lastData = null
}
$scope.accordionOpen = true
return $scope.control.install(options) return $scope.control.install(options)
.progressed(function (installResult) { .progressed(function (installResult) {
$scope.$apply(function () { $scope.$apply(function () {

7
res/app/control-panes/dashboard/install/install.jade
View File

@@ -10,7 +10,7 @@
input(type='checkbox', ng-model='installEnabled') input(type='checkbox', ng-model='installEnabled')
span(translate) Install span(translate) Install
.widget-content.padded() .widget-content.padded
//.widget-content.padded(style='padding: 0; padding-bottom: 15px;') //.widget-content.padded(style='padding: 0; padding-bottom: 15px;')
//.col-md-10.col-md-offset-1 //.col-md-10.col-md-offset-1
@@ -28,13 +28,10 @@
i.fa.fa-2x.fa-download.drop-area-icon i.fa.fa-2x.fa-download.drop-area-icon
.drop-area-text(translate) Drop file to upload .drop-area-text(translate) Drop file to upload
//treecontrol.tree-classic(tree-model='treeData', options='treeOptions')
span employee: {{node.name}} age {{node.age}}
.upload-status(ng-if='upload || installation') .upload-status(ng-if='upload || installation')
accordion(close-others='false').pointer accordion(close-others='false').pointer
accordion-group(is-open='accordionOpen') accordion-group(is-open='accordionOpen', is-disabled='accordionDisabled')
accordion-heading.pointer accordion-heading.pointer
i.fa.fa-file-o i.fa.fa-file-o
span {{installation.manifest.package || "App" }} span {{installation.manifest.package || "App" }}