From 3143101ab5d227240f3670bd8a3c0d68e3ba307f Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Tue, 20 May 2014 16:53:19 +0900 Subject: [PATCH] Moved identify device button to Info tab. --- .../device-control/device-control.jade | 9 ++++-- res/app/control-panes/info/info.jade | 29 +++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index 185aecc0..fab4a31f 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -4,9 +4,6 @@ .stf-vnc-navbar.as-row(ng-show='!$root.basicMode') .pull-right - button(ng-click='control.identify()', tooltip='Find Device', tooltip-placement='bottom').btn.btn-sm.btn-info-outline - i.fa.fa-info - span.orientation-degree {{device.display.orientation}}° span @@ -15,6 +12,12 @@ button(type='button', ng-click='control.rotate(90)', tooltip='Landscape', tooltip-placement='bottom').btn.btn-sm.btn-primary-outline i.fa.fa-mobile.fa-rotate-90 + //span + button(type='button', ng-click='control.rotate(0)', tooltip='Portrait', tooltip-placement='bottom').btn.btn-sm.btn-primary-outline + i.fa.fa-mobile + button(type='button', ng-click='control.rotate(90)', tooltip='Landscape', tooltip-placement='bottom').btn.btn-sm.btn-primary-outline + i.fa.fa-mobile.fa-rotate-90 + // NOTE: ui-bootstrap bug: tooltip breaks btn-checkbox so don't put in the same button button(type='button', ng-model='showScreen', btn-checkbox).btn.btn-sm.btn-danger i(ng-show='showScreen', tooltip-html-unsafe='{{"Hide Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.jade index 1367afbe..a36a399e 100644 --- a/res/app/control-panes/info/info.jade +++ b/res/app/control-panes/info/info.jade @@ -1,5 +1,22 @@ .row.stf-info(ng-controller='InfoCtrl') - .col-md-3 + + .col-md-4 + .widget-container.fluid-height + .heading + i.fa.fa-location-arrow + span(translate) Location + .pull-right + button(ng-click='control.identify()').btn.btn-xs.btn-primary-outline + i.fa.fa-info + span Find Device + .widget-content.padded-small + table.table.table-condensed.table-hover.table-infocard + tbody + tr + td(translate) Place + td {{device.provider.name}} + + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-bolt @@ -28,7 +45,7 @@ td Voltage td {{device.battery.voltage}} v - .col-md-3 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-tablet @@ -64,7 +81,7 @@ td Y DPI td {{device.display.ydpi}} - .col-md-3 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-signal @@ -91,7 +108,7 @@ td Sub Type td {{device.network.subtype | networkSubType}} - .col-md-3 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-credit-card @@ -117,7 +134,7 @@ small {{device.phone.iccid}} - .col-md-3 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-phone @@ -141,7 +158,7 @@ td(translate) Released td {{device.releasedAt | date:longDate}} - .col-md-3 + .col-md-4 .widget-container.fluid-height .heading i.fa.fa-mobile