Author: thanh.do Date: 2009-12-04 04:03:21 -0500 (Fri, 04 Dec 2009) New Revision: 924 Modified: 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: PLF-28:Error UI in container/portlet icon with Default Skin 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 2009-12-04 09:00:39 UTC (rev 923) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2009-12-04 09:03:21 UTC (rev 924) @@ -48,18 +48,18 @@ cursor: pointer; } -.UIPortlet .EditPortletPropertiesIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ +.UIPortlet .EditPortletPropertiesIcon { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ width: 20px; height: 20px; background: url('background/Pen.gif') no-repeat top; margin: 4px 3px 0px 5px; /* orientation=lt */ margin: 4px 5px 0px 3px; /* orientation=rt */ } -.UIPortlet .DeletePortletIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ +.UIPortlet .DeletePortletIcon { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ width: 20px; height:20px; background: url('background/Close.gif') no-repeat bottom; margin: 0px 4px 0px 0px; /* orientation=lt */ 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 2009-12-04 09:00:39 UTC (rev 923) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-12-04 09:03:21 UTC (rev 924) @@ -313,8 +313,8 @@ if(title.length() > 30) title = title.substring(0,27) + "..."; %> <div class="PortletIcon $portletIcon">$title</div> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> </div> <div class="ClearLeft"><span></span></div> </div>