diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index a2996d5ba..3c8649a41 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -15,7 +15,7 @@ {if $user_logged neq '' or $tracker neq ''} - + {include file="$tpl_menu"} {if (count($subMenus)>0) } {include file= "$tpl_submenu"} diff --git a/workflow/engine/templates/processes/mainLoad.php b/workflow/engine/templates/processes/mainLoad.php index 2e73d2dc4..940b627ef 100755 --- a/workflow/engine/templates/processes/mainLoad.php +++ b/workflow/engine/templates/processes/mainLoad.php @@ -25,13 +25,32 @@ document.getElementById('pm_submenu').style.display = 'none'; document.documentElement.style.overflowY = 'hidden'; function autoResizeScreen() { - oCasesFrame = document.getElementById('frameMain'); - oClientWinSize = getClientWindowSize(); - height = oClientWinSize.height-105; - oCasesFrame.style.height = height; - if (oCasesFrame.height ) { - oCasesFrame.height = height; - } + var containerList1, containerList2; + oCasesFrame = document.getElementById('frameMain'); + 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 { + oCasesFrame = document.getElementById('frameMain'); + oClientWinSize = getClientWindowSize(); + height = oClientWinSize.height-105; + oCasesFrame.style.height = height; + if (oCasesFrame.height ) { + oCasesFrame.height = height; + } + } //oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame'); //oCasesSubFrame.style.height = height-10; }