diff --git a/res/app/control-panes/dashboard/apps/apps-controller.js b/res/app/control-panes/dashboard/apps/apps-controller.js new file mode 100644 index 00000000..0bb3c6a0 --- /dev/null +++ b/res/app/control-panes/dashboard/apps/apps-controller.js @@ -0,0 +1,34 @@ +module.exports = function ShellCtrl($scope, gettext) { + // TODO: implement multiple devices +// $scope.results = [] + $scope.result = null + + $scope.referenceUrl = 'https://github.com/jackpal/Android-Terminal-Emulator/wiki/Android-Shell-Command-Reference' + + $scope.run = function(command) { + if (command === 'clear') { + $scope.clear() + return + } + + $scope.command = '' + + return $scope.control.shell(command) + .progressed(function(result) { + $scope.result = result + $scope.data = result.data.join('') + $scope.$digest() + }) + .then(function(result) { + $scope.result = result + $scope.data = result.data.join('') + $scope.$digest() + }) + } + + $scope.clear = function () { + $scope.command = '' + $scope.data = '' + $scope.result = null + } +} diff --git a/res/app/control-panes/dashboard/apps/apps.css b/res/app/control-panes/dashboard/apps/apps.css new file mode 100644 index 00000000..39dc6f89 --- /dev/null +++ b/res/app/control-panes/dashboard/apps/apps.css @@ -0,0 +1,3 @@ +.stf-apps { + +} diff --git a/res/app/control-panes/dashboard/apps/apps.jade b/res/app/control-panes/dashboard/apps/apps.jade new file mode 100644 index 00000000..9877c284 --- /dev/null +++ b/res/app/control-panes/dashboard/apps/apps.jade @@ -0,0 +1,11 @@ +.widget-container.fluid-height.stf-apps(ng-controller='AppsCtrl') + .heading + i.fa.fa-th-large + span(translate) Apps + div.pull-right + button.btn.btn-sm.btn-primary-outline(ng-click='control.openStore()', + tooltip='{{"App Store" | translate}}', tooltip-placement="bottom") + i.fa.fa-android.fa-1x + + .widget-content.padded + diff --git a/res/app/control-panes/dashboard/apps/index.js b/res/app/control-panes/dashboard/apps/index.js new file mode 100644 index 00000000..83862ae2 --- /dev/null +++ b/res/app/control-panes/dashboard/apps/index.js @@ -0,0 +1,11 @@ +require('./apps.css') + +module.exports = angular.module('stf.apps', [ + require('stf/common-ui').name +]) + .run(["$templateCache", function ($templateCache) { + $templateCache.put('control-panes/dashboard/apps/apps.jade', + require('./apps.jade') + ) + }]) + .controller('AppsCtrl', require('./apps-controller')) diff --git a/res/app/control-panes/dashboard/dashboard.jade b/res/app/control-panes/dashboard/dashboard.jade index 10fbc470..d053d62e 100644 --- a/res/app/control-panes/dashboard/dashboard.jade +++ b/res/app/control-panes/dashboard/dashboard.jade @@ -9,3 +9,5 @@ div(ng-include='"control-panes/dashboard/upload/upload.jade"') .col-md-6(ng-if='$root.platform == "native"') div(ng-include='"control-panes/dashboard/shell/shell.jade"') + .col-md-6(ng-if='$root.platform == "native"') + div(ng-include='"control-panes/dashboard/apps/apps.jade"') diff --git a/res/app/control-panes/dashboard/index.js b/res/app/control-panes/dashboard/index.js index 84334122..58d89bdd 100644 --- a/res/app/control-panes/dashboard/index.js +++ b/res/app/control-panes/dashboard/index.js @@ -3,7 +3,8 @@ module.exports = angular.module('stf.dashboard', [ require('./browser/index').name, require('./input/index').name, require('./shell/index').name, - require('./upload/index').name + require('./upload/index').name, + require('./apps/index').name ]) .run(["$templateCache", function ($templateCache) { $templateCache.put( diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade index 8bbe69a8..6e18845c 100644 --- a/res/app/device-list/device-list.jade +++ b/res/app/device-list/device-list.jade @@ -18,7 +18,7 @@ div.stf-device-list img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}') .device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }} //raphael-status-icon.device-status-button(status='{{ deviceStatus(device) }}', title="{{ deviceStatusText(device) }}", tooltip='{{ deviceStatusText(device)|translate }}') - button(ng-class='{"btn-primary": device.state == "using", "btn-primary-outline": device.state == "available"}').btn.btn-xs.device-status {{statusName(device)}} + button(ng-class='{"btn-primary": device.state == "using", "btn-primary-outline": device.state == "available"}').btn.btn-xs.device-status {{device.state|statusName}} .clear-fix .clear-fix .line @@ -97,9 +97,16 @@ div.stf-device-list td(ng-show='showAll', data-title="'Battery Health'", sortable='"battery.health"', filter='{"battery.health": "text"}') span {{device.battery.health | batteryHealth}} td(ng-show='showAll', data-title="'Battery Source'", sortable='"battery.source"', filter='{"battery.source": "text"}') - span {{device.battery.source}} - - + span {{device.battery.source | batterySource}} + td(ng-show='showAll', data-title="'Battery Status'", sortable='"battery.status"', filter='{"battery.status": "text"}') + span {{device.battery.status | batteryStatus}} + td(ng-show='showAll', data-title="'Battery Level'", sortable='"battery.level"', filter='{"battery.level": "text"}') + progressbar(value='device.battery.level', max='device.battery.scale', type='success') + span {{ device.battery.level / device.battery.scale * 100 }}% + td(ng-show='showAll', data-title="'Battery Temperature'", sortable='"battery.temp"', filter='{"battery.temp": "text"}') + span {{device.battery.temp}}°C + td(ng-show='showAll', data-title="'Battery Voltage'", sortable='"battery.voltage"', filter='{"battery.voltage": "text"}') + span {{device.battery.voltage}}v td(data-title="'Location'|translate", sortable='"provider.name"', filter='{"provider.name": "text"}') span {{device.provider.name}}