[gatein-commits] gatein SVN: r859 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.

Author: liem_nguyen Date: 2009-11-30 04:46:55 -0500 (Mon, 30 Nov 2009) New Revision: 859 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties Log: GTNPORTAL-287 It should be able to paste a node to root node in navigation (Add resource bundles) Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-30 08:52:51 UTC (rev 858) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-30 09:46:55 UTC (rev 859) @@ -359,7 +359,7 @@ ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>(); navis.add(selectedNavigation); selector.initNavigations(navis); - selector.removeChild(UIRightClickPopupMenu.class); + //selector.removeChild(UIRightClickPopupMenu.class); uiNavigationPopup.setUIComponent(pageManager); uiNavigationPopup.setWindowSize(400, 400); uiNavigationPopup.setRendered(true); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-30 08:52:51 UTC (rev 858) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-30 09:46:55 UTC (rev 859) @@ -365,7 +365,7 @@ ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>(); navis.add(selectedNavigation); selector.initNavigations(navis); - selector.removeChild(UIRightClickPopupMenu.class); + //selector.removeChild(UIRightClickPopupMenu.class); uiNavigationPopup.setUIComponent(pageManager); uiNavigationPopup.setWindowSize(400, 400); event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent()); 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 2009-11-30 08:52:51 UTC (rev 858) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-30 09:46:55 UTC (rev 859) @@ -1065,6 +1065,8 @@ ############################################################################### # org.exoplatform.portal.webui.component.customization.UIPageNodeSelector # ############################################################################### +UINavigationNodeSelectorPopupMenu.event.AddNode=Add new Node +UINavigationNodeSelectorPopupMenu.event.PasteNode=Paste Node NavigationNodePopupMenu.event.AddNode=Add new Node NavigationNodePopupMenu.event.EditPageNode=Edit Node's Page