Author: tan_pham_dinh Date: 2010-03-04 01:54:12 -0500 (Thu, 04 Mar 2010) New Revision: 1957 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl Log: GTNPORTAL-739: BugJS: Error displaying when click on any portlet on switch view mode Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-03-04 06:41:43 UTC (rev 1956) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-03-04 06:54:12 UTC (rev 1957) @@ -202,8 +202,6 @@ if(!dndEvent.dragObject.isComponent) { dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; } - // fix bug WEBOS-196 - dndEvent.dragObject.style.width = "auto" ; } if(dndEvent.dragObject.isComponent) { @@ -218,6 +216,8 @@ eXo.portal.isInDragging = false; eXo.portal.UIPortal.changeComposerSaveButton(); + // fix bug WEBOS-196 + dndEvent.dragObject.style.width = "auto" ; }; DragDrop.cancelCallback = function(dndEvent) { Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-04 06:41:43 UTC (rev 1956) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-04 06:54:12 UTC (rev 1957) @@ -369,8 +369,7 @@ mask.style.display = "block"; mask.style.height = component.offsetHeight + "px"; mask.style.width = component.offsetWidth + "px"; - mask.style.top = eXo.core.Browser.findPosYInContainer(component, uiWorkingWS) + "px"; - mask.style.left = eXo.core.Browser.findPosXInContainer(component, uiWorkingWS, isRTL) + "px"; + mask.style.top = -component.offsetHeight + "px"; } else if(mask) { mask.style.display = "none"; } Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-03-04 06:41:43 UTC (rev 1956) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-03-04 06:54:12 UTC (rev 1957) @@ -268,6 +268,12 @@ .UIContainer .UIPortlet { padding: 0px; +} + +.UIPortletMask { + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; } .EdittingContainer .OverContainerBlock { @@ -293,6 +299,7 @@ } .UIPageBodyMask { - opacity: 0.3; - filter: alpha(opacity=30); + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; } Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-03-04 06:41:43 UTC (rev 1956) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-03-04 06:54:12 UTC (rev 1957) @@ -265,7 +265,9 @@ if(!isDesktop && uiPortalApp.isEditing()) { if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { %> - <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute; display:none;"><span></span></div> + <div class="UIPortletMaskParent" style="height: 0px;position:relative;"> + <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute;"><span></span></div> + </div> </div> <%} %>