diff --git a/bower.json b/bower.json index f41bb513..38a4766e 100644 --- a/bower.json +++ b/bower.json @@ -2,36 +2,36 @@ "name": "stf", "version": "0.1.0", "dependencies": { - "angular": "~1.3.0-beta.2", - "angular-route": "~1.3.0-beta.2", - "angular-sanitize": "~1.3.0-beta.2", - "angular-animate": "~1.3.0-beta.2", + "angular": "~1.3.0-beta.8", + "angular-route": "~1.3.0-beta.8", + "angular-sanitize": "~1.3.0-beta.8", + "angular-animate": "~1.3.0-beta.8", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#7a90ef40be7e944afae38e195dc4a74ec34cc258", "socket.io-client": "~0.9.16", "lodash": "~2.4.1", "oboe": "~1.14.3", "fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git", "Snap.svg": "~0.2.0", - "angular-localForage": "~0.1.4", + "angular-localForage": "~0.2.1", "ng-table": "git://github.com/esvit/ng-table.git#93b4846c346acb81f60032a00f8cbc99c98f6bf4", "jquery.terminal": "~0.8.7", "stf-site": "git@ghe.amb.ca.local:stf/stf-site.git", "angular-gettext": "~0.2.8", - "angular-ui-ace": "~0.1.0", + "angular-ui-ace": "~0.1.1", "ui-bootstrap-alerts": "~0.1.5", "requirejs": "~2.1.11", "stf-graphics": "git@ghe.amb.ca.local:stf/stf-graphics.git", - "angular-bootstrap": "~0.10.0", - "angular-dialog-service": "~3.1.0", + "angular-bootstrap": "~0.11.0", + "angular-dialog-service": "~5.0.0", "ng-file-upload": "~1.2.11", - "angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3", + "angular-growl-v2": "JanStevens/angular-growl-2#~0.6.0", "bluebird": "~1.2.4", "angular-tree-control": "~0.1.5", - "angular-loading-bar": "~0.4.0" + "angular-loading-bar": "~0.4.2" }, "private": true, "resolutions": { - "angular": "~1.3.0-beta.2", - "angular-sanitize": "~1.3.0-beta.2" + "angular": "~1.3.0-beta.8", + "angular-sanitize": "~1.3.0-beta.8" } } diff --git a/res/app/components/stf/common-ui/notifications/index.js b/res/app/components/stf/common-ui/notifications/index.js index 4d69b1ec..0bcd62b8 100644 --- a/res/app/components/stf/common-ui/notifications/index.js +++ b/res/app/components/stf/common-ui/notifications/index.js @@ -7,5 +7,4 @@ module.exports = angular.module('stf/common-ui/notifications', [ 'ngAnimate', 'angular-growl' ]).config(['growlProvider', function (growlProvider) { - growlProvider.globalEnableHtml(true) }]) diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade index d987bf26..50f04a22 100644 --- a/res/app/control-panes/dashboard/navigation/navigation.jade +++ b/res/app/control-panes/dashboard/navigation/navigation.jade @@ -29,5 +29,5 @@ .btn-group(ng-if='$root.browser') .btn-group label.btn.btn-default-outline(ng-repeat='b in device.browser.apps', ng-model='$root.browser', btn-radio='b', - tooltip-append-to-body='true', tooltip='{{b.name}} ({{b.developer}})') + tooltip='{{b.name}} ({{b.developer}})') img(ng-src='/static/browsers/icon/24x24/{{b.type}}.png', ng-show='b.type').browser-icon.pointer diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index 02f26028..af3c6873 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -20,7 +20,7 @@ i(ng-show='showScreen', tooltip-html-unsafe='{{"Just control device"|translate}}
⌘-⇧-O', tooltip-placement='left').fa.fa-eye i(ng-show='!showScreen', tooltip-html-unsafe='{{"View device"|translate}}
⌘-⇧-O', tooltip-placement='left').fa.fa-eye-slash - .device-name-container + .device-name-container(dropdown) a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle p .device-small-image @@ -29,7 +29,7 @@ span.caret(ng-show='groupDevices.length > 0') span(ng-show='device && !device.present', translate) (Absent) - ul.dropdown-menu.pointer.unselectable(ng-show='groupDevices.length > 0') + ul.dropdown-menu(role='menu', data-toggle='dropdown').pointer.unselectable(ng-show='groupDevices.length > 0') li(ng-repeat='groupDevice in groupDevices') a(ng-click='controlDevice(groupDevice); $event.stopPropagation()') .device-small-image diff --git a/res/app/layout/index.js b/res/app/layout/index.js index f509a973..9b167f6f 100644 --- a/res/app/layout/index.js +++ b/res/app/layout/index.js @@ -3,6 +3,8 @@ require('se7en-bootstrap-3/build/stylesheets/se7en-font.css') require('se7en-bootstrap-3/build/stylesheets/style.css') require('se7en-bootstrap-3/build/stylesheets/font-awesome.min.css') +require('angular-bootstrap') + require('fa-borderlayout') require('fa-borderlayout/build-0.3.1/borderLayout.css') require('fa-borderlayout/build-0.3.1/stf-style.css') @@ -16,9 +18,16 @@ require('angular-loading-bar/src/loading-bar.js') require('angular-loading-bar/src/loading-bar.css') module.exports = angular.module('layout', [ + 'ui.bootstrap', 'fa.directive.borderLayout', 'angular-loading-bar', require('stf/common-ui').name, require('stf/socket/socket-state').name ]) + .config(['$tooltipProvider', function ($tooltipProvider) { + $tooltipProvider.options({ + appendToBody: true + }) + }]) .controller('LayoutCtrl', require('./layout-controller')) +