diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index 7a8f88514..64324745b 100755 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -26,18 +26,34 @@ $_POST['qs'] = $filter->xssFilterHard($_POST['qs']); function autoResizeScreen() { - oCasesFrame = document.getElementById('casesFrame'); - height = getClientWindowSize().height-90; - oCasesFrame.style.height = height + 'px';; - oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); - if(oCasesSubFrame){ - oCasesSubFrame.style.height = (height-5) + 'px';; - } - else { - setTimeout('autoResizeScreen()', 2000); - } - - + var containerList1, containerList2; + oCasesFrame = document.getElementById('casesFrame'); + oClientWinSize = getClientWindowSize(); + + containerList1 = document.getElementById("pm_header"); + if (document.getElementById("mainMenuBG") && + document.getElementById("mainMenuBG").parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){ + containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode; + } + if (containerList1 === containerList2) { + height = oClientWinSize.height - containerList1.clientHeight; + oCasesFrame.style.height = height; + if (oCasesFrame.height ) { + oCasesFrame.height = height; + } + } else { + height = getClientWindowSize().height-90; + oCasesFrame.style.height = height + 'px'; + oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); + if(oCasesSubFrame){ + oCasesSubFrame.style.height = (height-5) + 'px';; + } else { + setTimeout('autoResizeScreen()', 2000); + } + } } \ No newline at end of file diff --git a/workflow/engine/templates/dashboard/load.php b/workflow/engine/templates/dashboard/load.php index 248cd7ed7..11cb8a205 100644 --- a/workflow/engine/templates/dashboard/load.php +++ b/workflow/engine/templates/dashboard/load.php @@ -22,18 +22,34 @@ function autoResizeScreen() { - oCasesFrame = document.getElementById('casesFrame'); - height = getClientWindowSize().height-90; - oCasesFrame.style.height = height; - oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); - if(oCasesSubFrame){ - oCasesSubFrame.style.height = height-5; - } - else { - setTimeout('autoResizeScreen()', 2000); - } - - + var containerList1, containerList2; + oCasesFrame = document.getElementById('casesFrame'); + containerList1 = document.getElementById("pm_header"); + + if (document.getElementById("mainMenuBG") && + document.getElementById("mainMenuBG").parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){ + containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode; + } + if (containerList1 === containerList2) { + height = oClientWinSize.height - containerList1.clientHeight; + oCasesFrame.style.height = height; + if (oCasesFrame.height ) { + oCasesFrame.height = height; + } + }else{ + height = getClientWindowSize().height-90; + oCasesFrame.style.height = height; + oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); + if(oCasesSubFrame){ + oCasesSubFrame.style.height = height-5; + } + else { + setTimeout('autoResizeScreen()', 2000); + } + } } \ No newline at end of file diff --git a/workflow/engine/templates/setup/main_Load.php b/workflow/engine/templates/setup/main_Load.php index 9124066f7..74148511b 100755 --- a/workflow/engine/templates/setup/main_Load.php +++ b/workflow/engine/templates/setup/main_Load.php @@ -15,16 +15,33 @@ document.documentElement.style.overflowY = 'hidden'; function autoResizeScreen() { - oCasesFrame = document.getElementById('adminFrame'); - oClientWinSize = getClientWindowSize(); - height = oClientWinSize.height-90; - oCasesFrame.style.height = height; - oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('setup-frame'); + var containerList1, containerList2; + oCasesFrame = document.getElementById('adminFrame'); + containerList1 = document.getElementById("pm_header"); + if (document.getElementById("mainMenuBG") && + document.getElementById("mainMenuBG").parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode && + document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){ + containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode; + } + if (containerList1 === containerList2) { + height = oClientWinSize.height - containerList1.clientHeight; + oCasesFrame.style.height = height; + if (oCasesFrame.height ) { + oCasesFrame.height = height; + } + } else { + oClientWinSize = getClientWindowSize(); + height = oClientWinSize.height-90; + oCasesFrame.style.height = height; + oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('setup-frame'); - if(oCasesSubFrame) - oCasesSubFrame.style.height = height-5; - else - setTimeout('autoResizeScreen()', 2000); + if(oCasesSubFrame) + oCasesSubFrame.style.height = height-5; + else + setTimeout('autoResizeScreen()', 2000); + } } \ No newline at end of file