Author: ndkhoiits Date: 2011-01-07 05:29:16 -0500 (Fri, 07 Jan 2011) New Revision: 5700 Added: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif Modified: portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java Log: GTNPORTAL-1731 Merge the commit branch of sprint 45 back to trunk Modified: portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>platform/administrators</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -20,8 +20,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -20,8 +20,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -19,8 +19,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- Portal skins --> <portal-skin> Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java =================================================================== --- portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -64,15 +64,15 @@ String userAgent = req.getHeader("User-Agent"); if (dresource.getDownloadName() != null) { - if (userAgent != null && userAgent.contains("MSIE")) + if (userAgent != null && userAgent.contains("Firefox")) { - res.setHeader("Content-Disposition", "attachment;filename=\"" - + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "\""); + res.setHeader("Content-Disposition", "attachment; filename*=utf-8''" + + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + ""); } else { - res.setHeader("Content-Disposition", "attachment; filename*=utf-8''" - + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + ""); + res.setHeader("Content-Disposition", "attachment;filename=\"" + + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "\""); } } res.setContentType(dresource.getResourceMimeType()); @@ -105,4 +105,4 @@ } } } -} \ No newline at end of file +} Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -21,8 +21,8 @@ --> <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>samplePage</name> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>samplePage</name> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portal-skin> <skin-name>SimpleSkin</skin-name> Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700) @@ -46,7 +46,7 @@ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-size: 12px; font-style: normal; - color: #336699; + color: #058bb6; } /* Help messages, general additional information, etc. */ @@ -97,16 +97,17 @@ } .portlet-section-selected { - background-color: #CBD4E6; + background-color: #d9d8d9; } .portlet-section-subheader { font-weight: bold; - font-size: 10px; + padding: 5px 0px; } .portlet-section-footer { font-size: 11px; + border-top: 1px solid #F2F2F2; } /* Text that belongs to the table but does not fall in one of the other categories @@ -121,40 +122,45 @@ /* Table header */ .portlet-table-header { - background-color: #eef; - padding: 0 5px 5px 5px; + background-color: #e9e8ed; + padding: 0 0px 0px 5px; font-weight: bold; color: #333333; font-size: 12px; border-bottom: 1px solid #d5d5d5; + line-height: 20px; } /* Normal text in a table cell */ -.portlet-table-body {} +.portlet-table-body { + padding: 10px; +} /* Text in every other row in the table */ .portlet-table-alternate { - background-color: #E6E8E5; + background-color: #e7e6eb; border-bottom: 1px solid #d5d5d5; + padding: 5px 10px; } /* Text in a selected cell range */ .portlet-table-selected { color: #000; - font-size: 12px; - background-color: #CBD4E6; + background-color: #dddddd; + padding: 5px 10px; } /* Text of a subheading */ .portlet-table-subheader { font-weight: bold; - color: #000; + color: #777777; font-size: 12px; + padding: 5px; } /* Table footer */ .portlet-table-footer { - padding: 5px 5px 0 5px; + padding: 5px; font-weight: bold; color: #333333; font-size: 12px; @@ -170,7 +176,6 @@ /** FORMS **/ .portlet-form-label { - font-size: 10px; color: #333333; } @@ -182,14 +187,15 @@ /* Form Button Style */ .portlet-form-button { - font-size: 10px; - font-weight: bold; - color: #FFFFFF; - background-color: #5078aa; - border-top: 1px solid #97B7C6; - border-left: 1px solid #97B7C6; - border-bottom: 1px solid #254869; - border-right: 1px solid #254869; + font-size: 11px; + color: #5c5c5c; + background-color: #cfcfcf; + border-top: 1px solid #dadada; + border-left: 1px solid #dadada; + border-bottom: 1px solid #9a9a9a; + border-right: 1px solid #9a9a9a; + line-height: 22px; + padding: 0px 20px; } /* Text that appears beside a context dependent action icon */ @@ -231,60 +237,161 @@ /** MENUS **/ /*General menu settings such as background color, margins, etc. */ -.portlet-menu {} +.portlet-menu { +} /* Normal, unselected menu item. */ .portlet-menu-item { - color: #242424; - text-decoration: none; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; + background: #dddddd; + color: #2e2e2e; + text-decoration: none; + margin-bottom: 1px; + line-height: 22px; + padding: 0px 5px; } /* Selected menu item. */ -.portlet-menu-item-selected {} +.portlet-menu-item-selected { + background: #dddddd; + color: #058bb6; + margin-bottom: 1px; + line-height: 22px; + padding: 0px 5px; +} .portlet-menu-item-hover { - color: #5699B7; - text-decoration: none; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; + background: #dddddd; + color: #058bb6; + text-decoration: none; + margin-bottom: 1px; + line-height: 22px; + padding: 0px 5px; } /* Selected menu item when the mouse hovers over it. */ -.portlet-menu-item-hover-selected {} +.portlet-menu-item-hover-selected { + background: #dddddd; + color: #058bb6; + line-height: 22px; + margin-bottom: 1px; + padding: 0px 5px; +} /* Normal, unselected menu item that has sub-menus. */ -.portlet-menu-cascade-item {} +.portlet-menu-cascade-item { + background: #e9e8ed; + color: #636363; + text-decoration: none; + line-height: 22px; + padding: 0px 20px; + border-bottom: 1px solid #dddddd; +} /* Selected sub-menu item that has sub-menus */ -.portlet-menu-cascade-item-selected {} +.portlet-menu-cascade-item-selected { + background: #e9e8ed; + color: #252525; + text-decoration: none; + line-height: 22px; + padding: 0px 20px; + border-bottom: 1px solid #dddddd; +} -.porlet-menu-cascade {} +.porlet-menu-cascade { + background: #e9e8ed; + color: #636363; + text-decoration: none; + line-height: 22px; + padding: 0px 20px; + border-bottom: 1px solid #dddddd; +} -.portlet-menu-cascade-item-hover {} +.portlet-menu-cascade-item-hover { + background: #e9e8ed; + color: #252525; + text-decoration: none; + line-height: 22px; + padding: 0px 20px; + border-bottom: 1px solid #dddddd; +} -.portlet-menu-cascade-item-hover-selected {} +.portlet-menu-cascade-item-hover-selected { + background: #e9e8ed; + color: #252525; + text-decoration: none; + line-height: 22px; + padding: 0px 20px; + border-bottom: 1px solid #dddddd; +} -.portlet-menu-separator {} +.portlet-menu-separator { +} .portlet-menu-cascade-separator {} -.portlet-menu-content {} +.portlet-menu-content { + background: #f6f6f6; + color: #717171; + text-decoration: none; + line-height: 22px; + padding: 0px 30px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-content-selected {} +.portlet-menu-content-selected { + background: #f6f6f6; + color: #272727; + text-decoration: none; + line-height: 22px; + padding: 0px 30px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-content-hover {} +.portlet-menu-content-hover { + background: #f6f6f6; + color: #272727; + text-decoration: none; + line-height: 22px; + padding: 0px 30px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-content-hover-selected {} +.portlet-menu-content-hover-selected { + background: #f6f6f6; + color: #272727; + text-decoration: none; + line-height: 22px; + padding: 0px 30px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-indicator {} +.portlet-menu-indicator { + color: #8b8b8b; + line-height: 22px; + padding: 0px 40px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-indicator-selected {} +.portlet-menu-indicator-selected { + color: #606060; + line-height: 22px; + padding: 0px 40px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-indicator-hover {} +.portlet-menu-indicator-hover { + color: #606060; + line-height: 22px; + padding: 0px 40px; + border-bottom: 1px solid #e9e8ed; +} -.portlet-menu-indicator-hover-selected {} +.portlet-menu-indicator-hover-selected { + color: #606060; + line-height: 22px; + padding: 0px 40px; + border-bottom: 1px solid #e9e8ed; +} .portlet-menu-description {} Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700) @@ -34,43 +34,43 @@ } .DefaultTheme .ArrowDownIcon { - background-position: center 20px; + background-position: center 18px; } .DefaultTheme .OverArrowDownIcon { - background-position: center 116px; + background-position: center 114px; } .DefaultTheme .MinimizedIcon { - background-position: center 44px; + background-position: center 42px; } .DefaultTheme .OverMinimizedIcon { - background-position: center 140px; + background-position: center 138px; } .DefaultTheme .MaximizedIcon { - background-position: center 68px; + background-position: center 66px; } .DefaultTheme .OverMaximizedIcon { - background-position: center 164px; + background-position: center 162px; } .DefaultTheme .RestoreIcon { - background-position: center 92px; + background-position: center 90px; } .DefaultTheme .OverRestoreIcon { - background-position: center 188px; + background-position: center 186px; } .DefaultTheme .NormalIcon { - background-position: center 92px; + background-position: center 90px; } .DefaultTheme .OverNormalIcon { - background-position: center 188px; + background-position: center 186px; } @@ -84,7 +84,7 @@ } .DefaultTheme .Information { - height: 18px; line-height: 18px; + height: 20px; line-height: 20px; vertical-align: middle; font-size: 10px; padding-left: 5px; /* orientation=lt */ padding-right: 5px; /* orientation=rt */ @@ -93,8 +93,8 @@ } .DefaultTheme .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ + background: url('background/IconWindowPortlet.gif') no-repeat left top; /* orientation=lt */ + background: url('background/IconWindowPortlet-rt.gif') no-repeat right top; /* orientation=rt */ padding-left: 20px; /* orientation=lt */ padding-right: 20px; /* orientation=rt */ height: 16px; @@ -110,14 +110,14 @@ } .DefaultTheme .WindowBarLeft { - padding-left: 12px; + padding-left: 8px; background-image: url('background/DefaultTheme.png'); background-repeat: no-repeat; background-position: left -148px; } .DefaultTheme .WindowBarRight { - padding-right: 11px; + padding-right: 8px; background-image: url('background/DefaultTheme.png'); background-repeat: no-repeat; background-position: right -119px; @@ -130,17 +130,17 @@ } .DefaultTheme .WindowBarCenter .FixHeight { - height: 21px; - padding-top: 8px; + height: 20px; + padding-top: 7px; } .DefaultTheme .MiddleDecoratorLeft { - padding-left: 12px; + padding-left: 8px; background: url('background/MDefaultTheme.png') repeat-y left; } .DefaultTheme .MiddleDecoratorRight { - padding-right: 11px; + padding-right: 8px; background: url('background/MDefaultTheme.png') repeat-y right; } @@ -149,14 +149,14 @@ } .DefaultTheme .BottomDecoratorLeft { - padding-left: 12px; + padding-left: 8px; background-image: url('background/DefaultTheme.png'); background-repeat: no-repeat; background-position: left -60px; } .DefaultTheme .BottomDecoratorRight { - padding-right: 11px; + padding-right: 8px; background-image: url('background/DefaultTheme.png'); background-repeat: no-repeat; background-position: right -30px; @@ -169,7 +169,7 @@ } .DefaultTheme .BottomDecoratorCenter .FixHeight { - height: 30px; + height: 26px; } /*-------------------------- MacTheme ---------------------------*/ Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png =================================================================== (Binary files differ) Copied: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif (from rev 5697, portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif) =================================================================== (Binary files differ) Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png =================================================================== (Binary files differ) Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,7 +22,7 @@ <gadgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0" xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> <gadget name="Todo"> Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- GadgetPortlet skins --> 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 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -324,7 +324,7 @@ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -140,7 +140,7 @@ Util.getPortalRequestContext().addUIComponentToUpdateByAjax( uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } UIAccountEditInputSet accountInput = uiUserInfo.getChild(UIAccountEditInputSet.class); Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- OrganizationPortlet skins --> Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <!-- BannerPortlet skins --> Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif =================================================================== (Binary files differ) Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.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-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-07 10:29:16 UTC (rev 5700) @@ -93,36 +93,36 @@ .UISitemap .UISiteTree .Node { line-height: 24px; - background: url('DefaultSkin/background/Dotted.gif') repeat-y 4px top; /* orientation=lt */ - background: url('DefaultSkin/background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */ + background: url('DefaultSkin/background/Dotted.gif') repeat-y left top; /* orientation=lt */ + background: url('DefaultSkin/background/Dotted.gif') repeat-y right top; /* orientation=rt */ } .UISitemap .UISiteTree .LastNode { line-height: 24px; - background: url('DefaultSkin/background/LastNode.gif') no-repeat 4px top; /* orientation=lt */ - background: url('DefaultSkin/background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */ + background: url('DefaultSkin/background/LastNode.gif') no-repeat left top; /* orientation=lt */ + background: url('DefaultSkin/background/LastNode.gif') no-repeat right top; /* orientation=rt */ } .UISitemap .CollapseIcon { background: url('DefaultSkin/background/CollapseIcon.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/CollapseIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 5px 0px 35px; /* orientation=lt */ - padding: 0px 35px 0px 5px; /* orientation=rt */ + padding: 0px 5px 0px 30px; /* orientation=lt */ + padding: 0px 30px 0px 5px; /* orientation=rt */ cursor: pointer; } .UISitemap .ExpandIcon { background: url('DefaultSkin/background/ExpandIcon.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/ExpandIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 5px 0px 35px; /* orientation=lt */ - padding: 0px 35px 0px 5px; /* orientation=rt */ + padding: 0px 5px 0px 30px; /* orientation=lt */ + padding: 0px 30px 0px 5px; /* orientation=rt */ cursor: pointer; } .UISitemap .NullItem { background: url('DefaultSkin/background/NullItem.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/NullItem-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 35px; + padding: 0px 30px; } .UISitemap .DefaultPageIcon { Modified: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -21,8 +21,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portal-skin> <skin-name>Default</skin-name> Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-07 10:29:16 UTC (rev 5700) @@ -158,6 +158,7 @@ eXo.portal.UIPortalNavigation.toggleSubMenu(e, tab, menuItemContainer) ; } } + eXo.portal.UIPortalNavigation.cancelHideMenuContainer(); eXo.portal.UIPortalNavigation.menuVisible = true ; } ; @@ -327,7 +328,6 @@ subContainer.firstTime = true; } } - eXo.portal.UIPortalNavigation.cancelHideMenuContainer() ; }; /** * Shows a sub menu, uses the methods from superClass (eXo.webui.UIPopupMenu) Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-07 10:29:16 UTC (rev 5700) @@ -162,6 +162,14 @@ } } +UICalendar.prototype.onTabOut =function(event) { + var keyCode = event.keyCode; + //identify the tab key: + if (keyCode == 9) { + eXo.webui.UICalendar.hide(); + } +}; + UICalendar.prototype.hide = function() { if (this.dateField) { document.getElementById(this.calendarId).firstChild.style.display = 'none' ; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-01-07 10:29:16 UTC (rev 5700) @@ -393,6 +393,9 @@ if(!popup || popup.style.display == "none") return; var uiDashboard = eXo.core.DOMUtil.findAncestorByClass(popup, "UIDashboard"); var deltaY = Math.ceil((uiDashboard.offsetHeight - popup.offsetHeight) / 2); + if (deltaY < 0) { + deltaY = 0; + } popup.style.top = eXo.core.Browser.findPosY(uiDashboard) + deltaY + "px"; }; /** @@ -539,4 +542,4 @@ }; }; -eXo.webui.UIDashboard = new UIDashboard(); \ No newline at end of file +eXo.webui.UIDashboard = new UIDashboard(); Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-01-07 10:29:16 UTC (rev 5700) @@ -37,6 +37,9 @@ //TODO Lambkin: this statement create a bug in select box component in Firefox //this.superClass.init(popup) ; + if (isShow) { + popup.style.display = "block"; + } var contentBlock = DOMUtil.findFirstDescendantByClass(popup, 'div' ,'PopupContent'); if(contentBlock && (eXo.core.Browser.getBrowserHeight() - 100 < contentBlock.offsetHeight)) { contentBlock.style.height = (eXo.core.Browser.getBrowserHeight() - 100) + "px"; @@ -285,4 +288,4 @@ DragDrop.init(null, clickBlock, dragBlock, evt) ; } ; -eXo.webui.UIPopupWindow = new UIPopupWindow(); \ No newline at end of file +eXo.webui.UIPopupWindow = new UIPopupWindow(); Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700) @@ -105,19 +105,16 @@ .portlet-section-subheader { font-weight: bold; - font-size: 10px; line-height: 18px; } .portlet-section-footer { - font-size: 11px; line-height: 18px; } /* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the section. */ .portlet-section-text { - font-size: 12px; font-style: italic; line-height: 18px; } @@ -154,7 +151,6 @@ /* Text in a selected cell range */ .portlet-table-selected { color: #000; - font-size: 12px; background-color: #CBD4E6; line-height: 18px; } @@ -176,7 +172,6 @@ /** FORMS **/ .portlet-form-label { - font-size: 10px; color: #333333; line-height: 18px; } @@ -227,7 +222,6 @@ /* Text for a form field */ .portlet-form-field { - font-size: 10px; color: #000; /*margin-top: 10px;*/ line-height: 18px; } @@ -243,52 +237,63 @@ .portlet-menu-item { color: #242424; text-decoration: none; - font-size: 12px; - line-height: 18px; background: #F5F9FA; + padding: 5px 10px; + border-bottom: 1px solid #cee0e4; } /* Selected menu item. */ .portlet-menu-item-selected { - line-height: 18px; + padding: 5px 10px; + border-bottom: 1px solid #cee0e4; background: #F5F9FA; + color: #058ee6; } .portlet-menu-item-hover { - color: #058ee6; - text-decoration: none; - font-size: 12px; - line-height: 18px; + color: #058ee6; + text-decoration: none; + padding: 5px 10px; + border-bottom: 1px solid #cee0e4; background: #F5F9FA; } /* Selected menu item when the mouse hovers over it. */ .portlet-menu-item-hover-selected { - line-height: 18px; + padding: 5px 10px; + border-bottom: 1px solid #cee0e4; background: #F5F9FA; + color: #058ee6; } /* Normal, unselected menu item that has sub-menus. */ .portlet-menu-cascade-item { line-height: 18px; + color: #585858; } /* Selected sub-menu item that has sub-menus */ .portlet-menu-cascade-item-selected { - line-height: 18px; + border-bottom: 1px solid #d8e7ea; + padding: 5px 20px; + color: #058ee6; } .porlet-menu-cascade { - line-height: 18px; + border-bottom: 1px solid #d8e7ea; + padding: 5px 20px; } .portlet-menu-cascade-item-hover { - line-height: 18px; + border-bottom: 1px solid #d8e7ea; + padding: 5px 20px; color: #058ee6; } .portlet-menu-cascade-item-hover-selected { - line-height: 18px; + border-bottom: 1px solid #d8e7ea; + padding: 5px 20px; + color: #058ee6; } .portlet-menu-separator { @@ -300,37 +305,51 @@ } .portlet-menu-content { - line-height: 18px; + border-bottom: 1px solid #e4eff2; + padding: 5px 30px; + color: #878787; } .portlet-menu-content-selected { - line-height: 18px; + border-bottom: 1px solid #e4eff2; + padding: 5px 30px; + color: #058ee6; } .portlet-menu-content-hover { - line-height: 18px; + border-bottom: 1px solid #e4eff2; + padding: 5px 30px; color: #058ee6; } .portlet-menu-content-hover-selected { - line-height: 18px; + border-bottom: 1px solid #e4eff2; + padding: 5px 30px; + color: #058ee6; } .portlet-menu-indicator { - line-height: 18px; + padding: 5px 40px; + color: #bebebe; + border-bottom: 1px solid #f4f8f9; } .portlet-menu-indicator-selected { - line-height: 18px; + padding: 5px 40px; + color: #058ee6; + border-bottom: 1px solid #f4f8f9; } .portlet-menu-indicator-hover { - line-height: 18px; + padding: 5px 40px; color: #058ee6; + border-bottom: 1px solid #f4f8f9; } .portlet-menu-indicator-hover-selected { - line-height: 18px; + padding: 5px 40px; + color: #058ee6; + border-bottom: 1px solid #f4f8f9; } .portlet-menu-description { Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -298,56 +298,5 @@ </object-param> </init-params> </component-plugin> - -<!-- - <component-plugin> - <name>ecm.new.user.event.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NewUserListener</type> - <description>description</description> - <init-params> - <object-param> - <name>configuration</name> - <description>description</description> - <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig"> - <field name="repository"><string>repository</string></field> - <field name="workspaces"> - <collection type="java.util.ArrayList"> - <value><string>portal-system</string></value> - </collection> - </field> - <field name="jcrPaths"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath"> - <field name="alias"><string>userApplicationData</string></field> - <field name="path"><string>ApplicationData</string></field> - <field name="nodeType"><string>nt:unstructured</string></field> - <field name="permissions"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission"> - <field name="identity"><string>*:/platform/administrators</string></field> - <field name="read"><string>true</string></field> - <field name="addNode"><string>true</string></field> - <field name="setProperty"><string>true</string></field> - <field name="remove"><string>true</string></field> - </object> - </value> - </collection> - </field> - <field name="mixinTypes"> - <collection type="java.util.ArrayList"> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> ---> </external-component-plugins> </configuration> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>5</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -16,8 +16,8 @@ --> <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>newStaff</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>2</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>newAccount</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>9</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>mylink-blog</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> <node> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>classic</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <container template="system:/groovy/portal/webui/container/UIToolbarContainer.gtmpl"> <access-permissions>*:/platform/users</access-permissions> <container id="StarToolBarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <portal-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> </container> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <portlet-application> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,7 +22,7 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> </page> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,6 +22,6 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,6 +22,6 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,6 +22,6 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,7 +22,7 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,7 +22,7 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <node-navigation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>2</priority> <page-nodes> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>wsrpConfiguration</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -22,8 +22,8 @@ <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name> Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -234,6 +234,6 @@ w.write(value_.toString()); w.write('\''); } - w.write(" onclick='event.cancelBubble = true'/>"); + w.write(" onclick='event.cancelBubble = true' onkeydown='eXo.webui.UICalendar.onTabOut(event)'/>"); } } Modified: portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl =================================================================== --- portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-07 10:29:16 UTC (rev 5700) @@ -36,8 +36,8 @@ <% List lstGadgets = uicomponent.getGadgetsOfCategory(category); if(lstGadgets != null){ - if(lstGadgets.size() >= 20) - uiPopup.setWindowSize(-1, 600); +// if(lstGadgets.size() >= 20) +// uiPopup.setWindowSize(-1, 600); for(gadget in lstGadgets){ %> Modified: portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml 2011-01-07 10:29:16 UTC (rev 5700) @@ -34,7 +34,6 @@ <component> <key>org.exoplatform.services.resources.LocalePolicy</key> - <!--type>org.exoplatform.portal.application.NoBrowserLocalePolicyService</type--> <type>org.exoplatform.portal.application.localization.DefaultLocalePolicyService</type> </component> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -403,11 +403,30 @@ * 2) Portlets will be fully rendered if are inner of the portal ui components being updated * * @param forceFullUpdate + * + * This method is deprecated, ignoreAJAXUpdateOnPortlets should be used instead */ + @Deprecated() final public void setFullRender(boolean forceFullUpdate) { this.forceFullUpdate = forceFullUpdate; } + + /** + * Call to this method makes sense only in the scope of an AJAX request. + * + * Invoking ignoreAJAXUpdateOnPortlets(true) as there is need to update only UI components + * of portal (ie: the components outside portlet windows) are updated by AJAX. In the request + * response, all the blocks <PortletRespond > are empty. The content displayed in portlet + * windows are retrieved by non-AJAX render request to associated portlet object. + * + * + * @param ignoreAJAXUpdateOnPortlets + */ + final public void ignoreAJAXUpdateOnPortlets(boolean ignoreAJAXUpdateOnPortlets) + { + this.forceFullUpdate = ignoreAJAXUpdateOnPortlets; + } final public void sendRedirect(String url) throws IOException { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -262,7 +262,7 @@ PortalRequestContext pcontext = Util.getPortalRequestContext(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } static public class AddApplicationActionListener extends EventListener<UIAddNewApplication> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -526,7 +526,7 @@ { log .info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page"); - context.setFullRender(true); + context.ignoreAJAXUpdateOnPortlets(true); } if (newEvents != null && !newEvents.isEmpty()) { @@ -751,7 +751,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE); if (windowState == null) Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -170,7 +170,7 @@ try { PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); - prcontext.setFullRender(true); + prcontext.ignoreAJAXUpdateOnPortlets(true); StatefulPortletContext portletContext = uiPortlet_.getPortletContext(); ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_); @@ -407,7 +407,7 @@ UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIPortlet.class); } } @@ -429,7 +429,7 @@ uiMaskWorkspace.setUIComponent(null); uiMaskWorkspace.setWindowSize(-1, -1); pcontext.addUIComponentToUpdateByAjax(uiMaskWorkspace); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIPortlet.class); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -82,7 +82,7 @@ UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -145,7 +145,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIContainer.class); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -116,7 +116,7 @@ UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); return; } @@ -136,7 +136,7 @@ UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); return; } } @@ -166,7 +166,7 @@ uiPopup.setShow(false); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); } private void setNavigation(List<PageNavigation> navs, PageNavigation nav) Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -452,7 +452,7 @@ // convert Page to UIPage PortalDataMapper.toUIPage(uiPage, selectPage); Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } else { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -42,6 +42,8 @@ import org.exoplatform.webui.form.UIFormStringInput; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /* @@ -158,60 +160,48 @@ } WebuiRequestContext pcontext = event.getRequestContext(); - - // if edit navigation - if (pageNav != null) - { - uiForm.invokeSetBindingBean(pageNav); - UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority"); - int priority = Integer.parseInt(uiSelectBox.getValue()); - pageNav.setPriority(priority); - - // update navigation - dataService.save(pageNav); - - UIPopupWindow uiPopup = uiForm.getParent(); - uiPopup.setShow(false); - UIComponent opener = uiPopup.getParent(); - pcontext.addUIComponentToUpdateByAjax(opener); - return; - } - - // if add navigation - pageNav = new PageNavigation(); - // set properties for navigation uiForm.invokeSetBindingBean(pageNav); - UIFormStringInput uiOwnerId = uiForm.findComponentById("ownerId"); - UIFormStringInput uiOwnerType = uiForm.findComponentById("ownerType"); UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority"); int priority = Integer.parseInt(uiSelectBox.getValue()); pageNav.setPriority(priority); - pageNav.setModifiable(true); - pageNav.setOwnerId(uiOwnerId.getValue()); - pageNav.setOwnerType(uiOwnerType.getValue()); - //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class); - UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class); - // ensure this navigation is not exist - if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null) - { - uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation", - new String[]{pageNav.getOwnerId()}));; - return; - } + // update navigation + dataService.save(pageNav); - // create navigation for group - dataService.create(pageNav); + pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()); - // close popup window, update popup window + UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + updateNavPriority(uiPortalApp.getNavigations(), pageNav); + + uiPortalApp.localizeNavigations(); + UIPopupWindow uiPopup = uiForm.getParent(); uiPopup.setShow(false); UIComponent opener = uiPopup.getParent(); + UIWorkingWorkspace uiWorkingWS = + Util.getUIPortal().getAncestorOfType(UIPortalApplication.class).getChild(UIWorkingWorkspace.class); + uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet"); pcontext.addUIComponentToUpdateByAjax(opener); + } + + private void updateNavPriority(List<PageNavigation> navs, PageNavigation nav) + { + for (int i = 0; i < navs.size(); i++) + { + if (navs.get(i).getId() == nav.getId()) + { + navs.set(i, nav); + break; + } + } - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class); - uiWorkingWS.updatePortletsByName("GroupNavigationPortlet"); - + Collections.sort(navs, new Comparator<PageNavigation>() + { + public int compare(PageNavigation nav1, PageNavigation nav2) + { + return nav1.getPriority() - nav2.getPriority(); + } + }); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -254,7 +254,7 @@ uiToolPanel.setShowMaskLayer(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIContainer uiParent = uiPageNodeSelector.getParent(); PageNode node = null; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -64,7 +64,7 @@ //This code snippet is to make sure that Javascript/Skin is fully loaded at the first request UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); PortalRequestContext pcontext = Util.getPortalRequestContext(); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); PageNavigation currentNav = showedUIPortal.getSelectedNavigation(); @@ -422,7 +422,7 @@ } } PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - pcontext.setFullRender(false); + pcontext.ignoreAJAXUpdateOnPortlets(false); pcontext.setResponseComplete(true); pcontext.getWriter().write(EventListener.RESULT_OK); } @@ -445,7 +445,7 @@ } DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class); dataService.save(page); - pcontext.setFullRender(false); + pcontext.ignoreAJAXUpdateOnPortlets(false); pcontext.setResponseComplete(true); pcontext.getWriter().write(EventListener.RESULT_OK); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -454,7 +454,7 @@ //uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -321,7 +321,7 @@ if (page.getChildren() == null) page.setChildren(new ArrayList<ModelObject>()); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); @@ -339,7 +339,7 @@ UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel(); toolPanel.setShowMaskLayer(true); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -100,7 +100,7 @@ UIPortal uiPortal = Util.getUIPortal(); uiPortal.setRenderSibling(UIPortal.class); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } void updateWizardComponent() @@ -111,7 +111,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } static public class AbortActionListener extends EventListener<UIPageWizard> @@ -124,7 +124,7 @@ UIPortal uiPortal = Util.getUIPortal(); uiPortal.setRenderSibling(UIPortal.class); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -168,7 +168,7 @@ UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); uiMaskWS.setUIComponent(null); // event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS) ; - Util.getPortalRequestContext().setFullRender(false); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false); if (language == null || language.trim().length() < 1) return; // if(!uiPortal.isModifiable()) return; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -461,7 +461,7 @@ { public void execute(Event<UIPortal> event) throws Exception { - UIPortal uiPortal = Util.getUIPortal(); + UIPortal uiPortal = event.getSource(); UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -72,7 +72,7 @@ { PortalRequestContext pContext = (PortalRequestContext)event.getRequestContext(); HttpServletRequest request = pContext.getRequest(); - pContext.setFullRender(false); + pContext.ignoreAJAXUpdateOnPortlets(false); pContext.setResponseComplete(true); pContext.getWriter().write("" + request.getSession().getMaxInactiveInterval()); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -231,7 +231,7 @@ if (newComponent) { portalComposer.updateWorkspaceComponent(); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -408,7 +408,7 @@ uiEditWS.getComposer().setEditted(false); uiEditWS.setRendered(false); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); UISiteBody siteBody = uiWorkingWS.findFirstComponentOfType(UISiteBody.class); UIPortal uiPortal = uiWorkingWS.getBackupUIPortal(); @@ -459,7 +459,7 @@ uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); String uri = (uiPortal.getSelectedNode() != null)? (uiPortal.getSelectedNode().getUri()) : null; @@ -582,7 +582,7 @@ } event.getSource().updateWorkspaceComponent(); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -655,7 +655,7 @@ UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); UIPortal uiPortal = uiPortalApp.getShowedUIPortal(); uiPortal.setRenderSibling(UIPortal.class); @@ -704,7 +704,7 @@ uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageId}, 1)); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null)); @@ -761,7 +761,7 @@ } uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null)); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -100,7 +100,7 @@ UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); uiMaskWS.setUIComponent(null); //event.getRequestContext().addUIComponentToUpdateByAjax(uiApp) ; - Util.getPortalRequestContext().setFullRender(false); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false); if (skin == null || skin.trim().length() < 1) return; uiApp.setSkin(skin); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -67,7 +67,7 @@ PortalRequestContext portalRequestContext = (PortalRequestContext)context.getParentAppRequestContext(); UIWorkingWorkspace uiWorkingWS = portalApplication.getChildById(UIPortalApplication.UI_WORKING_WS_ID); portalRequestContext.addUIComponentToUpdateByAjax(uiWorkingWS); - portalRequestContext.setFullRender(true); + portalRequestContext.ignoreAJAXUpdateOnPortlets(true); } /** Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -315,7 +315,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); return uiWorkingWS; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -54,7 +54,7 @@ public void execute(Event<UIWorkingWorkspace> event) throws Exception { UIPortalApplication uiApp = Util.getUIPortalApplication(); - UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + UIWorkingWorkspace uiWorkingWS = event.getSource(); // check edit permission for page UIPageBody pageBody = uiWorkingWS.findFirstComponentOfType(UIPageBody.class); @@ -97,7 +97,7 @@ pageBody.setUIComponent(null); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -107,7 +107,7 @@ { UIPortalApplication uiApp = Util.getUIPortalApplication(); uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); - UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + UIWorkingWorkspace uiWorkingWS = event.getSource(); if (!hasPageCreationPermission()) { @@ -165,8 +165,7 @@ //Todo nguyenanhkien2a(a)gmail.com //Check editing permission UIPortalApplication portalApp = Util.getUIPortalApplication(); - UIPortal currentUIPortal = portalApp.<UIWorkingWorkspace>findComponentById( - UIPortalApplication.UI_WORKING_WS_ID).findFirstComponentOfType(UIPortal.class); + UIPortal currentUIPortal = event.getSource().findFirstComponentOfType(UIPortal.class); UserACL userACL = portalApp.getApplicationComponent(UserACL.class); if(!userACL.hasEditPermissionOnPortal(currentUIPortal.getOwnerType(), currentUIPortal.getOwner(), currentUIPortal.getEditPermission())) @@ -177,7 +176,7 @@ } PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + UIWorkingWorkspace uiWorkingWS = event.getSource(); uiWorkingWS.setBackupUIPortal(uiPortal); uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); @@ -202,7 +201,7 @@ uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-01-07 09:38:22 UTC (rev 5699) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-01-07 10:29:16 UTC (rev 5700) @@ -47,7 +47,7 @@ { context.addUIComponentToUpdateByAjax(uicomponent.<UIComponent>getChildById(UIPortalApplication.UI_WORKING_WS_ID)); context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIMaskWorkspace.class)); - ((PortalRequestContext)context).setFullRender(true); + ((PortalRequestContext)context).ignoreAJAXUpdateOnPortlets(true); return; } if (uiTarget == uicomponent)