yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

Updating to the new devices-db.

Browse source
This commit is contained in:
Gunther Brunner 2014-05-23 17:23:49 +09:00
parent 17e7b94d68
commit 3794237224
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/middleware/device-icons.js
View file

@ -4,5 +4,5 @@ var pathutil = require('../util/pathutil')
module.exports = function() { module.exports = function() {
return express.static( return express.static(
pathutil.root('node_modules/stf-device-db/data/small')) pathutil.root('node_modules/stf-device-db/dist'))
} }

4
res/app/control-panes/device-control/device-control.jade
View file

@ -20,7 +20,7 @@
a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle
p p
.device-small-image .device-small-image
img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}') img(ng-src='{{device.image ? "/static/devices/icon/x24/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
span.device-name-text {{ device.name }} span.device-name-text {{ device.name }}
span.caret(ng-show='groupDevices.length > 0') span.caret(ng-show='groupDevices.length > 0')
span(ng-show='device && !device.present', translate) (Absent) span(ng-show='device && !device.present', translate) (Absent)
@ -29,7 +29,7 @@
li(ng-repeat='groupDevice in groupDevices') li(ng-repeat='groupDevice in groupDevices')
a(ng-click='controlDevice(groupDevice); $event.stopPropagation()') a(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
.device-small-image .device-small-image
img(ng-src='{{groupDevice.image ? "/static/devices/" + groupDevice.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}') img(ng-src='{{groupDevice.image ? "/static/devices/icon/x24/" + groupDevice.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
span(ng-class='{"current-device": groupDevice.serial === device.serial }') {{ groupDevice.name }} span(ng-class='{"current-device": groupDevice.serial === device.serial }') {{ groupDevice.name }}
span.pull-right(ng-click='kickDevice(groupDevice); $event.stopPropagation()').kick-device span.pull-right(ng-click='kickDevice(groupDevice); $event.stopPropagation()').kick-device

4
res/app/device-list/device-list.jade
View file

@ -16,7 +16,7 @@ div.stf-device-list
ng-click='toggle(device)', ng-click='toggle(device)',
).cursor-select.pointer.thumbnail ).cursor-select.pointer.thumbnail
.device-photo-small .device-photo-small
img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}') img(ng-src='{{device.image ? "/static/devices/icon/x120/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
.device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }} .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 }}') //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 {{device.state|statusName}} button(ng-class='{"btn-primary": device.state == "using", "btn-primary-outline": device.state == "available"}').btn.btn-xs.device-status {{device.state|statusName}}
@ -28,7 +28,7 @@ div.stf-device-list
ng-disabled='true', ng-disabled='true',
).cursor-select.pointer.thumbnail.device-is-busy ).cursor-select.pointer.thumbnail.device-is-busy
.device-photo-small .device-photo-small
img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}') img(ng-src='{{device.image ? "/static/devices/icon/x120/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
.device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }} .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 }}') //raphael-status-icon.device-status-button(status='{{ deviceStatus(device) }}', title="{{ deviceStatusText(device) }}", tooltip='{{ deviceStatusText(device)|translate }}')
//button.btn.btn-default.btn-xs.device-status {{statusName(device)}} //button.btn.btn-default.btn-xs.device-status {{statusName(device)}}