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

Merge pull request #541 from mabashian/7608-adhoc-launch-modal

Browse Source 
Made adhoc launch modal height dynamic
This commit is contained in:
Michael Abashian 2017-10-24 14:07:32 -04:00 committed by GitHub
commit 70919638ba
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/legacy-styles/jquery-ui-overrides.less
View File

@ -149,7 +149,7 @@ table.ui-datepicker-calendar {
.ui-widget-content {
background-image: none;
background-color: @default-secondary-bg;
background-color: @default-bg;
a,
a:visited,

4
awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js
View File

@ -27,7 +27,6 @@ export default
// scope.$emit('CancelJob');
// scope.$destroy();
},
icon: "fa-times",
"class": "btn btn-default",
"id": "password-cancel-button"
},{
@ -36,7 +35,6 @@ export default
scope.$emit(callback);
$('#password-modal').dialog('close');
},
icon: "fa-check",
"class": "btn btn-primary",
"id": "password-accept-button"
}];
@ -46,7 +44,7 @@ export default
scope: scope,
buttons: buttons,
width: 620,
height: 700, //(scope.passwords.length > 1) ? 700 : 500,
height: "auto",
minWidth: 500,
title: 'Launch Configuration',
callback: 'DialogReady',

2
awx/ui/client/src/shared/Modal.js
View File

@ -94,7 +94,7 @@ angular.module('ModalDialog', ['Utilities'])
ww = $(document).width();
wh = $(document).height();
x = (width > ww) ? ww - 10 : width;
y = (height > wh) ? wh - 10 : height;
y = height === "auto" ? "auto" : ((height > wh) ? wh - 10 : height);
// Create the modal
$('#' + id).dialog({