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

Update bower dependencies.

Browse source 
Update to latest bootstrap-ui 1.0.3.
Change Wifi settings button and behaviour of several tooltips accordingly.
Remove collapse elements since the animation breaks.
This commit is contained in:
Gunther Brunner 2016-01-14 20:48:38 +09:00
parent af6a08581b
commit b8b293d18a
34 changed files with 136 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bower.json
View file

@ -10,28 +10,28 @@
"angular-touch": "~1.5.0-rc.0",
"lodash": "~3.10.1",
"oboe": "~2.1.2",
"ng-table": "~1.0.0-beta.7",
"angular-gettext": "~2.1.0",
"ng-table": "~1.0.0-beta.9",
"angular-gettext": "~2.2.0",
"angular-ui-ace": "~0.2.3",
"angular-dialog-service": "~5.2.6",
"angular-dialog-service": "~5.2.11",
"ng-file-upload": "~2.0.5",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.7.9",
"underscore.string": "~3.2.2",
"bootstrap": "~3.3.5",
"bootstrap": "~3.3.6",
"font-lato-2-subset": "~0.4.0",
"packery": "~1.4.3",
"draggabilly": "~1.2.4",
"angular-elastic": "~2.5.1",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.6.0",
"angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
"angular-ui-bootstrap": "~0.14.2",
"angular-ui-bootstrap": "~1.0.3",
"ng-context-menu": "AdiDahan/ng-context-menu#~1.0.5",
"components-font-awesome": "~4.5.0",
"epoch": "~0.6.0",
"epoch": "~0.8.4",
"ng-epoch": "~1.0.7",
"eventEmitter": "~4.3.0",
"angular-ladda": "~0.3.1",
"d3": "~3.5.11",
"d3": "~3.5.12",
"spin.js": "~2.3.2",
"angular-xeditable": "~0.1.9"
},
@ -43,6 +43,7 @@
"angular": "~1.5.0-rc.0",
"d3": "~3.5.5",
"spin.js": "~2.3.2",
"eventEmitter": "~4.3.0"
"eventEmitter": "~4.3.0",
"epoch": "~0.8.4"
}
}

2
res/app/components/stf/common-ui/badge-icon/badge-icon.jade
View file

@ -1,2 +1,2 @@
div.stf-badge-icon
i.fa.fa-warning.stf-badge-icon-warning(tooltip-placement='bottom', tooltip='An error has ocurred')
i.fa.fa-warning.stf-badge-icon-warning(tooltip-placement='bottom', uib-tooltip='An error has ocurred')

2
res/app/components/stf/common-ui/filter-button/filter-button.jade
View file

@ -1,3 +1,3 @@
button(btn-checkbox, title='{{"Filter"|translate}}').btn.btn-sm.btn-primary-outline.pull-right
button(uib-btn-checkbox, title='{{"Filter"|translate}}').btn.btn-sm.btn-primary-outline.pull-right
i.fa.fa-filter
span {{"Filter"|translate}}

2
res/app/components/stf/common-ui/help-icon/help-icon.jade
View file

@ -1,2 +1,2 @@
a(ng-href='/#!/docs/{{topic}}', tooltip='{{tooltip}}', tooltip-placement='left').btn.btn-xs.btn-primary-outline.pull-right.transparent-border
a(ng-href='/#!/docs/{{topic}}', uib-tooltip='{{tooltip}}', tooltip-placement='left').btn.btn-xs.btn-primary-outline.pull-right.transparent-border
i.fa.fa-question-circle

10
res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
View file

@ -1,15 +1,15 @@
module.exports =
function AddAdbKeyModalServiceFactory($modal) {
function AddAdbKeyModalServiceFactory($uibModal) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, data) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, data) {
$scope.modal = {}
$scope.modal.showAdd = true
$scope.modal.fingerprint = data.fingerprint
$scope.modal.title = data.title
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.$watch('modal.showAdd', function (newValue) {
@ -19,12 +19,12 @@ module.exports =
})
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (data) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./add-adb-key-modal.jade'),
controller: ModalInstanceCtrl,
resolve: {

10
res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
View file

@ -1,9 +1,9 @@
module.exports = function ServiceFactory($modal, $sce) {
module.exports = function ServiceFactory($uibModal, $sce) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, url, title, icon) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, url, title, icon) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.url = $sce.trustAsResourceUrl(url)
@ -11,12 +11,12 @@ module.exports = function ServiceFactory($modal, $sce) {
$scope.icon = icon
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (url, title, icon) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./external-url-modal.jade'),
controller: ModalInstanceCtrl,
windowClass: 'modal-size-80p',

12
res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
View file

@ -1,14 +1,14 @@
module.exports =
function FatalMessageServiceFactory($modal, $location, $route, $interval,
function FatalMessageServiceFactory($uibModal, $location, $route, $interval,
StateClassesService) {
var FatalMessageService = {}
var intervalDeviceInfo
var ModalInstanceCtrl = function ($scope, $modalInstance, device,
var ModalInstanceCtrl = function ($scope, $uibModalInstance, device,
tryToReconnect) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
$route.reload()
}
@ -35,12 +35,12 @@ module.exports =
}
$scope.second = function () {
$modalInstance.dismiss()
$uibModalInstance.dismiss()
$location.path('/devices/')
}
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
var destroyInterval = function () {
@ -56,7 +56,7 @@ module.exports =
}
FatalMessageService.open = function (device, tryToReconnect) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./fatal-message.jade'),
controller: ModalInstanceCtrl,
resolve: {

10
res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
View file

@ -1,21 +1,21 @@
module.exports = function ServiceFactory($modal) {
module.exports = function ServiceFactory($uibModal) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, title, imageUrl) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, title, imageUrl) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.title = title
$scope.imageUrl = imageUrl
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (title, imageUrl) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./lightbox-image.jade'),
controller: ModalInstanceCtrl,
windowClass: 'modal-size-xl',

10
res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
View file

@ -1,23 +1,23 @@
module.exports =
function SocketDisconnectedServiceFactory($modal, $location, $window) {
function SocketDisconnectedServiceFactory($uibModal, $location, $window) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, message) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, message) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
$window.location.reload()
}
$scope.message = message
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (message) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./socket-disconnected.jade'),
controller: ModalInstanceCtrl,
resolve: {

10
res/app/components/stf/common-ui/modals/version-update/version-update-service.js
View file

@ -1,19 +1,19 @@
module.exports = function ServiceFactory($modal, $location) {
module.exports = function ServiceFactory($uibModal, $location) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
$location.path('/')
}
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function () {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./version-update.jade'),
controller: ModalInstanceCtrl
})

6
res/app/components/stf/common-ui/nice-tabs/nice-tabs.jade
View file

@ -1,7 +1,7 @@
.heading-for-tabs.tabs
tabset
tab(ng-repeat='tab in tabs', active='tab.active', ng-hide='!tabFound(tab)')
tab-heading
uib-tabset
uib-tab(ng-repeat='tab in tabs', active='tab.active', ng-hide='!tabFound(tab)')
uib-tab-heading
i.fa(ng-class='tab.icon')
span {{tab.title | translate }}
div(ng-if='tab.active')

36
res/app/control-panes/advanced/input/input.jade
View file

@ -6,59 +6,59 @@
div
h6(translate) Special Keys
div.special-keys-buttons
button(tooltip='{{ "Power" | translate }}', ng-click='press("power")').btn.btn-danger.btn-xs
button(uib-tooltip='{{ "Power" | translate }}', ng-click='press("power")').btn.btn-danger.btn-xs
i.fa.fa-power-off
button(tooltip='{{ "Camera" | translate }}', ng-click='press("camera")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Camera" | translate }}', ng-click='press("camera")').btn.btn-primary.btn-xs
i.fa.fa-camera
button(tooltip='{{ "Switch Charset" | translate }}', ng-click='press("switch_charset")').btn.btn-primary.btn-info.btn-xs
button(uib-tooltip='{{ "Switch Charset" | translate }}', ng-click='press("switch_charset")').btn.btn-primary.btn-info.btn-xs
i.fa Aa
button(tooltip='{{ "Search" | translate }}', ng-click='press("search")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Search" | translate }}', ng-click='press("search")').btn.btn-primary.btn-xs
i.fa.fa-search
h6(translate) Volume
.btn-group
button(tooltip='{{ "Mute" | translate }}', ng-click='press("mute")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Mute" | translate }}', ng-click='press("mute")').btn.btn-primary.btn-xs
i.fa.fa-volume-off
button(tooltip='{{ "Volume Down" | translate }}', ng-click='press("volume_down")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Volume Down" | translate }}', ng-click='press("volume_down")').btn.btn-primary.btn-xs
i.fa.fa-volume-down
button(tooltip='{{ "Volume Up" | translate }}', ng-click='press("volume_up")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Volume Up" | translate }}', ng-click='press("volume_up")').btn.btn-primary.btn-xs
i.fa.fa-volume-up
h6(translate) Media
.btn-group
button(tooltip='{{ "Rewind" | translate }}', ng-click='press("media_rewind")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Rewind" | translate }}', ng-click='press("media_rewind")').btn.btn-primary.btn-xs
i.fa.fa-fast-backward
button(tooltip='{{ "Previous" | translate }}', ng-click='press("media_previous")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Previous" | translate }}', ng-click='press("media_previous")').btn.btn-primary.btn-xs
i.fa.fa-step-backward
button(tooltip='{{ "Play/Pause" | translate }}', ng-click='press("media_play_pause")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Play/Pause" | translate }}', ng-click='press("media_play_pause")').btn.btn-primary.btn-xs
i.fa.fa-youtube-play
button(tooltip='{{ "Stop" | translate }}', ng-click='press("media_stop")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Stop" | translate }}', ng-click='press("media_stop")').btn.btn-primary.btn-xs
i.fa.fa-stop
button(tooltip='{{ "Next" | translate }}', ng-click='press("media_next")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Next" | translate }}', ng-click='press("media_next")').btn.btn-primary.btn-xs
i.fa.fa-step-forward
button(tooltip='{{ "Fast Forward" | translate }}', ng-click='press("media_fast_forward")').btn.btn-primary.btn-xs
button(uib-tooltip='{{ "Fast Forward" | translate }}', ng-click='press("media_fast_forward")').btn.btn-primary.btn-xs
i.fa.fa-fast-forward
//h6 D-pad
//table.special-keys-dpad-buttons
tr
td
td
button(tooltip='{{ "D-pad Up" | translate }}', ng-click='press("dpad_up")').btn.btn-info.btn-xs
button(uib-tooltip='{{ "D-pad Up" | translate }}', ng-click='press("dpad_up")').btn.btn-info.btn-xs
i.fa.fa-chevron-up
td
tr
td
button(tooltip='{{ "D-pad Left" | translate }}', ng-click='press("dpad_left")').btn.btn-info.btn-xs
button(uib-tooltip='{{ "D-pad Left" | translate }}', ng-click='press("dpad_left")').btn.btn-info.btn-xs
i.fa.fa-chevron-left
td
button(tooltip='{{ "D-pad Center" | translate }}', ng-click='press("dpad_center")').btn.btn-info.btn-xs
button(uib-tooltip='{{ "D-pad Center" | translate }}', ng-click='press("dpad_center")').btn.btn-info.btn-xs
i.fa.fa-circle-o
td
button(tooltip='{{ "D-pad Right" | translate }}', ng-click='press("dpad_right")').btn.btn-info.btn-xs
button(uib-tooltip='{{ "D-pad Right" | translate }}', ng-click='press("dpad_right")').btn.btn-info.btn-xs
i.fa.fa-chevron-right
tr
td
td
button(tooltip='{{ "D-pad Down" | translate }}', ng-click='press("dpad_down")').btn.btn-info.btn-xs
button(uib-tooltip='{{ "D-pad Down" | translate }}', ng-click='press("dpad_down")').btn.btn-info.btn-xs
i.fa.fa-chevron-down
td

4
res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
View file

@ -2,13 +2,13 @@
.heading
span
stacked-icon(icon='fa-random', color='color-orange')
span(translate, ng-click='isCollapsed = !isCollapsed').pointer Port Forwarding
span(translate).pointer Port Forwarding
button.btn.pull-right.btn-sm.btn-primary-outline(
ng-click='addRow()')
i.fa.fa-plus.fa-fw
.widget-content.padded(collapse='isCollapsed')
.widget-content.padded
nothing-to-show(icon='fa-random', message='{{"No Ports Forwarded" | translate}}',
ng-if='!reversePortForwards.length')

12
res/app/control-panes/advanced/run-js/run-js.jade
View file

@ -17,9 +17,9 @@
i.fa.fa-save
span(translate) Save...
button(type='button',
ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline.dropdown-toggle
ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline.uib-dropdown-toggle
span.caret
ul.dropdown-menu.pull-right
ul.uib-dropdown-menu.pull-right
li(ng-repeat='snip in snippets')
a(ng-click='openSnippet(snip)').btn-link {{snip.name}}
li.divider
@ -33,8 +33,8 @@
p
div(ui-ace="aceOptions", scope-instance='editorInstance', ng-model='snippet.editorText').stf-ace-editor
div(ng-controller='ReturnJavaScriptCtrl')
tabset.unselectable(ng-show='results.length')
tab(heading='Results')
uib-tabset.unselectable(ng-show='results.length')
uib-tab(heading='Results')
table.table.table-hover(ng-table='tableParams').selectable
tr(ng-repeat='result in $data')
td(width='30%', title="'Device'", sortable='deviceName')
@ -47,7 +47,7 @@
.value-next-to-progress {{ result.value }}
td(width='40%', ng-show='result.isSpecialValue')
div(ng-show='result.isNumber')
progressbar.table-progress(value='result.percentage', max='100')
uib-progressbar.table-progress(value='result.percentage', max='100')
div(ng-show='result.isObject')
div.label.label-info Object
div(ng-show='result.isFunction')
@ -60,6 +60,6 @@
div.label(style='width=100%', ng-class="{'label-success': result.value, 'label-important': !result.value}")
i.fa(ng-class="{'fa-check': result.value, 'fa-times-circle': !result.value }")
span {{ result.value.toString() }}
tab(heading='Raw')
uib-tab(heading='Raw')
pre.selectable {{results | json}}
clear-button(ng-click='clear()', ng-disabled='!results.length')

2
res/app/control-panes/advanced/vnc/vnc.jade
View file

@ -4,7 +4,7 @@
span(translate) VNC
button.btn.pull-right.btn-sm.btn-primary-outline(
ng-click='generateVNCLogin()', tooltip='{{"Generate Login for VNC"|translate}}')
ng-click='generateVNCLogin()', uib-tooltip='{{"Generate Login for VNC"|translate}}')
i.fa.fa-plus.fa-fw
.widget-content.padded

6
res/app/control-panes/automation/device-settings/device-settings-controller.js
View file

@ -12,11 +12,9 @@ module.exports = function DeviceSettingsCtrl($scope, $timeout) {
}
getWifiStatus()
$scope.toggleWifi = function () {
$scope.toggleWifi = function (enable) {
if ($scope.control) {
$scope.control.setWifiEnabled(!$scope.wifiEnabled)
$scope.wifiEnabled = !$scope.wifiEnabled
$timeout(getWifiStatus, 300)
$scope.control.setWifiEnabled(enable)
$timeout(getWifiStatus, 2500)
}
}

28
res/app/control-panes/automation/device-settings/device-settings.jade
View file

@ -7,24 +7,26 @@
.col-md-6
h6(translate) Manner Mode
.btn-group
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', btn-radio='"SILENT"')
i.fa.fa-volume-off.fa-fw(tooltip='{{"Silent Mode" | translate}}')
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', btn-radio='"VIBRATE"')
i.fa.fa-mobile.fa-fw(tooltip='{{"Vibrate Mode" | translate}}')
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', btn-radio='"NORMAL"')
i.fa.fa-volume-up.fa-fw(tooltip='{{"Normal Mode" | translate}}')
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', uib-btn-radio='"SILENT"', uib-tooltip='{{"Silent Mode" | translate}}')
i.fa.fa-volume-off.fa-fw
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', uib-btn-radio='"VIBRATE"', uib-tooltip='{{"Vibrate Mode" | translate}}')
i.fa.fa-mobile.fa-fw
label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', uib-btn-radio='"NORMAL"', uib-tooltip='{{"Normal Mode" | translate}}')
i.fa.fa-volume-up.fa-fw
.col-md-6
h6(translate) WiFi
button.btn.btn-sm.btn-primary-outline(ng-click='toggleWifi()',
ng-model='wifiEnabled', btn-checkbox)
i.fa.fa-wifi.fa-fw(ng-show='wifiEnabled', tooltip='{{"Disable WiFi" | translate}}')
i.fa.fa-wifi.fa-fw(ng-hide='wifiEnabled', tooltip='{{"Enable WiFi" | translate}}')
.btn-group
label.btn.btn-sm.btn-primary-outline(ng-model='wifiEnabled', ng-click='toggleWifi(false)', uib-btn-radio='false', uib-tooltip='{{"Disable WiFi" | translate}}')
i.fa.fa-power-off.fa-fw
label.btn.btn-sm.btn-primary-outline(ng-model='wifiEnabled', ng-click='toggleWifi(true)', uib-btn-radio='true', uib-tooltip='{{"Enable WiFi" | translate}}')
i.fa.fa-wifi.fa-fw
//.row
.col-md-12
h6(translate) Lock Rotation
button.btn.btn-sm.btn-primary-outline(ng-click='toggleLockRotation()',
ng-model='lockRotation', btn-checkbox)
i.fa.fa-repeat.fa-fw(ng-show='lockRotation', tooltip='{{"Unlock Rotation" | translate}}')
i.fa.fa-repeat.fa-fw(ng-hide='lockRotation', tooltip='{{"Lock Rotation" | translate}}')
ng-model='lockRotation', uib-btn-checkbox)
i.fa.fa-repeat.fa-fw(ng-show='lockRotation', uib-tooltip='{{"Unlock Rotation" | translate}}')
i.fa.fa-repeat.fa-fw(ng-hide='lockRotation', uib-tooltip='{{"Lock Rotation" | translate}}')

4
res/app/control-panes/automation/store-account/store-account.jade
View file

@ -4,7 +4,7 @@
span(translate) Store Account
button.btn.btn-sm.btn-primary-outline.pull-right(ng-click='control.openStore()',
tooltip='{{"App Store" | translate}}', tooltip-placement="bottom")
uib-tooltip='{{"App Store" | translate}}', tooltip-placement="bottom")
i.fa.fa-shopping-cart
.widget-content.padded
div
@ -28,7 +28,7 @@
.btn-group
label.btn.btn-sm.btn-default-outline(ng-repeat='a in deviceAppStores track by a.id',
ng-model='currentAppStore', btn-radio='currentAppStore', tooltip='{{a.name}}')
ng-model='currentAppStore', uib-btn-radio='currentAppStore', uib-tooltip='{{a.name}}')
img(ng-src='/static/app/appstores/icon/24x24/{{a.type}}.png', ng-show='a.type').appstore-icon.pointer
// TODO: ladda disabled for now because of a gettext bug

2
res/app/control-panes/dashboard/clipboard/clipboard.jade
View file

@ -7,5 +7,5 @@
textarea(rows='1', ng-model='control.clipboardContent', msd-elastic, text-focus-select,
tabindex='20').form-control.clipboard-textarea
span.input-group-btn
button.btn.btn-primary-outline(ng-click='control.getClipboardContent()', tooltip='{{ "Get clipboard contents" | translate }}')
button.btn.btn-primary-outline(ng-click='control.getClipboardContent()', uib-tooltip='{{ "Get clipboard contents" | translate }}')
i.fa.fa-refresh

6
res/app/control-panes/dashboard/install/install.jade
View file

@ -10,7 +10,7 @@
placeholder='http://...').form-control
span.input-group-btn
button.btn.btn-primary-outline(ng-click='installUrl(remoteUrl)',
tooltip='{{ "Upload From Link" | translate }}', ng-disabled='!remoteUrl')
uib-tooltip='{{ "Upload From Link" | translate }}', ng-disabled='!remoteUrl')
i.fa.fa-upload
.drop-area(ng-file-drop='installFile($files)', ng-file-drag-over-class='dragover').file-input.btn-file
@ -20,7 +20,7 @@
.drop-area-text(translate) Drop file to upload
.upload-status(ng-if='installation').selectable
progressbar(max='100', value='installation.progress', ng-if='!installation.settled',
uib-progressbar(max='100', value='installation.progress', ng-if='!installation.settled',
ng-class='{"active": !installation.settled}').progress-striped
div(ng-if='!installation.error')
@ -52,7 +52,7 @@
i.fa.fa-trash-o
span(translate) Uninstall
div(ng-include='"control-panes/dashboard/install/activities/activities.jade"')
button.btn.btn-sm.btn-primary-outline(btn-checkbox, ng-model='showManifest')
button.btn.btn-sm.btn-primary-outline(uib-btn-checkbox, ng-model='showManifest')
i.fa.fa-list
span(ng-if='showManifest') Hide Manifest
span(ng-if='!showManifest') Show Manifest

6
res/app/control-panes/dashboard/navigation/navigation.jade
View file

@ -4,7 +4,7 @@
span(translate) Navigation
span
button.btn.btn-xs.btn-danger-outline.pull-right(ng-click='clearSettings()',
tooltip='{{ "Reset all browser settings" | translate }}')
uib-tooltip='{{ "Reset all browser settings" | translate }}')
i.fa.fa-trash-o
span(translate) Reset
//.button-spacer.pull-right
@ -26,6 +26,6 @@
.btn-group
.btn-group.browser-buttons(ng-click='nav.focusUrl = true')
label.btn.btn-default-outline(ng-repeat='browserRadio in device.browser.apps track by browserRadio.id', ng-model='$root.browser', btn-radio='browserRadio',
tooltip='{{browserRadio.name}} ({{browserRadio.developer}})')
label.btn.btn-default-outline(ng-repeat='browserRadio in device.browser.apps track by browserRadio.id', ng-model='$root.browser', uib-btn-radio='browserRadio',
uib-tooltip='{{browserRadio.name}} ({{browserRadio.developer}})')
img(ng-src='/static/app/browsers/icon/36x36/{{browserRadio.type}}.png', ng-show='browserRadio.type').browser-icon.pointer

2
res/app/control-panes/dashboard/remote-debug/remote-debug.jade
View file

@ -2,7 +2,7 @@
.heading
stacked-icon(icon='fa-bug', color='color-darkgreen')
span(translate) Remote debug
help-icon(topic='Remote-Debug', tooltip='{{remoteDebugTooltip | translate}}')
help-icon(topic='Remote-Debug', uib-tooltip='{{remoteDebugTooltip | translate}}')
.widget-content.padded
.form-inline

2
res/app/control-panes/dashboard/shell/shell.jade
View file

@ -3,7 +3,7 @@
stacked-icon(icon='fa-terminal', color='color-darkgray')
span(translate) Shell
clear-button(ng-click='clear()', ng-disabled='!command && !data').btn-xs
help-icon(topic='Remote-Shell', tooltip='{{"Executes remote shell commands" | translate}}')
help-icon(topic='Remote-Shell', uib-tooltip='{{"Executes remote shell commands" | translate}}')
.widget-content.padded

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

@ -5,21 +5,21 @@
.stf-vnc-right-buttons.pull-right
.btn-group
label.btn-sm.btn-primary-outline(type='button', ng-click='tryToRotate("portrait")',
ng-model='currentRotation', btn-radio='"portrait"').pointer
i.fa.fa-mobile(tooltip='{{ "Portrait" | translate }} (Current rotation: {{ device.display.rotation }}°)', tooltip-placement='bottom')
ng-model='currentRotation', uib-btn-radio='"portrait"').pointer
i.fa.fa-mobile(uib-tooltip='{{ "Portrait" | translate }} (Current rotation: {{ device.display.rotation }}°)', tooltip-placement='bottom')
label.btn-sm.btn-primary-outline(type='button', ng-click='tryToRotate("landscape")',
ng-model='currentRotation', btn-radio='"landscape"').pointer
i.fa.fa-mobile.fa-rotate-90(tooltip='{{ "Landscape" | translate }} (Current rotation: {{ device.display.rotation }}°)', tooltip-placement='bottom')
ng-model='currentRotation', uib-btn-radio='"landscape"').pointer
i.fa.fa-mobile.fa-rotate-90(uib-tooltip='{{ "Landscape" | translate }} (Current rotation: {{ device.display.rotation }}°)', tooltip-placement='bottom')
.button-spacer
button(type='button', ng-model='showScreen', btn-checkbox).btn.btn-xs.btn-info
i(ng-show='showScreen', tooltip-html-unsafe='{{"Hide Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye
i(ng-show='!showScreen', tooltip-html-unsafe='{{"Show Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye-slash
button(type='button', ng-click='kickDevice(device); $event.stopPropagation()').btn.btn-sm.btn-danger-outline
i(tooltip-html-unsafe='{{"Stop Using"|translate}}', tooltip-placement='bottom').fa.fa-times
button(type='button', ng-model='showScreen', uib-btn-checkbox).btn.btn-xs.btn-info
i(ng-show='showScreen', uib-tooltip='{{"Hide Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye
i(ng-show='!showScreen', uib-tooltip='{{"Show Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye-slash
button(type='button', ng-click='kickDevice(device); $event.stopPropagation()', uib-tooltip='{{"Stop Using"|translate}}', tooltip-placement='bottom').btn.btn-sm.btn-danger-outline
i.fa.fa-times
.device-name-container.pull-left(dropdown)
a.stf-vnc-device-name.pointer.unselectable(dropdown-toggle)
.device-name-container.pull-left(uib-dropdown)
a.stf-vnc-device-name.pointer.unselectable(uib-dropdown-toggle)
p
.device-small-image
img(ng-src='/static/app/devices/icon/x24/{{ device.image || "E30HT.jpg" }}')

2
res/app/control-panes/info/info.jade
View file

@ -44,7 +44,7 @@
tr
td(translate) Level
td
progressbar(value='device.battery.level', animate='false', max='device.battery.scale', type='success')
uib-progressbar(value='device.battery.level', animate='false', max='device.battery.scale', type='success')
span {{ device.battery.level / device.battery.scale * 100 }}%
tr
td(translate) Temperature

2
res/app/control-panes/logs/logs.jade
View file

@ -4,7 +4,7 @@
table.table.table-condensed.logcat-filters-table(ng-show='true')
tr
td(width='1%')
button(ng-model='started', btn-checkbox, title='{{"Start/Stop Logging"|translate}}').btn.btn-xs.btn-primary-outline
button(ng-model='started', uib-btn-checkbox, title='{{"Start/Stop Logging"|translate}}').btn.btn-xs.btn-primary-outline
i.fa.fa-list-alt
span(ng-if='started') {{"Stop"|translate}}
span(ng-if='!started') {{"Get"|translate}}

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

@ -21,12 +21,12 @@
text-focus-select, accesskey='4').form-control.input-sm.device-search.pull-right
span.pull-right(ng-if='activeTabs.details && !$root.basicMode')
.btn-group(dropdown).pull-right
button.btn.btn-sm.btn-primary-outline(type='button', dropdown-toggle)
.btn-group(uib-dropdown).pull-right
button.btn.btn-sm.btn-primary-outline(type='button', uib-dropdown-toggle)
i.fa.fa-columns
span(ng-bind='"Customize"|translate')
ul.dropdown-menu(role='menu').pointer.stf-device-details-customize
ul.uib-dropdown-menu(role='menu').pointer.stf-device-details-customize
li(ng-repeat='column in columns track by column.name',
ng-hide='!adminMode && columnDefinitions[column.name].admin',
ng-click='$event.stopPropagation()')
@ -38,17 +38,17 @@
i.fa.fa-trash-o
span(ng-bind='"Reset"|translate')
tabset.overflow-auto.device-list-active-tabs(ng-if='activeTabs')
tab(active='activeTabs.icons', select='focusSearch()')
tab-heading
uib-tabset.overflow-auto.device-list-active-tabs(ng-if='activeTabs')
uib-tab(active='activeTabs.icons', select='focusSearch()')
uib-tab-heading
i.fa.fa-th-large
span(translate) Devices
div.device-list-devices-content(ng-if='activeTabs.icons').selectable
device-list-icons(tracker='tracker', columns='columns', sort='sort', filter='filter')
tab(active='activeTabs.details', select='focusSearch()', ng-if='!$root.basicMode')
tab-heading
uib-tab(active='activeTabs.details', select='focusSearch()', ng-if='!$root.basicMode')
uib-tab-heading
i.fa.fa-list
span(translate) Details
div.device-list-details-content(ng-if='activeTabs.details').selectable

4
res/app/layout/cursor.css
View file

@ -11,7 +11,7 @@
*/
.cursor,
.console-message-text,
tab-heading {
uib-tab-heading {
cursor: default;
}
@ -19,7 +19,7 @@ tab-heading {
Text unselectable
*/
.unselectable,
tab-heading {
uib-tab-heading {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;

4
res/app/layout/index.js
View file

@ -14,8 +14,8 @@ module.exports = angular.module('layout', [
require('stf/common-ui/modals/socket-disconnected').name,
require('stf/browser-info').name
])
.config(['$tooltipProvider', function ($tooltipProvider) {
$tooltipProvider.options({
.config(['$uibTooltipProvider', function ($uibTooltipProvider) {
$uibTooltipProvider.options({
appendToBody: true,
animation: false
})

4
res/app/layout/small.css
View file

@ -40,11 +40,11 @@
font-size: 14px;
}
a tab-heading {
a uib-tab-heading {
font-size: 13px;
}
a tab-heading i + span {
a uib-tab-heading i + span {
margin-left: 5px;
}

4
res/app/menu/menu.jade
View file

@ -15,8 +15,8 @@
ul.nav.stf-nav.stf-feedback.pull-right(ng-cloak, nav-menu='current').unselectable
li.stf-nav-web-native-button(ng-if='!$root.basicMode && isControlRoute')
.btn-group
button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web
button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native
button(type='button', ng-model='$root.platform', uib-btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web
button(type='button', ng-model='$root.platform', uib-btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native
li(ng-show='!$root.basicMode')
a(ng-href='/#!/help', accesskey='6')

2
res/app/settings/keys/access-tokens/access-tokens.jade
View file

@ -9,7 +9,7 @@
i.fa.fa-plus.fa-fw
a(ng-href='/#!/docs/Access-Tokens').pull-right.btn.btn-sm
i.fa.fa-question-circle(tooltip='{{"More about Access Tokens" | translate}}', tooltip-placement='left')
i.fa.fa-question-circle(uib-tooltip='{{"More about Access Tokens" | translate}}', tooltip-placement='left')
.widget-content.padded

2
res/app/settings/keys/adb-keys/adb-keys.jade
View file

@ -9,7 +9,7 @@
i.fa.fa-plus.fa-fw
a(ng-href='/#!/docs/ADB-Keys').pull-right.btn.btn-sm
i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left')
i.fa.fa-question-circle(uib-tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left')
.widget-content.padded

4
res/web_modules/epoch/index.js
View file

@ -1,8 +1,8 @@
require('jquery')
require('d3')
require('epoch/epoch.min.css')
require('epoch/epoch.min.js')
require('epoch/dist/css/epoch.min.css')
require('epoch/dist/js/epoch.min.js')
require('ng-epoch')
module.exports = {