Author: truong.le Date: 2009-10-22 23:30:51 -0400 (Thu, 22 Oct 2009) New Revision: 405 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js Log: GTNPORTAL-57: Unknown error when delete navigation which is being used by an other program Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-10-23 03:15:19 UTC (rev 404) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-10-23 03:30:51 UTC (rev 405) @@ -226,6 +226,7 @@ selector.removeChild(UIRightClickPopupMenu.class); popUp.setUIComponent(pageManager); popUp.setWindowSize(400, 400); + popUp.setShowMask(true); popUp.setShow(true); // prContext.addUIComponentToUpdateByAjax(workingWS); } @@ -256,6 +257,7 @@ pageNavigation.setPageNav(navigation); popUp.setUIComponent(pageNavigation); popUp.setWindowSize(600, 400); + popUp.setShowMask(true); popUp.setShow(true); } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-10-23 03:15:19 UTC (rev 404) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-10-23 03:30:51 UTC (rev 405) @@ -319,6 +319,7 @@ selector.initNavigations(list); selector.removeChild(UIRightClickPopupMenu.class); popUp.setUIComponent(naviManager); + popUp.setShowMask(true); popUp.setShow(true); } Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2009-10-23 03:15:19 UTC (rev 404) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2009-10-23 03:30:51 UTC (rev 405) @@ -183,7 +183,7 @@ maskLayer.id = object.id + "MaskLayer" ; maskLayer.maxZIndex = 3 ; maskLayer.style.width = blockContainer.offsetWidth + "px" ; - maskLayer.style.height = blockContainer.offsetHeight + "px" ; + maskLayer.style.height = blockContainer.offsetHeight + eXo.core.Browser.findPosY(blockContainer) + "px" ; maskLayer.style.top = "0px" ; maskLayer.style.left = "0px" ; maskLayer.style.zIndex = maskLayer.maxZIndex ;