[gatein-commits] gatein SVN: r2646 - in portal/trunk/web/portal/src/main/webapp/groovy/portal/webui: container and 1 other directory.

Author: thuy.nguyen Date: 2010-04-15 00:23:40 -0400 (Thu, 15 Apr 2010) New Revision: 2646 Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl Log: GTNPORTAL-491: Possition of Edit/Delete icon of portlet is not correct when create new page in Manage page 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-04-15 03:23:36 UTC (rev 2645) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-04-15 04:23:40 UTC (rev 2646) @@ -293,8 +293,8 @@ %> <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> <%if(hasPermission) {%> + <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> - <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> <%}%> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-04-15 03:23:36 UTC (rev 2645) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-04-15 04:23:40 UTC (rev 2646) @@ -63,7 +63,7 @@ <div class="LeftBar"> <div class="RightBar"> <div class="MiddleBar"> - <div class="FixHeight"> + <div class="FixHeight ClearFix"> <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> <% String strTitle = uicomponent.getTitle() != null ? @@ -72,10 +72,10 @@ %> <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> <%}%> - <div class="ClearBoth"><span></span></div> + </div> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2010-04-15 03:23:36 UTC (rev 2645) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2010-04-15 04:23:40 UTC (rev 2646) @@ -57,15 +57,15 @@ <div class="<%=status%>"> <div class="LeftTab"> <div class="RightTab"> - <div class="MiddleTab"> <% if(uiChild.isShowEditControl()){ String actionLink = uicomponent.event("EditContainer", "$uiChild.id") - "javascript:"; %> + <div class="MiddleTab ClearFix"> <div class="TabLabel FloatLeft" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this,'$id', '$tabId' );<%= selectTab %>"><%=title%></div> <div class="EditIcon" onclick="<%=actionLink%>"></div> - <div class="ClearLeft"><span></span></div> <%} else {%> + <div class="MiddleTab"> <a class="TabLabel" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this,'$id', '$tabId' );<%= selectTab %>"><%=title%></a> <%} %> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-04-15 03:23:36 UTC (rev 2645) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-04-15 04:23:40 UTC (rev 2646) @@ -64,7 +64,7 @@ <div class="LeftBar"> <div class="RightBar"> <div class="MiddleBar"> - <div class="FixHeight"> + <div class="FixHeight ClearFix"> <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> <% String strTitle = uicomponent.getTitle() != null ? @@ -73,10 +73,9 @@ %> <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> <%if(hasPermission) {%> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> <%}%> - <div class="ClearBoth"><span></span></div> </div> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-04-15 03:23:36 UTC (rev 2645) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-04-15 04:23:40 UTC (rev 2646) @@ -61,7 +61,7 @@ <div class="LeftBar"> <div class="RightBar"> <div class="MiddleBar"> - <div class="FixHeight"> + <div class="FixHeight ClearFix"> <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> <% String strTitle = uicomponent.getTitle() != null ? @@ -70,10 +70,9 @@ %> <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> <%if(hasPermission) {%> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> <%}%> - <div class="ClearBoth"><span></span></div> </div> </div> </div>