diff --git a/res/app/components/stf/device/device-info/index.js b/res/app/components/stf/device/device-info-filter/index.js similarity index 52% rename from res/app/components/stf/device/device-info/index.js rename to res/app/components/stf/device/device-info-filter/index.js index 1f585e7c..a0c48338 100644 --- a/res/app/components/stf/device/device-info/index.js +++ b/res/app/components/stf/device/device-info-filter/index.js @@ -45,3 +45,52 @@ module.exports = angular.module('stf.device-status', []) }[text] || gettext('-') } }) + .filter('displayDensity', function (gettext) { + return function (text) { + return { + '0.5': 'LDPI (120 dpi)', + '1': 'MDPI (160 dpi)', + '1.5': 'HDPI (240 dpi)', + '2': 'XHDPI (320 dpi)', + '3': 'XXHDPI (480 dpi)', + '4': 'XXXHDPI (640 dpi)' + }[text] || text + } + }) + .filter('networkType', function (gettext) { + return function (text) { + return { + 'bluetooth': gettext('Bluetooth'), + 'dummy': gettext('Dummy'), + 'ethernet': gettext('Ethernet'), + 'mobile': gettext('Mobile'), + 'mobile_dun': gettext('Mobile DUN'), + 'mobile_hipri': gettext('Mobile High Priority'), + 'mobile_mms': gettext('Mobile MMS'), + 'mobile_supl': gettext('Mobile SUPL'), + 'mobile_wifi': gettext('WiFi'), + 'wimax': gettext('WiMAX') + }[text] || text + } + }) + .filter('networkSubType', function (gettext) { + return function (text) { + return { + 'mobile_wifi': gettext('WiFi'), + }[text] || text + } + }) + .filter('humanizedBool', function (gettext) { + return function (text) { + switch (text) { + case true: + return gettext('Yes') + break; + case false: + return gettext('No') + break; + default: + return gettext('-') + } + } + }) diff --git a/res/app/components/stf/device/index.js b/res/app/components/stf/device/index.js index eadea4b9..316f80cd 100644 --- a/res/app/components/stf/device/index.js +++ b/res/app/components/stf/device/index.js @@ -1,4 +1,4 @@ module.exports = angular.module('stf/device', [ - require('./device-info').name + require('./device-info-filter').name ]) .factory('DeviceService', require('./device-service')) diff --git a/res/app/control-panes/info/info.css b/res/app/control-panes/info/info.css index 942ae98d..e9d4da69 100644 --- a/res/app/control-panes/info/info.css +++ b/res/app/control-panes/info/info.css @@ -1,3 +1,25 @@ -.stf-info { -} \ No newline at end of file +.stf-info .table.table-infocard thead > tr > th, +.stf-info .table.table-infocard tbody > tr > th, +.stf-info .table.table-infocard tfoot > tr > th, +.stf-info .table.table-infocard thead > tr > td, +.stf-info .table.table-infocard tbody > tr > td, +.stf-info .table.table-infocard tfoot > tr > td { + border-top: 0; +} + + + +.stf-info .table-infocard tbody > tr > td:first-child { + text-align: right; + margin-right: 20px; +} + +.stf-info .table-infocard tbody > tr > td:last-child { + font-weight: bold; +} + +.stf-info .progress { + margin-bottom: 0; + height: 15px; +} diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.jade index d98f8982..24ded28a 100644 --- a/res/app/control-panes/info/info.jade +++ b/res/app/control-panes/info/info.jade @@ -1,70 +1,161 @@ .row.stf-info(ng-controller='InfoCtrl') - .col-md-6 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-bolt span(translate) Battery .widget-content.padded - dl - dt(translate) Health - dd {{device.battery.health | batteryHealth}} - dl - dt(translate) Source - dd {{device.battery.source | batterySource}} - dl - dt(translate) Status - dd {{device.battery.status | batteryStatus}} - dl - dt(translate) Level - dd - progressbar(value='device.battery.level', max='device.battery.scale', type='success') - span {{ device.battery.level / device.battery.scale * 100 }}% - dl - dt(translate) Temperature - dd {{device.battery.temp}}°C - dl - dt(translate) Voltage - dd {{device.battery.voltage}}v - .col-md-6 + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) Health + td {{device.battery.health | batteryHealth}} + tr + td Power Source + td {{device.battery.source | batterySource}} + tr + td Status + td {{device.battery.status | batteryStatus}} + tr + td Level + td + progressbar(value='device.battery.level', animate='false', max='device.battery.scale', type='success') + span {{ device.battery.level / device.battery.scale * 100 }}% + tr + td Temperature + td {{device.battery.temp}} °C + tr + td Voltage + td {{device.battery.voltage}} v + + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-tablet span(translate) Display .widget-content.padded - table.table.table-bordered + table.table.table-condensed.table-hover.table-infocard tbody tr - td Density - td {{device.display.density}} + td(translate) Density + td {{device.display.density | displayDensity}} tr - td FPS + td(translate) FPS td {{device.display.fps}} + tr + td Width + td {{device.display.width}} px + tr + td Height + td {{device.display.height}} px + tr + td ID + td {{device.display.id}} + tr + td Orientation + td {{device.display.orientation}}° + tr + td Encrypted + td {{device.display.secure | humanizedBool}} + tr + td X DPI + td {{device.display.xdpi}} + tr + td Y DPI + td {{device.display.ydpi}} + .col-md-4 + .widget-container.fluid-height + .heading + i.fa.fa-signal + span(translate) Network + .widget-content.padded + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) Connected + td {{device.network.connected | humanizedBool}} + tr + td(translate) Airplane Mode + td {{device.airplaneMode | humanizedBool}} + tr + td(translate) Using Fallback + td {{device.network.failover | humanizedBool}} + tr + td Roaming + td {{device.network.roaming | humanizedBool}} + tr + td Type + td {{device.network.type | networkType}} + tr + td Sub Type + td {{device.network.subtype | networkSubType}} - dl - dt(translate) Density - dd {{device.display.density}} - dl - dt(translate) FPS - dd {{device.display.fps}} - dl - dt(translate) Width - dd {{device.display.width}} - dl - dt(translate) Height - dd {{device.display.height}} - dl - dt(translate) Id - dd {{device.display.id}} - dl - dt(translate) Orientation - dd {{device.display.orientation}}° - dl - dt(translate) Secure - dd {{device.display.secure}} - dl - dt(translate) DPI X - dd {{device.display.xdpi}} - dl - dt(translate) DPI Y - dd {{device.display.ydpi}} + .col-md-4 + .widget-container.fluid-height + .heading + i.fa.fa-credit-card + span(translate) SIM + .widget-content.padded + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) Operator + td {{device.operator}} + tr + td(translate) Network + td {{device.phone.network}} + tr + td(translate) Number + td {{device.phone.phoneNumber}} + tr + td(translate) ICCID + td {{device.phone.iccid}} + tr + td(translate) IMEI + td {{device.phone.imei}} + + .col-md-4 + .widget-container.fluid-height + .heading + i.fa.fa-phone + span(translate) Hardware + .widget-content.padded + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) Maker + td {{device.manufacturer}} + tr + td(translate) Name + td {{device.name}} + tr + td(translate) Model + td {{device.model}} + tr + td(translate) Serial + td {{device.serial}} + tr + td(translate) Released + td {{device.releasedAt | date:longDate}} + + .col-md-4 + .widget-container.fluid-height + .heading + i.fa.fa-phone + span(translate) Platform + .widget-content.padded + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) OS + td {{device.platform}} + tr + td(translate) Version + td {{device.version}} + tr + td(translate) SDK + td {{device.sdk}} + tr + td(translate) ABI + td {{device.abi}}