Selaa lähdekoodia

N°410 Modal dialog's height for CSV export partially hidden because no scrollbar available.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4858 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 7 vuotta sitten
vanhempi
commit
3d42136eb1
2 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 1 1
      application/itopwebpage.class.inc.php
  2. 2 0
      webservices/export-v2.php

+ 1 - 1
application/itopwebpage.class.inc.php

@@ -545,7 +545,7 @@ EOF
 		}
 	});
 	docWidth = $(document).width();
-	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth }); // JQuery UI dialogs
+	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth, height: 'auto', maxHeight: $(window).height() - 50 }); // JQuery UI dialogs
 	ShowDebug();
 	$('#logOffBtn>ul').popupmenu();
 	

+ 2 - 0
webservices/export-v2.php

@@ -354,6 +354,8 @@ function InteractiveShell($sExpression, $sQueryId, $sFormat, $sFileName, $sMode)
 			autoOpen: true,
 			modal: true,
 			width: '80%',
+			height: 'auto',
+			maxHeight: $(window).height() - 50,
 			title: $sJSTitle,
 			close: function() { $('#export-form').attr('data-state', 'cancelled'); $(this).remove(); },
 			buttons: [