diff --git a/res/app/control-panes/dashboard/dashboard.jade b/res/app/control-panes/dashboard/dashboard.jade index 4b23b3bd..2713ea2a 100644 --- a/res/app/control-panes/dashboard/dashboard.jade +++ b/res/app/control-panes/dashboard/dashboard.jade @@ -10,7 +10,7 @@ .row .col-md-6 - div(ng-include='"control-panes/dashboard/upload/upload.jade"') + div(ng-include='"control-panes/dashboard/install/install.jade"') .col-md-6(ng-if='$root.platform == "native"') div(ng-include='"control-panes/dashboard/shell/shell.jade"') .row diff --git a/res/app/control-panes/dashboard/index.js b/res/app/control-panes/dashboard/index.js index 07803c39..cf4eb274 100644 --- a/res/app/control-panes/dashboard/index.js +++ b/res/app/control-panes/dashboard/index.js @@ -1,7 +1,7 @@ module.exports = angular.module('stf.dashboard', [ require('./navigation/index').name, require('./shell/index').name, - require('./upload/index').name, + require('./install/index').name, require('./apps/index').name, require('./clipboard/index').name, require('./remote-debug/index').name diff --git a/res/app/control-panes/dashboard/upload/activities/activities-controller.js b/res/app/control-panes/dashboard/install/activities/activities-controller.js similarity index 100% rename from res/app/control-panes/dashboard/upload/activities/activities-controller.js rename to res/app/control-panes/dashboard/install/activities/activities-controller.js diff --git a/res/app/control-panes/dashboard/upload/activities/activities-spec.js b/res/app/control-panes/dashboard/install/activities/activities-spec.js similarity index 100% rename from res/app/control-panes/dashboard/upload/activities/activities-spec.js rename to res/app/control-panes/dashboard/install/activities/activities-spec.js diff --git a/res/app/control-panes/dashboard/upload/activities/activities.css b/res/app/control-panes/dashboard/install/activities/activities.css similarity index 100% rename from res/app/control-panes/dashboard/upload/activities/activities.css rename to res/app/control-panes/dashboard/install/activities/activities.css diff --git a/res/app/control-panes/dashboard/upload/activities/activities.jade b/res/app/control-panes/dashboard/install/activities/activities.jade similarity index 100% rename from res/app/control-panes/dashboard/upload/activities/activities.jade rename to res/app/control-panes/dashboard/install/activities/activities.jade diff --git a/res/app/control-panes/dashboard/upload/activities/index.js b/res/app/control-panes/dashboard/install/activities/index.js similarity index 81% rename from res/app/control-panes/dashboard/upload/activities/index.js rename to res/app/control-panes/dashboard/install/activities/index.js index 15ad7829..49197681 100644 --- a/res/app/control-panes/dashboard/upload/activities/index.js +++ b/res/app/control-panes/dashboard/install/activities/index.js @@ -5,7 +5,7 @@ module.exports = angular.module('stf.activities', [ ]) .run(["$templateCache", function ($templateCache) { $templateCache.put( - 'control-panes/dashboard/upload/activities/activities.jade', + 'control-panes/dashboard/install/activities/activities.jade', require('./activities.jade') ) }]) diff --git a/res/app/control-panes/dashboard/upload/activities/test/manifest-1.json b/res/app/control-panes/dashboard/install/activities/test/manifest-1.json similarity index 100% rename from res/app/control-panes/dashboard/upload/activities/test/manifest-1.json rename to res/app/control-panes/dashboard/install/activities/test/manifest-1.json diff --git a/res/app/control-panes/dashboard/upload/index.js b/res/app/control-panes/dashboard/install/index.js similarity index 53% rename from res/app/control-panes/dashboard/upload/index.js rename to res/app/control-panes/dashboard/install/index.js index e4c69f0c..d353dc24 100644 --- a/res/app/control-panes/dashboard/upload/index.js +++ b/res/app/control-panes/dashboard/install/index.js @@ -1,8 +1,8 @@ -require('./upload.css') +require('./install.css') require('ng-file-upload') -module.exports = angular.module('stf.upload', [ +module.exports = angular.module('stf.install', [ 'angularFileUpload', require('./activities').name, require('stf/settings').name, @@ -11,8 +11,8 @@ module.exports = angular.module('stf.upload', [ require('stf/upload').name ]) .run(["$templateCache", function ($templateCache) { - $templateCache.put('control-panes/dashboard/upload/upload.jade', - require('./upload.jade') + $templateCache.put('control-panes/dashboard/install/install.jade', + require('./install.jade') ) }]) - .controller('UploadCtrl', require('./upload-controller')) + .controller('InstallCtrl', require('./install-controller')) diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/install/install-controller.js similarity index 99% rename from res/app/control-panes/dashboard/upload/upload-controller.js rename to res/app/control-panes/dashboard/install/install-controller.js index 68fdb573..cd1f205b 100644 --- a/res/app/control-panes/dashboard/upload/upload-controller.js +++ b/res/app/control-panes/dashboard/install/install-controller.js @@ -1,4 +1,4 @@ -module.exports = function UploadCtrl( +module.exports = function InstallCtrl( $scope , $http , SettingsService diff --git a/res/app/control-panes/dashboard/upload/upload-spec.js b/res/app/control-panes/dashboard/install/install-spec.js similarity index 72% rename from res/app/control-panes/dashboard/upload/upload-spec.js rename to res/app/control-panes/dashboard/install/install-spec.js index 61349abb..f25e7b91 100644 --- a/res/app/control-panes/dashboard/upload/upload-spec.js +++ b/res/app/control-panes/dashboard/install/install-spec.js @@ -1,4 +1,4 @@ -describe('UploadCtrl', function () { +describe('InstallCtrl', function () { beforeEach(angular.mock.module(require('./').name)); @@ -6,7 +6,7 @@ describe('UploadCtrl', function () { beforeEach(inject(function ($rootScope, $controller) { scope = $rootScope.$new(); - ctrl = $controller('UploadCtrl', {$scope: scope}); + ctrl = $controller('InstallCtrl', {$scope: scope}); })); it('should ...', inject(function () { diff --git a/res/app/control-panes/dashboard/upload/upload.css b/res/app/control-panes/dashboard/install/install.css similarity index 100% rename from res/app/control-panes/dashboard/upload/upload.css rename to res/app/control-panes/dashboard/install/install.css diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/install/install.jade similarity index 95% rename from res/app/control-panes/dashboard/upload/upload.jade rename to res/app/control-panes/dashboard/install/install.jade index 05805991..171e2988 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/install/install.jade @@ -1,4 +1,4 @@ -.widget-container.fluid-height.stf-upload(ng-controller='UploadCtrl') +.widget-container.fluid-height.stf-upload(ng-controller='InstallCtrl') .heading i.fa.fa-upload span(translate) App Upload @@ -64,7 +64,7 @@ span(translate) Launching activity... strong(ng-switch-when='success') - div(ng-include='"control-panes/dashboard/upload/activities/activities.jade"') + div(ng-include='"control-panes/dashboard/install/activities/activities.jade"') button.btn.btn-sm.btn-primary-outline(btn-checkbox, ng-model='showManifest') i.fa.fa-list