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

Author: phuong_vu Date: 2011-09-06 07:35:46 -0400 (Tue, 06 Sep 2011) New Revision: 7312 Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl Log: [DOM] UIColumnContainer optimization Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 10:59:21 UTC (rev 7311) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 11:35:46 UTC (rev 7312) @@ -58,6 +58,7 @@ cursor: move; margin: 3px 0px 0px 2px; /* orientation=lt */ margin: 3px 2px 0px 0px; /* orientation=rt */ + display: block; } .EDITION-BLOCK .EditIcon { Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-06 10:59:21 UTC (rev 7311) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-06 11:35:46 UTC (rev 7312) @@ -29,9 +29,7 @@ id="${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); @@ -42,90 +40,64 @@ <div class="VIEW-CONTAINER VIEW-BLOCK"> <%} %> <%if(hasPermission) {%> - <div> <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div> <%uicomponent.renderChildren();%> + </div> </div> - </div> <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%> </div> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="position: relative; display: none;"> + <div style="position: absolute; top: -86px;"> <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar" style="position: absolute; top: -6px;"> <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIColumnContainer.title.Container"); - %> - <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> - <% /*Begin Popup Menu*/ %> - <div style="position: relative; width: 100%"> - <div class="UIPopupCategory" style="display: none;"> - <div class="PopupCategoryDecorator"> - <div class="PopupCategoryTL"> - <div class="PopupCategoryTR"> - <div class="PopupCategoryTC"><span></span></div> - </div> - </div> - <div class="PopupCategoryML"> - <div class="PopupCategoryMR"> - <div class="PopupCategoryMC"> - <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> - <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> - </a> - <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> - <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> - </a> - </div> - </div> - </div> - <div class="PopupCategoryBL"> - <div class="PopupCategoryBR"> - <div class="PopupCategoryBC"><span></span></div> - </div> - </div> - </div> - </div> - </div> - <% /*End Popup Menu*/ %> - </div> - <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> - - <%}%> - + <div class="BlueRoundedStyle FixHeight ClearFix"> + + <span class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"></span> + <% + String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIColumnContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> + <% /*Begin Popup Menu*/ %> + <div style="position: relative; width: 100%"> + <div class="UIPopupCategory" style="display: none;"> + <div class="PopupCategoryDecorator"> + + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> + </a> + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> + </a> + + </div> </div> </div> + <% /*End Popup Menu*/ %> </div> - </div> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> + + <%}%> + </div> - </div> <%/*End InfoBar*/ %> </div> </div> - </div> + </div> <%} %> - - </div> - </div> - </div> -</div> + </div> +</div> \ No newline at end of file