External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 01:34:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from jaredevantabor/fix-1982

Browse Source 
Prevents Network UI from scrolling and showing Tower
This commit is contained in:
Jared Tabor
2018-05-31 09:37:04 -07:00
committed by GitHub
parent 246e63bdb6 70897d3503
commit edbb03cdc0
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/index.template.ejs
View File

@@ -19,7 +19,7 @@
</head> </head>
<body data-user-agent="{{userAgent}}"> <body data-user-agent="{{userAgent}}">
<div ui-view="networking"></div> <div ui-view="networking" ng-class="{'NetworkingUIView' : vm.networkUIisOpen}"></div>
<at-layout> <at-layout>
<bread-crumb></bread-crumb> <bread-crumb></bread-crumb>
<toast></toast> <toast></toast>

8
awx/ui/client/src/network-ui/network-nav/network.nav.block.less
View File

@@ -1,3 +1,11 @@
.NetworkingUIView{
position:absolute;
display:block;
width:100vw;
height: 100vh;
z-index: 1101;
}
.Networking-shell{ .Networking-shell{
display:flex; display:flex;
flex-direction: column; flex-direction: column;

3
awx/ui/client/src/network-ui/network-nav/network.nav.controller.js
View File

@@ -5,7 +5,7 @@ function NetworkingController (models, $state, $scope, strings) {
const { const {
inventory inventory
} = models; } = models;
vm.networkUIisOpen = true;
vm.strings = strings; vm.strings = strings;
vm.panelTitle = `${strings.get('state.BREADCRUMB_LABEL')} | ${inventory.name}`; vm.panelTitle = `${strings.get('state.BREADCRUMB_LABEL')} | ${inventory.name}`;
vm.hostDetail = {}; vm.hostDetail = {};
@@ -16,6 +16,7 @@ function NetworkingController (models, $state, $scope, strings) {
vm.groups = []; vm.groups = [];
$scope.devices = []; $scope.devices = [];
vm.close = () => { vm.close = () => {
vm.networkUIisOpen = false;
$scope.$broadcast('awxNet-closeNetworkUI'); $scope.$broadcast('awxNet-closeNetworkUI');
$state.go('inventories'); $state.go('inventories');
}; };

7
awx/ui/client/src/network-ui/network.ui.controller.js
View File

@@ -550,6 +550,13 @@ var NetworkUIController = function($scope,
if (originalEvent.wheelDeltaY !== undefined) { if (originalEvent.wheelDeltaY !== undefined) {
$event.deltaY = $event.originalEvent.wheelDeltaY; $event.deltaY = $event.originalEvent.wheelDeltaY;
} }
if (originalEvent.deltaX !== undefined) {
$event.deltaX = $event.originalEvent.deltaX;
}
if (originalEvent.deltaY !== undefined) {
$event.deltaY = $event.originalEvent.deltaY;
$event.delta = $event.originalEvent.deltaY;
}
} }
}; };