diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade index 7bba4870..80a253c1 100644 --- a/res/app/control-panes/dashboard/navigation/navigation.jade +++ b/res/app/control-panes/dashboard/navigation/navigation.jade @@ -17,9 +17,9 @@ typeahead='url for url in urlHistory | filter:$viewValue').form-control .input-group-btn button(ng-click='openURL()', ng-disabled='!textURL', translate).btn.btn-primary-outline Open - button(type='button', ng-disabled='!hasHistory()').btn.btn-primary-outline.dropdown-toggle + //button(type='button', ng-disabled='!hasHistory()').btn.btn-primary-outline.dropdown-toggle span.caret - ul.dropdown-menu + //ul.dropdown-menu li(ng-repeat='url in urlHistory') a(ng-click='insertURL(url)').btn-link {{url}} li.divider diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade index d7b7074b..574e69a2 100644 --- a/res/app/device-list/device-list.jade +++ b/res/app/device-list/device-list.jade @@ -25,10 +25,12 @@ div.stf-device-list ul.devices-icon-view li(ng-repeat='device in tracker.devices | filter:{usable:true} | filter:{name:deviceSearch} | orderBy:"name" track by device.serial', ng-click='toggle(device)', + popover='{{ device.model }}', popover-trigger='mouseenter', popover-popup-delay='1000', + popover-title='{{ device.name || device.model }}', popover-placement='top' ).cursor-select.pointer.thumbnail .device-photo-small img(ng-src='/static/devices/icon/x120/{{ device.image || "_default.jpg" }}') - .device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }} + .device-name {{ 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 {{device.state|statusName}} .clear-fix