[gatein-commits] gatein SVN: r7472 - in portal/trunk: portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap and 4 other directories.

Author: ndkhoiits Date: 2011-09-21 00:37:51 -0400 (Wed, 21 Sep 2011) New Revision: 7472 Removed: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/ExpandAllIcon.gif Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UISitemapPortlet.java portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java Log: GTNPORTAL-2115 Remove Expand All feature in site map portlet Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UISitemapPortlet.java =================================================================== --- portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UISitemapPortlet.java 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UISitemapPortlet.java 2011-09-21 04:37:51 UTC (rev 7472) @@ -54,10 +54,8 @@ @ComponentConfigs({ @ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "system:/groovy/webui/core/UISitemap.gtmpl"), @ComponentConfig(type = UIPortalNavigation.class, id = "UISiteMap", events = { -// @EventConfig(listeners = UIPortalNavigation.ExpandAllNodeActionListener.class), @EventConfig(listeners = UIPortalNavigation.CollapseAllNodeActionListener.class), @EventConfig(listeners = UIPortalNavigation.CollapseNodeActionListener.class)})}) -// @EventConfig(listeners = UIPortalNavigation.ExpandNodeActionListener.class) public class UISitemapPortlet extends UIPortletApplication { Deleted: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/ExpandAllIcon.gif =================================================================== (Binary files differ) Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-09-21 04:37:51 UTC (rev 7472) @@ -66,13 +66,6 @@ cursor: pointer; } -.UISitemap .ExpandAll { - background: url('DefaultSkin/background/ExpandAllIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('DefaultSkin/background/ExpandAllIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 20px; - cursor: pointer; -} - .UISitemap .SitemapContent { background: url('DefaultSkin/background/RootTree.gif') no-repeat left top; /* orientation=lt */ background: url('DefaultSkin/background/RootTree-rt.gif') no-repeat right top; /* orientation=rt */ Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2011-09-21 04:37:51 UTC (rev 7472) @@ -980,7 +980,6 @@ UISitemap.label.message=Na tomto m\u00EDst\u011B nen\u00ED \u017E\u00E1dn\u00E1 podstr\u00E1nka. UISitemapPortlet.label.CollapseAll=Sbalit v\u0161e -UISitemapPortlet.label.ExpandAll=Rozbalit v\u0161e UITabContainer.tab=Z\u00E1lo\u017Eka @@ -2061,7 +2060,6 @@ UISitemap.label.message=Na tomto m\u00edst\u011b nen\u00ed \u017e\u00e1dn\u00e1 podstr\u00e1nka. UISitemapPortlet.label.CollapseAll=Sbalit v\u0161e -UISitemapPortlet.label.ExpandAll=Rozbalit v\u0161e UITabContainer.tab=Z\u00e1lo\u017eka Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-09-21 04:37:51 UTC (rev 7472) @@ -974,7 +974,6 @@ UISitemap.label.message=There is no child page in this location. UISitemapPortlet.label.CollapseAll=Collapse All -UISitemapPortlet.label.ExpandAll=Expand All ############################################################################ # org.exoplatform.portal.component.customization.UIPortalToolPanel # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-09-21 04:37:51 UTC (rev 7472) @@ -949,7 +949,6 @@ UISitemap.label.message=Non ci sono figli per questa pagina. UISitemapPortlet.label.CollapseAll=Collassa Tutto -UISitemapPortlet.label.ExpandAll=Espandi Tutto ############################################################################ # org.exoplatform.portal.component.customization.UIPortalToolPanel # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-09-21 04:37:51 UTC (rev 7472) @@ -915,7 +915,6 @@ UISitemap.label.message=Không có trang nào! UISitemapPortlet.label.CollapseAll=Đóng tất cả -UISitemapPortlet.label.ExpandAll=Mở tất cả ############################################################################ # org.exoplatform.portal.component.customization.UIPortalToolPanel # Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2011-09-21 04:37:51 UTC (rev 7472) @@ -17,7 +17,6 @@ UIPortletApplication siteMapPortlet = uicomponent.getParent(); def useAJAX = siteMapPortlet.isUseAjax(); - def actionExpandAll = uicomponent.event("ExpandAllNode"); def actionCollapseAll = uicomponent.event("CollapseAllNode"); PortalURL nodeURL = nodeurl(); @@ -112,10 +111,7 @@ <div class="CollapseAll FloatLeft" onclick="$actionCollapseAll"> <%=_ctx.appRes(siteMapPortlet.getName() + ".label.CollapseAll")%> </div> - <div class="ExpandAll FloatLeft" onclick="{$actionExpandAll}"> - <%//_ctx.appRes(siteMapPortlet.getName() + ".label.ExpandAll")%> </div> - </div> <div class="SitemapContent"> <div class="UISiteTree"> <% TreeNode treeNodeRoot = uicomponent.getTreeNodes() ;%> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2011-09-20 21:05:52 UTC (rev 7471) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2011-09-21 04:37:51 UTC (rev 7472) @@ -318,45 +318,6 @@ { this.navigationScope = scope; } - - //Now we use serveSource method to expand a node -/* - static public class ExpandNodeActionListener extends EventListener<UIPortalNavigation> - { - public void execute(Event<UIPortalNavigation> event) throws Exception - { - String treePath = event.getRequestContext().getRequestParameter(OBJECTID); - - TreeNode treeNode = event.getSource().getTreeNodes(); - TreeNode expandTree = treeNode.findNodes(treePath); - //There're may be interuption between browser and server - if (expandTree == null) - { - event.getRequestContext().addUIComponentToUpdateByAjax(event.getSource()); - return; - } - - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); - - UserNode node = expandTree.getNode(); - userPortal.updateNode(node, event.getSource().navigationScope, null); - if (node == null) - { - event.getSource().loadTreeNodes(); - event.getRequestContext().getUIApplication().addMessage(new - ApplicationMessage("UIPortalNavigation.msg.staleData", null, ApplicationMessage.WARNING)); - } - else - { - node.filter(event.getSource().NAVIGATION_FILTER_CONFIG); - expandTree.setChildren(node.getChildren()); - expandTree.setExpanded(true); - } - - event.getRequestContext().addUIComponentToUpdateByAjax(event.getSource()); - } - } -*/ static public class CollapseNodeActionListener extends EventListener<UIPortalNavigation> { @@ -388,45 +349,4 @@ event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation); } } - - //Expand all will not be allowed - The nodes are lazy loaded now -/* - static public class ExpandAllNodeActionListener extends EventListener<UIPortalNavigation> - { - public void execute(Event<UIPortalNavigation> event) throws Exception - { - UIPortalNavigation uiNavigation = event.getSource(); - // reload TreeNodes - uiNavigation.loadTreeNodes(); - TreeNode treeNode = uiNavigation.getTreeNodes(); - - expandAllNode(treeNode); - - event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation); - } - - public void expandAllNode(TreeNode treeNode) throws Exception - { - - if (treeNode.getChildren().size() > 0) - { - for (TreeNode child : treeNode.getChildren()) - { -// PageNode expandNode = child.getNode(); -// PageNavigation selectNav = child.getNavigation(); -// -// // set node to child tree -// if (expandNode.getChildren().size() > 0) -// { -// child.setChildren(expandNode.getChildren(), selectNav); -// } - - // expand child tree - expandAllNode(child); - } - } - } - } -*/ - }