Author: thuy.nguyen Date: 2010-02-26 04:57:01 -0500 (Fri, 26 Feb 2010) New Revision: 1880 Added: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif Removed: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LayoutCBg1x56.gif portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/MiddlePortletLayout.gif 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/background/PortletLayoutDecorator.gif portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl Log: GTNPORTAL-715: the permission enhancement of container/application in the edit inline mode 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-02-26 09:55:44 UTC (rev 1879) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-02-26 09:57:01 UTC (rev 1880) @@ -95,62 +95,31 @@ .PortletLayoutDecorator { } -.PortletLayoutDecorator .TopLeft { +.PortletLayoutDecorator .LPortletLayoutDecorator { background: url('background/PortletLayoutDecorator.gif') no-repeat left top; - padding-left: 7px; + padding: 0px 0px 0px 12px; } -.PortletLayoutDecorator .TopMiddle { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -6px; -} - -.PortletLayoutDecorator .TopRight { +.PortletLayoutDecorator .RPortletLayoutDecorator { background: url('background/PortletLayoutDecorator.gif') no-repeat right top; - padding-right: 7px; + padding-right: 12px; } -.PortletLayoutDecorator .TopLeft .FixHeight { - height: 6px; +.PortletLayoutDecorator .CPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; } -.PortletLayoutDecorator .MiddleLeft { - background: url('background/MiddlePortletLayout.gif') repeat-y left -22px; - padding: 0px 0px 0px 7px; +.PortletLayoutDecorator .FixHeight { + height: 69px; + padding: 10px 0; +} +.ProtectedPortlet .PortletLayoutDecorator { + background: white; +} +.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { + opacity: 0.3; + filter: alpha(opacity=30); } - -.PortletLayoutDecorator .MiddleRight { - background: url('background/MiddlePortletLayout.gif') repeat-y right -22px; - padding-right: 7px; -} - -.PortletLayoutDecorator .CenterBackground { - background: white; -} - -.PortletLayoutDecorator .GardientBackground { - height: 64px; - background: url('background/LayoutCBg1x56.gif') repeat-x bottom; - padding: 6px; -} - -.PortletLayoutDecorator .BottomLeft { - background: url('background/PortletLayoutDecorator.gif') no-repeat left -12px; - padding-left:7px; -} - -.PortletLayoutDecorator .BottomMiddle { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -17px; -} - -.PortletLayoutDecorator .BottomRight { - background: url('background/PortletLayoutDecorator.gif') no-repeat right -12px; - padding-right: 7px; -} - -.PortletLayoutDecorator .BottomLeft .FixHeight { - height: 5px; -} - /*############### End Decorator ###################################################*/ .LAYOUT-CONTAINER .UIContainer { @@ -277,8 +246,8 @@ .PortletBlockDecorator { -} - +} + .EdittingContainer { padding: 3px; } @@ -308,10 +277,22 @@ } .EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: none; + background: white; } .EdittingContainer .OverContainerBlock .RightContainerBlock { background: none; padding: 2px; -} +} + +.ProtectedContainer .ProtectedContent { + opacity: 0.3; + filter: alpha(opacity=80); + height: 70px; + padding: 6px 10px; +} + +.UIPageBodyMask { + opacity: 0.3; + filter: alpha(opacity=30); +} Deleted: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LayoutCBg1x56.gif =================================================================== (Binary files differ) Deleted: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/MiddlePortletLayout.gif =================================================================== (Binary files differ) Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecorator.gif =================================================================== (Binary files differ) Added: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif =================================================================== (Binary files differ) Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-02-26 09:55:44 UTC (rev 1879) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-02-26 09:57:01 UTC (rev 1880) @@ -23,31 +23,19 @@ String portletId = uicomponent.getId(); if(!isDesktop && uiPortalApp.isEditing()) { %> - <div class="UIPortlet" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" + <div class="UIPortlet <%=hasPermission?"":"ProtectedPortlet"%>" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" style="top: 0px; left:0px;"> <div class="UIComponentBlock"> <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> <div class="PortletLayoutDecorator"> - - <%/*Begin Top Portlet Layout Decorator*/%> - <div class="TopLeft"> - <div class="TopRight"> - <div class="TopMiddle"> - <div class="TopMiddleCenter"> - <div class="FixHeight"><span></span></div> - </div> - </div> - </div> - </div> - <%/*Begin Middle Portlet Layout Decorator*/%> - <div class="MiddleLeft"> - <div class="MiddleRight"> - <div class="CenterBackground"> - <div class="GardientBackground"> - <% + <div class="LPortletLayoutDecorator"> + <div class="RPortletLayoutDecorator"> + <div class="CPortletLayoutDecorator"> + <div class="FixHeight"> + <% if(hasPermission) { try { String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName(); @@ -56,21 +44,12 @@ print uicomponent.getDisplayName(); } } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - %> + %> </div> </div> </div> </div> - <%/*Begin Bottom Portlet Layout Decorator*/%> - <div class="BottomLeft"> - <div class="BottomRight"> - <div class="BottomMiddle"> - <div class="FixHeight"><span></span></div> - </div> - </div> - </div> - </div> </div> <%} else { %> @@ -221,7 +200,7 @@ String portletIcon = uicomponent.getIcon(); if(portletIcon == null) portletIcon = "PortletIcon"; %> - <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName">$title</div></div> + <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div> </div> </div> @@ -237,7 +216,7 @@ <% if(windowState != WindowState.MINIMIZED) { if(hasPermission) println portletContent; - else println _ctx.appRes("UIPortlet.label.protectedContent"); + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; } %> </div> @@ -275,7 +254,7 @@ <div class="PORTLET-FRAGMENT" ${cssStyle}> <% if(hasPermission) println portletContent; - else println _ctx.appRes("UIPortlet.label.protectedContent"); + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; %> </div> </div>