gatein SVN: r3087 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-14 00:07:53 -0400 (Fri, 14 May 2010)
New Revision: 3087
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_06_001_ChangeOrderOfNode.html
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html
Log:
TESTVN-399: Create new GateIn Selenium Scrips
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-05-14 04:02:24 UTC (rev 3086)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html 2010-05-14 04:07:53 UTC (rev 3087)
@@ -236,11 +236,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td></td>
- <td></td>
- <td></td>
-</tr>
</tbody></table>
</body>
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick.html 2010-05-14 04:07:53 UTC (rev 3087)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_01_007_CreateNewNodeInTheFirstLevelWhenDoRightClick</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Create new node in the first level when do right click--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//div[@id='UINavigationNodeSelector']//div[@class='UIContextMenuContainer']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Page Node Setting--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>Test_POR_14_01_007</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>Test_POR_14_01_007</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Selector--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--View page(node)--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_POR_14_01_007</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Test_POR_14_01_007</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//a[@title='Test_POR_14_01_007']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//a[@title='Test_POR_14_01_007']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign out--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html 2010-05-14 04:07:53 UTC (rev 3087)
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Create new node as child of existing node when do right click--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Page Node Setting--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>Test_POR_14_01_008</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>Test_POR_14_01_008</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Selector--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--View page(node)--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_POR_14_01_008</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Test_POR_14_01_008</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//a[@title='Test_POR_14_01_008']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//a[@title='Test_POR_14_01_008']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign out--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_06_001_ChangeOrderOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_06_001_ChangeOrderOfNode.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_06_001_ChangeOrderOfNode.html 2010-05-14 04:07:53 UTC (rev 3087)
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_06_001_ChangeOrderOfNode</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_06_001_ChangeOrderOfNode</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-MoveUp/DownNode-</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Create node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Page Node Setting--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>Test_POR_14_06_001</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>Test_POR_14_06_001</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Selector--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_POR_14_06_001</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Test_POR_14_06_001</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Change order of node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Move node up</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>xpath=//a[@title='Test_POR_14_06_001']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>storeXpathCount</td>
+ <td>//div[@class='TreeContainer JSContainer']/div/div</td>
+ <td>nodeLvl</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_POR_14_06_001</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//a[@title='Test_POR_14_06_001']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementNotPresent</td>
+ <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Move node down</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//a[@title='Test_POR_14_06_001']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>xpath=//a[@title='Test_POR_14_06_001']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//a[@title='Test_POR_14_06_001']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign out--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 7 months
- 1
- 0
gatein SVN: r3086 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-05-14 00:02:24 -0400 (Fri, 14 May 2010)
New Revision: 3086
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1072 Show protected content when edit page in special case(check permission for loading portlet)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14 00:36:47 UTC (rev 3085)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14 04:02:24 UTC (rev 3086)
@@ -26,6 +26,7 @@
import org.exoplatform.portal.portlet.PortletExceptionHandleService;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.resolver.ApplicationResourceResolver;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -196,7 +197,9 @@
else
{
int portalMode = Util.getUIPortalApplication().getModeState();
- if (portalMode % 2 == 0 || uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT))
+
+ //Check mode of portal, portlet and permission for viewable
+ if ((portalMode % 2 == 0 || uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT)) && uicomponent.hasPermission())
{
PortletInvocationResponse response = uicomponent.invoke(renderInvocation);
if (response instanceof FragmentResponse)
14 years, 7 months
- 1
- 0
gatein SVN: r3085 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-13 20:36:47 -0400 (Thu, 13 May 2010)
New Revision: 3085
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Book_Info.xml
Log:
JBEPP-274:Remove product and version entities from Book_Info.xml for brew build
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Book_Info.xml 2010-05-14 00:32:30 UTC (rev 3084)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Book_Info.xml 2010-05-14 00:36:47 UTC (rev 3085)
@@ -9,8 +9,8 @@
<bookinfo id="book-Install_Guide-Install_Guide">
<title>Installation Guide</title>
<subtitle>An Installation Guide for &PRODUCT;</subtitle>
- <productname>&PRODUCT;</productname>
- <productnumber>&VERSION;</productnumber>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.0</productnumber>
<edition>1</edition>
<pubsnumber>0</pubsnumber>
<abstract>
14 years, 7 months
- 1
- 0
gatein SVN: r3084 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-13 20:32:30 -0400 (Thu, 13 May 2010)
New Revision: 3084
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
Log:
JBEPP-275:Remove product and version entities from Book_Info.xml for brew build
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-05-13 20:47:35 UTC (rev 3083)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-05-14 00:32:30 UTC (rev 3084)
@@ -1,19 +1,17 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<?xml version="1.0" ?><!DOCTYPE bookinfo PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd' [
<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
%BOOK_ENTITIES;
-]>
-<bookinfo id="book-User_Guide-User_Guide">
+]><bookinfo id="book-User_Guide-User_Guide">
<title>User Guide</title>
<subtitle>A User Guide for Enterprise Portal Platform 5.0</subtitle>
- <productname>&PRODUCT;</productname>
- <productnumber>&VERSION;</productnumber>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.0</productnumber>
<edition>1</edition>
<pubsnumber>2.5</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
-options available in &PRODUCT;. It is intended to
+options available in . It is intended to
be accessible and useful to both experienced and novice portal
users.
</para>
@@ -21,11 +19,10 @@
<corpauthor>
<inlinemediaobject>
<imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
</imageobject>
</inlinemediaobject>
</corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</bookinfo>
-
14 years, 7 months
- 1
- 0
gatein SVN: r3083 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-13 16:47:35 -0400 (Thu, 13 May 2010)
New Revision: 3083
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
Log:
JBEPP-275: Update pubsnumber for brew push
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-05-13 11:42:14 UTC (rev 3082)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-05-13 20:47:35 UTC (rev 3083)
@@ -9,7 +9,7 @@
<productname>&PRODUCT;</productname>
<productnumber>&VERSION;</productnumber>
<edition>1</edition>
- <pubsnumber>1.6</pubsnumber>
+ <pubsnumber>2.5</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
14 years, 7 months
- 1
- 0
gatein SVN: r3082 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-13 07:42:14 -0400 (Thu, 13 May 2010)
New Revision: 3082
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
Log:
GTNPORTAL-1200: Fix error in PageNavigationUtils 's search methods
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-05-13 10:04:03 UTC (rev 3081)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-05-13 11:42:14 UTC (rev 3082)
@@ -156,7 +156,10 @@
ParentChildPair parentChildPair = searchParentChildPairUnderNode(node, uri);
if(parentChildPair != null)
{
- parentChildPair.setParentNode(node);
+ if(parentChildPair.getParentNode() == null)
+ {
+ parentChildPair.setParentNode(rootNode);
+ }
return parentChildPair;
}
}
14 years, 7 months
- 1
- 0
gatein SVN: r3081 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-13 06:04:03 -0400 (Thu, 13 May 2010)
New Revision: 3081
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
Cleanup resource bundle files used in UIPageNodeForm (former UIPageNodeForm2)
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -495,25 +495,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Dieser Knotenname wird bereits verwendet.
-UIPageNodeForm2.msg.selectPage=Sie müssen eine Seite auswählen.
-UIPageNodeForm2.msg.startDateBeforeEndDate=Das Ende-Datum muss nach Beginn-Datum liegen.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Knotenname:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Seiten-Referenz
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Seitentyp
-UIPageNodeForm2.label.creator=Seiten-Ersteller
-UIPageNodeForm2.label.modifier=Seitenbearbeiter
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Sichtbar:
-UIPageNodeForm2.label.showPublicationDate=Veröffentlichungzeitraum:
-UIPageNodeForm2.label.startPublicationDate=Veröffentlichungsbeginn:
-UIPageNodeForm2.label.endPublicationDate=Veröffentlichungsende:
-UIPageNodeForm2.Icon.title.SetDefault=Standardeinstellung
+UIPageNodeForm.msg.SameName=Dieser Knotenname wird bereits verwendet.
+UIPageNodeForm.msg.selectPage=Sie müssen eine Seite auswählen.
+UIPageNodeForm.msg.startDateBeforeEndDate=Das Ende-Datum muss nach Beginn-Datum liegen.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Knotenname:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Seiten-Referenz
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Seitentyp
+UIPageNodeForm.label.creator=Seiten-Ersteller
+UIPageNodeForm.label.modifier=Seitenbearbeiter
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Sichtbar:
+UIPageNodeForm.label.showPublicationDate=Veröffentlichungzeitraum:
+UIPageNodeForm.label.startPublicationDate=Veröffentlichungsbeginn:
+UIPageNodeForm.label.endPublicationDate=Veröffentlichungsende:
+UIPageNodeForm.Icon.title.SetDefault=Standardeinstellung
UIPageNodeForm.tab.label.PageNodeSetting=Seitenknoten-Eigenschaften
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Seiten-Auswahl
@@ -1299,7 +1299,7 @@
############################################################################
UIPopupWindow.Close=Fenster Schließen
-UIPopupWindow.title.UIPageNodeForm2=Seitenknoten hinzufügen
+UIPopupWindow.title.UIPageNodeForm=Seitenknoten hinzufügen
UIPopupWindow.title.UINavigationManagement=Navigations-Verwaltung
UIPopupWindow.title.UIPageNavigationForm=Formular zur Seien-Navigation
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -508,27 +508,27 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=This node name already exists.
-UIPageNodeForm2.msg.selectPage=You have to select a page.
-UIPageNodeForm2.msg.startDateBeforeEndDate=The end date must be after the start date.
-UIPageNodeForm2.msg.currentDateBeforeStartDate=The start date must be after the current date or empty.
-UIPageNodeForm2.msg.currentDateBeforeEndDate=The end date must be after the current date or empty.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Node Name:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Page Reference
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Page Type
-UIPageNodeForm2.label.creator=Page Creator
-UIPageNodeForm2.label.modifier=Page Modifier
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Visible:
-UIPageNodeForm2.label.showPublicationDate=Publication date & time:
-UIPageNodeForm2.label.startPublicationDate=Start Publication Date:
-UIPageNodeForm2.label.endPublicationDate=End Publication Date:
-UIPageNodeForm2.Icon.title.SetDefault=Get Default
+UIPageNodeForm.msg.SameName=This node name already exists.
+UIPageNodeForm.msg.selectPage=You have to select a page.
+UIPageNodeForm.msg.startDateBeforeEndDate=The end date must be after the start date.
+UIPageNodeForm.msg.currentDateBeforeStartDate=The start date must be after the current date or empty.
+UIPageNodeForm.msg.currentDateBeforeEndDate=The end date must be after the current date or empty.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Node Name:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Page Reference
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Page Type
+UIPageNodeForm.label.creator=Page Creator
+UIPageNodeForm.label.modifier=Page Modifier
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Visible:
+UIPageNodeForm.label.showPublicationDate=Publication date & time:
+UIPageNodeForm.label.startPublicationDate=Start Publication Date:
+UIPageNodeForm.label.endPublicationDate=End Publication Date:
+UIPageNodeForm.Icon.title.SetDefault=Get Default
UIPageNodeForm.tab.label.PageNodeSetting=Page Node Setting
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Page Selector
@@ -1310,7 +1310,7 @@
############################################################################
UIPopupWindow.Close=Close Window
-UIPopupWindow.title.UIPageNodeForm2=ADD/EDIT PAGE NODE
+UIPopupWindow.title.UIPageNodeForm=ADD/EDIT PAGE NODE
UIPopupWindow.title.UINavigationManagement=Navigation Management
UIPopupWindow.title.UIPageNavigationForm=Page Navigation Form
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -493,25 +493,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Este nombre de nodo ya existe.
-UIPageNodeForm2.msg.selectPage=Debes seleccionar una p\u00e1gina.
-UIPageNodeForm2.msg.startDateBeforeEndDate=La fecha de finalizaci\u00f3n debe ser posterior a la fecha de inicio.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Nombre de Nodo:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Referencia a P\u00e1gina
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Tipo de P\u00e1gina
-UIPageNodeForm2.label.creator=Creador de la P\u00e1gina
-UIPageNodeForm2.label.modifier=Modificador de la P\u00e1gina
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Visible:
-UIPageNodeForm2.label.showPublicationDate=Fecha y hora de Publicaci\u00f3n:
-UIPageNodeForm2.label.startPublicationDate=Fecha de inicio de Publicaci\u00f3n:
-UIPageNodeForm2.label.endPublicationDate=Fecha de fin de Publicaci\u00f3n:
-UIPageNodeForm2.Icon.title.SetDefault=Obtener el por Defecto
+UIPageNodeForm.msg.SameName=Este nombre de nodo ya existe.
+UIPageNodeForm.msg.selectPage=Debes seleccionar una p\u00e1gina.
+UIPageNodeForm.msg.startDateBeforeEndDate=La fecha de finalizaci\u00f3n debe ser posterior a la fecha de inicio.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Nombre de Nodo:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Referencia a P\u00e1gina
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Tipo de P\u00e1gina
+UIPageNodeForm.label.creator=Creador de la P\u00e1gina
+UIPageNodeForm.label.modifier=Modificador de la P\u00e1gina
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Visible:
+UIPageNodeForm.label.showPublicationDate=Fecha y hora de Publicaci\u00f3n:
+UIPageNodeForm.label.startPublicationDate=Fecha de inicio de Publicaci\u00f3n:
+UIPageNodeForm.label.endPublicationDate=Fecha de fin de Publicaci\u00f3n:
+UIPageNodeForm.Icon.title.SetDefault=Obtener el por Defecto
UIPageNodeForm.tab.label.PageNodeSetting=Ajustes de Nodo de P\u00e1gina
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Selector P\u00e1gina
@@ -1273,7 +1273,7 @@
############################################################################
UIPopupWindow.Close=Cerrar Ventana
-UIPopupWindow.title.UIPageNodeForm2=A\u00d1ADIR/EDITAR NODO DE P\u00c1GINA
+UIPopupWindow.title.UIPageNodeForm=A\u00d1ADIR/EDITAR NODO DE P\u00c1GINA
UIPopupWindow.title.UINavigationManagement=Gesti\u00f3n de Navegaci\u00f3n
UIPopupWindow.title.UIPageNavigationForm=Formulario de Navegaci\u00f3n de P\u00e1gina
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -478,26 +478,26 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.title=Ajout / Edition d'un noeud de page
-UIPageNodeForm2.msg.SameName=Un noeud du même nom existe déjà, veuillez en choisir un autre !
-UIPageNodeForm2.msg.selectPage=Vous devez sélectionner une page !
-UIPageNodeForm2.msg.startDateBeforeEndDate=La date de fin doit être supérieure à la date de début.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=Fermer
-UIPageNodeForm2.label.name=Nom du noeud :
-UIPageNodeForm2.label.uri=#{word.uri} :
-UIPageNodeForm2.label.pageReference=Référence de la page
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Type de page
-UIPageNodeForm2.label.creator=Créateur
-UIPageNodeForm2.label.modifier=Modificateur
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Visible:
-UIPageNodeForm2.label.showPublicationDate=Date & heure de publication
-UIPageNodeForm2.label.startPublicationDate=Date de début de publication
-UIPageNodeForm2.label.endPublicationDate=Date de fin de publication
-UIPageNodeForm2.Icon.title.SetDefault=Valeur par défaut
+UIPageNodeForm.title=Ajout / Edition d'un noeud de page
+UIPageNodeForm.msg.SameName=Un noeud du même nom existe déjà, veuillez en choisir un autre !
+UIPageNodeForm.msg.selectPage=Vous devez sélectionner une page !
+UIPageNodeForm.msg.startDateBeforeEndDate=La date de fin doit être supérieure à la date de début.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=Fermer
+UIPageNodeForm.label.name=Nom du noeud :
+UIPageNodeForm.label.uri=#{word.uri} :
+UIPageNodeForm.label.pageReference=Référence de la page
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Type de page
+UIPageNodeForm.label.creator=Créateur
+UIPageNodeForm.label.modifier=Modificateur
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Visible:
+UIPageNodeForm.label.showPublicationDate=Date & heure de publication
+UIPageNodeForm.label.startPublicationDate=Date de début de publication
+UIPageNodeForm.label.endPublicationDate=Date de fin de publication
+UIPageNodeForm.Icon.title.SetDefault=Valeur par défaut
UIPageNodeForm.tab.label.PageNodeSetting=Configuration du noeud
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Sélecteur de page
@@ -1250,7 +1250,7 @@
############################################################################
UIPopupWindow.Close=Close Window
-UIPopupWindow.title.UIPageNodeForm2=ADD/EDIT PAGE NODE
+UIPopupWindow.title.UIPageNodeForm=ADD/EDIT PAGE NODE
UIPopupWindow.title.UINavigationManagement=Navigation Management
UIPopupWindow.title.UIPageNavigationForm=Page Navigation Form
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -497,25 +497,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Il nome del nodo esiste gi\u00E0.
-UIPageNodeForm2.msg.selectPage=Devi selezionare una pagina.
-UIPageNodeForm2.msg.startDateBeforeEndDate=La data di fine deve essere superiore alla data di inizio.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Nome del Nodo:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Collegamento alla Pagina
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Tipo della Pagina
-UIPageNodeForm2.label.creator=Creatore della Pagina
-UIPageNodeForm2.label.modifier=Modificatore della Pagina
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Visibile:
-UIPageNodeForm2.label.showPublicationDate=Data e tempo di Pubblicazione:
-UIPageNodeForm2.label.startPublicationDate=Inizio Data di pubblicazione:
-UIPageNodeForm2.label.endPublicationDate=Fine data di pubblicazione:
-UIPageNodeForm2.Icon.title.SetDefault=Ottieno il Default
+UIPageNodeForm.msg.SameName=Il nome del nodo esiste gi\u00E0.
+UIPageNodeForm.msg.selectPage=Devi selezionare una pagina.
+UIPageNodeForm.msg.startDateBeforeEndDate=La data di fine deve essere superiore alla data di inizio.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Nome del Nodo:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Collegamento alla Pagina
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Tipo della Pagina
+UIPageNodeForm.label.creator=Creatore della Pagina
+UIPageNodeForm.label.modifier=Modificatore della Pagina
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Visibile:
+UIPageNodeForm.label.showPublicationDate=Data e tempo di Pubblicazione:
+UIPageNodeForm.label.startPublicationDate=Inizio Data di pubblicazione:
+UIPageNodeForm.label.endPublicationDate=Fine data di pubblicazione:
+UIPageNodeForm.Icon.title.SetDefault=Ottieno il Default
UIPageNodeForm.tab.label.PageNodeSetting=Preferenze del Nodo della Pagina
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Selettore della Pagina
@@ -1291,7 +1291,7 @@
############################################################################
UIPopupWindow.Close=Chiudi la Finestra
-UIPopupWindow.title.UIPageNodeForm2=AGGIUNGI/MODIFICA IL NODO DELLA PAGINA
+UIPopupWindow.title.UIPageNodeForm=AGGIUNGI/MODIFICA IL NODO DELLA PAGINA
UIPopupWindow.title.UINavigationManagement=Amministrazione della Navigazione
UIPopupWindow.title.UIPageNavigationForm=Form della Pagina di Navigazione
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -495,25 +495,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=\u3053\u306e\u30ce\u30fc\u30c9\u540d\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
-UIPageNodeForm2.msg.selectPage=\u30da\u30fc\u30b8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
-UIPageNodeForm2.msg.startDateBeforeEndDate=\u7d42\u4e86\u65e5\u306f\u958b\u59cb\u65e5\u3088\u308a\u5f8c\u3067\u306a\u304f\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=\u30ce\u30fc\u30c9\u540d:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=\u30da\u30fc\u30b8\u53c2\u7167
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=\u30da\u30fc\u30b8\u30bf\u30a4\u30d7
-UIPageNodeForm2.label.creator=\u30da\u30fc\u30b8\u4f5c\u6210\u8005
-UIPageNodeForm2.label.modifier=\u30da\u30fc\u30b8\u5909\u66f4\u8005
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=\u95b2\u89a7\u53ef\u80fd:
-UIPageNodeForm2.label.showPublicationDate=\u516c\u958b\u65e5\u6642:
-UIPageNodeForm2.label.startPublicationDate=\u516c\u958b\u958b\u59cb\u65e5:
-UIPageNodeForm2.label.endPublicationDate=\u516c\u958b\u7d42\u4e86\u65e5:
-UIPageNodeForm2.Icon.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8
+UIPageNodeForm.msg.SameName=\u3053\u306e\u30ce\u30fc\u30c9\u540d\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
+UIPageNodeForm.msg.selectPage=\u30da\u30fc\u30b8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
+UIPageNodeForm.msg.startDateBeforeEndDate=\u7d42\u4e86\u65e5\u306f\u958b\u59cb\u65e5\u3088\u308a\u5f8c\u3067\u306a\u304f\u3066\u306f\u3044\u3051\u307e\u305b\u3093
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=\u30ce\u30fc\u30c9\u540d:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=\u30da\u30fc\u30b8\u53c2\u7167
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=\u30da\u30fc\u30b8\u30bf\u30a4\u30d7
+UIPageNodeForm.label.creator=\u30da\u30fc\u30b8\u4f5c\u6210\u8005
+UIPageNodeForm.label.modifier=\u30da\u30fc\u30b8\u5909\u66f4\u8005
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=\u95b2\u89a7\u53ef\u80fd:
+UIPageNodeForm.label.showPublicationDate=\u516c\u958b\u65e5\u6642:
+UIPageNodeForm.label.startPublicationDate=\u516c\u958b\u958b\u59cb\u65e5:
+UIPageNodeForm.label.endPublicationDate=\u516c\u958b\u7d42\u4e86\u65e5:
+UIPageNodeForm.Icon.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8
UIPageNodeForm.tab.label.PageNodeSetting=\u30da\u30fc\u30b8\u30ce\u30fc\u30c9\u8a2d\u5b9a
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=\u30da\u30fc\u30b8\u9078\u629e
@@ -1306,7 +1306,7 @@
############################################################################
UIPopupWindow.Close=\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u308b
-UIPopupWindow.title.UIPageNodeForm2=\u30da\u30fc\u30b8\u30fb\u30ce\u30fc\u30c9\u306e\u8ffd\u52a0/\u7de8\u96c6
+UIPopupWindow.title.UIPageNodeForm=\u30da\u30fc\u30b8\u30fb\u30ce\u30fc\u30c9\u306e\u8ffd\u52a0/\u7de8\u96c6
UIPopupWindow.title.UINavigationManagement=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u7ba1\u7406
UIPopupWindow.title.UIPageNavigationForm=\u30da\u30fc\u30b8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30fb\u30d5\u30a9\u30fc\u30e0
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -495,25 +495,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=\u092f\u094b \u0928\u094b\u0921\u0915\u094b \u0928\u093e\u092e \u092a\u0939\u0940\u0932\u0947 \u0928\u0948 \u0909\u092a\u0932\u092c\u094d\u0927 \u091b\u0964
-UIPageNodeForm2.msg.selectPage=\u0924\u092a\u093e\u0908\u0902\u0932\u0947 \u092a\u0947\u091c \u091b\u0928\u094c\u091f \u0917\u0930\u094d\u0928\u0941 \u0906\u0935\u0936\u094d\u092f\u0915 \u091b
-UIPageNodeForm2.msg.startDateBeforeEndDate=\u0905\u0928\u094d\u0924\u093f\u092e \u092e\u093f\u0924\u0940, \u0936\u0941\u0930\u0941 \u092e\u093f\u0924\u0940 \u092d\u0928\u094d\u0926\u093e \u092a\u091b\u093e\u0921\u093f \u0939\u0941\u0928\u0941\u092a\u0930\u094d\u091b
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=\u0928\u094b\u0921\u0915\u094b \u0928\u093e\u092e:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=\u092a\u0947\u091c \u0930\u093f\u092b\u0947\u0930\u0947\u0928\u094d\u0938
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=\u092a\u0947\u091c\u0915\u094b \u0915\u093f\u0938\u093f\u092e
-UIPageNodeForm2.label.creator=\u092a\u0947\u091c\u0915\u094b \u0938\u094d\u0930\u0937\u094d\u091f\u093e
-UIPageNodeForm2.label.modifier=\u092a\u0947\u091c\u0915\u094b \u0938\u0902\u0938\u094b\u0927\u0928\u0915\u0930\u094d\u0924\u093e
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=\u0926\u0947\u0916\u093f\u092f\u094b :
-UIPageNodeForm2.label.showPublicationDate=\u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 \u0930 \u0938\u092e\u092f :
-UIPageNodeForm2.label.startPublicationDate=\u0936\u0941\u0930\u0941\u092e\u093e \u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 :
-UIPageNodeForm2.label.endPublicationDate=\u0905\u0928\u094d\u0924\u093f\u092e\u092e\u093e \u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 :
-UIPageNodeForm2.Icon.title.SetDefault=\u0921\u093f\u092b\u094c\u0932\u094d\u091f \u092a\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d
+UIPageNodeForm.msg.SameName=\u092f\u094b \u0928\u094b\u0921\u0915\u094b \u0928\u093e\u092e \u092a\u0939\u0940\u0932\u0947 \u0928\u0948 \u0909\u092a\u0932\u092c\u094d\u0927 \u091b\u0964
+UIPageNodeForm.msg.selectPage=\u0924\u092a\u093e\u0908\u0902\u0932\u0947 \u092a\u0947\u091c \u091b\u0928\u094c\u091f \u0917\u0930\u094d\u0928\u0941 \u0906\u0935\u0936\u094d\u092f\u0915 \u091b
+UIPageNodeForm.msg.startDateBeforeEndDate=\u0905\u0928\u094d\u0924\u093f\u092e \u092e\u093f\u0924\u0940, \u0936\u0941\u0930\u0941 \u092e\u093f\u0924\u0940 \u092d\u0928\u094d\u0926\u093e \u092a\u091b\u093e\u0921\u093f \u0939\u0941\u0928\u0941\u092a\u0930\u094d\u091b
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=\u0928\u094b\u0921\u0915\u094b \u0928\u093e\u092e:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=\u092a\u0947\u091c \u0930\u093f\u092b\u0947\u0930\u0947\u0928\u094d\u0938
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=\u092a\u0947\u091c\u0915\u094b \u0915\u093f\u0938\u093f\u092e
+UIPageNodeForm.label.creator=\u092a\u0947\u091c\u0915\u094b \u0938\u094d\u0930\u0937\u094d\u091f\u093e
+UIPageNodeForm.label.modifier=\u092a\u0947\u091c\u0915\u094b \u0938\u0902\u0938\u094b\u0927\u0928\u0915\u0930\u094d\u0924\u093e
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=\u0926\u0947\u0916\u093f\u092f\u094b :
+UIPageNodeForm.label.showPublicationDate=\u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 \u0930 \u0938\u092e\u092f :
+UIPageNodeForm.label.startPublicationDate=\u0936\u0941\u0930\u0941\u092e\u093e \u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 :
+UIPageNodeForm.label.endPublicationDate=\u0905\u0928\u094d\u0924\u093f\u092e\u092e\u093e \u091b\u093e\u092a\u093f\u090f\u0915\u094b \u092e\u093f\u0924\u0940 :
+UIPageNodeForm.Icon.title.SetDefault=\u0921\u093f\u092b\u094c\u0932\u094d\u091f \u092a\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d
UIPageNodeForm.tab.label.PageNodeSetting=\u092a\u0947\u091c \u0928\u094b\u0921 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=\u092a\u0947\u091c\u0915\u094b \u091b\u0928\u094c\u091f\u094d\u0915\u0930\u094d\u0924\u093e
@@ -1302,7 +1302,7 @@
############################################################################
UIPopupWindow.Close=Window \u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIPopupWindow.title.UIPageNodeForm2=\u092a\u0947\u091c \u0928\u094b\u0921 \u0925\u094d\u092a\u094d\u0928\u0947/\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u094d\u0928\u0947
+UIPopupWindow.title.UIPageNodeForm=\u092a\u0947\u091c \u0928\u094b\u0921 \u0925\u094d\u092a\u094d\u0928\u0947/\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u094d\u0928\u0947
UIPopupWindow.title.UINavigationManagement=\u0928\u094d\u092f\u093e\u092d\u093f\u0917\u0947\u0938\u0928 \u0935\u094d\u092f\u092c\u0938\u094d\u0925\u093e\u092a\u0928
UIPopupWindow.title.UIPageNavigationForm=\u092a\u0947\u091c \u0928\u094d\u092f\u093e\u092d\u093f\u0917\u0947\u0938\u0928 \u092b\u093e\u0930\u092e
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -495,25 +495,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Deze node naam bestaat reeds.
-UIPageNodeForm2.msg.selectPage=U moet een pagina selecteren.
-UIPageNodeForm2.msg.startDateBeforeEndDate=De einddatum moet na de startdatum komen.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Node naam:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Pagina referentie
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Pagina type
-UIPageNodeForm2.label.creator=Gecre\u00EBerd door
-UIPageNodeForm2.label.modifier=Wijziger
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Zichtbaar:
-UIPageNodeForm2.label.showPublicationDate=Publicatie datum & tijd:
-UIPageNodeForm2.label.startPublicationDate=Start publicatie datum:
-UIPageNodeForm2.label.endPublicationDate=Eind publicatie datum:
-UIPageNodeForm2.Icon.title.SetDefault=Standaard
+UIPageNodeForm.msg.SameName=Deze node naam bestaat reeds.
+UIPageNodeForm.msg.selectPage=U moet een pagina selecteren.
+UIPageNodeForm.msg.startDateBeforeEndDate=De einddatum moet na de startdatum komen.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Node naam:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Pagina referentie
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Pagina type
+UIPageNodeForm.label.creator=Gecre\u00EBerd door
+UIPageNodeForm.label.modifier=Wijziger
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Zichtbaar:
+UIPageNodeForm.label.showPublicationDate=Publicatie datum & tijd:
+UIPageNodeForm.label.startPublicationDate=Start publicatie datum:
+UIPageNodeForm.label.endPublicationDate=Eind publicatie datum:
+UIPageNodeForm.Icon.title.SetDefault=Standaard
UIPageNodeForm.tab.label.PageNodeSetting=Pagina node instellingen
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Pagina selecteur
@@ -1274,7 +1274,7 @@
############################################################################
UIPopupWindow.Close=Sluit venster
-UIPopupWindow.title.UIPageNodeForm2=Toevoegen/wijzigen van pagina node
+UIPopupWindow.title.UIPageNodeForm=Toevoegen/wijzigen van pagina node
UIPopupWindow.title.UINavigationManagement=Navigatie beheer
UIPopupWindow.title.UIPageNavigationForm=Pagina navigatie formulier
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -491,25 +491,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Nomde de nodo já existente.
-UIPageNodeForm2.msg.selectPage=Selecione uma página.
-UIPageNodeForm2.msg.startDateBeforeEndDate=Data final deve ser depois da data inicial.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Nome:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Página
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Tipo de Página
-UIPageNodeForm2.label.creator=Criador de Página
-UIPageNodeForm2.label.modifier=Modificador de Página
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Visível:
-UIPageNodeForm2.label.showPublicationDate=Dara e hora de publicação:
-UIPageNodeForm2.label.startPublicationDate=Começo de período de publicação:
-UIPageNodeForm2.label.endPublicationDate=Término de período de publicação:
-UIPageNodeForm2.Icon.title.SetDefault=Usar padrão
+UIPageNodeForm.msg.SameName=Nomde de nodo já existente.
+UIPageNodeForm.msg.selectPage=Selecione uma página.
+UIPageNodeForm.msg.startDateBeforeEndDate=Data final deve ser depois da data inicial.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Nome:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Página
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Tipo de Página
+UIPageNodeForm.label.creator=Criador de Página
+UIPageNodeForm.label.modifier=Modificador de Página
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Visível:
+UIPageNodeForm.label.showPublicationDate=Dara e hora de publicação:
+UIPageNodeForm.label.startPublicationDate=Começo de período de publicação:
+UIPageNodeForm.label.endPublicationDate=Término de período de publicação:
+UIPageNodeForm.Icon.title.SetDefault=Usar padrão
UIPageNodeForm.tab.label.PageNodeSetting=Configurações de Nodo
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Seletor de Página
@@ -1296,7 +1296,7 @@
############################################################################
UIPopupWindow.Close=Fechar Janela
-UIPopupWindow.title.UIPageNodeForm2=Adicionar/Editar página
+UIPopupWindow.title.UIPageNodeForm=Adicionar/Editar página
UIPopupWindow.title.UINavigationManagement=Gerenciador de Navegação
UIPopupWindow.title.UIPageNavigationForm=Formulátio de Navegação de Página
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -479,25 +479,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Узел с таким названием уже существует.
-UIPageNodeForm2.msg.selectPage=Необходимо выбрать страницу.
-UIPageNodeForm2.msg.startDateBeforeEndDate=Дата окончания должна быть после даты начала.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Название узла:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Cноска страницы
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Тип страницы
-UIPageNodeForm2.label.creator=Автор страницы
-UIPageNodeForm2.label.modifier=Редактор страницы
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Видимость:
-UIPageNodeForm2.label.showPublicationDate=Дата и продолжительность публикации:
-UIPageNodeForm2.label.startPublicationDate=Начало публикации:
-UIPageNodeForm2.label.endPublicationDate=Конец публикации:
-UIPageNodeForm2.Icon.title.SetDefault=По умолчанию
+UIPageNodeForm.msg.SameName=Узел с таким названием уже существует.
+UIPageNodeForm.msg.selectPage=Необходимо выбрать страницу.
+UIPageNodeForm.msg.startDateBeforeEndDate=Дата окончания должна быть после даты начала.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Название узла:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Cноска страницы
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Тип страницы
+UIPageNodeForm.label.creator=Автор страницы
+UIPageNodeForm.label.modifier=Редактор страницы
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Видимость:
+UIPageNodeForm.label.showPublicationDate=Дата и продолжительность публикации:
+UIPageNodeForm.label.startPublicationDate=Начало публикации:
+UIPageNodeForm.label.endPublicationDate=Конец публикации:
+UIPageNodeForm.Icon.title.SetDefault=По умолчанию
UIPageNodeForm.tab.label.PageNodeSetting=Настройки узла страницы
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Страницы
@@ -1259,7 +1259,7 @@
############################################################################
UIPopupWindow.Close=Закрыть окно
-UIPopupWindow.title.UIPageNodeForm2=Добавить/изменить узел
+UIPopupWindow.title.UIPageNodeForm=Добавить/изменить узел
UIPopupWindow.title.UINavigationManagement=Управление навигацией
UIPopupWindow.title.UIPageNavigationForm=Форма навигации страницы
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -470,25 +470,25 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.msg.SameName=Така назва вузла вже існує.
-UIPageNodeForm2.msg.selectPage=Вам потрібно вибрати сторінку.
-UIPageNodeForm2.msg.startDateBeforeEndDate=Кінцева дата має бути після початкової дати.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Назва вузла:
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Початкова сторінка
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Тип сторінки
-UIPageNodeForm2.label.creator=Розробник сторінки
-UIPageNodeForm2.label.modifier=Модифікація сторінки
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Видима:
-UIPageNodeForm2.label.showPublicationDate=Дата і час публікації:
-UIPageNodeForm2.label.startPublicationDate=Початкова дата публікації:
-UIPageNodeForm2.label.endPublicationDate=Кінцева дата публікації:
-UIPageNodeForm2.Icon.title.SetDefault=Взяти за замовчуванням
+UIPageNodeForm.msg.SameName=Така назва вузла вже існує.
+UIPageNodeForm.msg.selectPage=Вам потрібно вибрати сторінку.
+UIPageNodeForm.msg.startDateBeforeEndDate=Кінцева дата має бути після початкової дати.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Назва вузла:
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Початкова сторінка
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Тип сторінки
+UIPageNodeForm.label.creator=Розробник сторінки
+UIPageNodeForm.label.modifier=Модифікація сторінки
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Видима:
+UIPageNodeForm.label.showPublicationDate=Дата і час публікації:
+UIPageNodeForm.label.startPublicationDate=Початкова дата публікації:
+UIPageNodeForm.label.endPublicationDate=Кінцева дата публікації:
+UIPageNodeForm.Icon.title.SetDefault=Взяти за замовчуванням
UIPageNodeForm.tab.label.PageNodeSetting=Встановлення вузлової сторінки
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Селектор сторінок
@@ -1250,7 +1250,7 @@
############################################################################
UIPopupWindow.Close=Закрити вікно
-UIPopupWindow.title.UIPageNodeForm2=ДОДАТИ/РЕДАГУВАТИ ВУЗОЛ СТОРІНКИ
+UIPopupWindow.title.UIPageNodeForm=ДОДАТИ/РЕДАГУВАТИ ВУЗОЛ СТОРІНКИ
UIPopupWindow.title.UINavigationManagement=Управління навігацією
UIPopupWindow.title.UIPageNavigationForm=Форма сторінки навігації
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-05-13 10:01:06 UTC (rev 3080)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-05-13 10:04:03 UTC (rev 3081)
@@ -477,28 +477,28 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-UIPageNodeForm2.title=Thêm và chỉnh sửa node của trang.
-UIPageNodeForm2.msg.SameName=Tên của node mà bạn nhập đang tồn tại, hãy thử với tên khác!
-UIPageNodeForm2.msg.selectPage=Bạn phải chọn một trang!
-UIPageNodeForm2.msg.startDateBeforeEndDate=Thời gian kết thúc phải lớn hơn hoặc bằng thời gian hiện tại.
-UIPageNodeForm2.msg.currentDateBeforeStartDate=Thời gian bắt đầu phải sau thời gian hiện tại hoặc để trống.
-UIPageNodeForm2.msg.currentDateBeforeEndDate=Thời gian kết thúc phải sau thời gian hiện tại hoặc để trống.
-UIPageNodeForm2.action.Save=#{word.save}
-UIPageNodeForm2.action.Back=#{word.back}
-UIPageNodeForm2.action.Close=#{word.cancel}
-UIPageNodeForm2.label.name=Tên node :
-UIPageNodeForm2.label.uri=#{word.uri}:
-UIPageNodeForm2.label.pageReference=Trang liên quan
-UIPageNodeForm2.label.description=#{word.description}
-UIPageNodeForm2.label.type=Kiểu trang
-UIPageNodeForm2.label.creator=Người khởi tạo trang
-UIPageNodeForm2.label.modifier=Người chỉnh sửa trang
-UIPageNodeForm2.label.label=#{word.label}:
-UIPageNodeForm2.label.visible=Hiển thị:
-UIPageNodeForm2.label.showPublicationDate=Thời gian hiển thị
-UIPageNodeForm2.label.startPublicationDate=Thời gian bắt đầu
-UIPageNodeForm2.label.endPublicationDate=Thời gian kết thúc
-UIPageNodeForm2.Icon.title.SetDefault=Lấy mặc định
+UIPageNodeForm.title=Thêm và chỉnh sửa node của trang.
+UIPageNodeForm.msg.SameName=Tên của node mà bạn nhập đang tồn tại, hãy thử với tên khác!
+UIPageNodeForm.msg.selectPage=Bạn phải chọn một trang!
+UIPageNodeForm.msg.startDateBeforeEndDate=Thời gian kết thúc phải lớn hơn hoặc bằng thời gian hiện tại.
+UIPageNodeForm.msg.currentDateBeforeStartDate=Thời gian bắt đầu phải sau thời gian hiện tại hoặc để trống.
+UIPageNodeForm.msg.currentDateBeforeEndDate=Thời gian kết thúc phải sau thời gian hiện tại hoặc để trống.
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
+UIPageNodeForm.action.Close=#{word.cancel}
+UIPageNodeForm.label.name=Tên node :
+UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.pageReference=Trang liên quan
+UIPageNodeForm.label.description=#{word.description}
+UIPageNodeForm.label.type=Kiểu trang
+UIPageNodeForm.label.creator=Người khởi tạo trang
+UIPageNodeForm.label.modifier=Người chỉnh sửa trang
+UIPageNodeForm.label.label=#{word.label}:
+UIPageNodeForm.label.visible=Hiển thị:
+UIPageNodeForm.label.showPublicationDate=Thời gian hiển thị
+UIPageNodeForm.label.startPublicationDate=Thời gian bắt đầu
+UIPageNodeForm.label.endPublicationDate=Thời gian kết thúc
+UIPageNodeForm.Icon.title.SetDefault=Lấy mặc định
UIPageNodeForm.tab.label.PageNodeSetting=Cấu hình node
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Tùy chọn trang
@@ -1268,7 +1268,7 @@
############################################################################
UIPopupWindow.Close=Đóng cửa sổ
-UIPopupWindow.title.UIPageNodeForm2=THÊM/SỬA PAGE NODE
+UIPopupWindow.title.UIPageNodeForm=THÊM/SỬA PAGE NODE
UIPopupWindow.title.UINavigationManagement=Quản lý Navigation
UIPopupWindow.title.UIPageNavigationForm=Page Navigation Form
14 years, 7 months
- 1
- 0
gatein SVN: r3080 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-13 06:01:06 -0400 (Thu, 13 May 2010)
New Revision: 3080
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
Log:
GTNPORTAL-1200: Have problem when add sub-node in portal navigation
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 2010-05-13 09:57:54 UTC (rev 3079)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-05-13 10:01:06 UTC (rev 3080)
@@ -28,6 +28,7 @@
import org.exoplatform.portal.config.UserPortalConfig;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
+import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
import org.exoplatform.portal.webui.navigation.UINavigationManagement;
@@ -384,6 +385,12 @@
selector.setEdittedNavigation(uiPageNodeForm.getContextPageNavigation());
selector.initTreeData();
+ if (uiPageNodeForm.getSelectedParent() instanceof PageNode)
+ {
+ PageNode selectedParent = (PageNode)uiPageNodeForm.getSelectedParent();
+ selector.selectPageNodeByUri(selectedParent.getUri());
+ }
+
uiNavigationPopup.setUIComponent(navigationManager);
uiNavigationPopup.setWindowSize(400, 400);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-05-13 09:57:54 UTC (rev 3079)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-05-13 10:01:06 UTC (rev 3080)
@@ -28,6 +28,7 @@
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
+import org.exoplatform.portal.webui.navigation.ParentChildPair;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -72,6 +73,14 @@
private Object selectedParent;
+ /**
+ * Wrapper of editted PageNode and its parent
+ */
+ private ParentChildPair contextParentChildPair;
+
+ /**
+ * PageNavigation to which editted PageNode belongs
+ */
private PageNavigation contextPageNavigation;
final private static String SHOW_PUBLICATION_DATE = "showPublicationDate";
@@ -197,6 +206,16 @@
this.selectedParent = obj;
}
+ public void setContextParentChildPair(ParentChildPair _contextParentChildPair)
+ {
+ this.contextParentChildPair = _contextParentChildPair;
+ }
+
+ public ParentChildPair getContextParentChildPair()
+ {
+ return this.contextParentChildPair;
+ }
+
public void processRender(WebuiRequestContext context) throws Exception
{
super.processRender(context);
14 years, 7 months
- 1
- 0
gatein SVN: r3079 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-13 05:57:54 -0400 (Thu, 13 May 2010)
New Revision: 3079
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/ParentChildPair.java
Log:
Correct typos in type comment of ParentChildPair.java
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/ParentChildPair.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/ParentChildPair.java 2010-05-13 09:51:16 UTC (rev 3078)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/ParentChildPair.java 2010-05-13 09:57:54 UTC (rev 3079)
@@ -21,7 +21,7 @@
import org.exoplatform.portal.config.model.PageNode;
/**
- * This class wrappes a pair of PageNode and ist parent.
+ * This class wrappes a pair of PageNode and its parent.
*
* @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
* @version $Id$
14 years, 7 months
- 1
- 0
gatein SVN: r3078 - portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-05-13 05:51:16 -0400 (Thu, 13 May 2010)
New Revision: 3078
Modified:
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
Log:
GTNPORTAL-1203 Invalidating a template does not work
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-05-13 08:45:57 UTC (rev 3077)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-05-13 09:51:16 UTC (rev 3078)
@@ -164,8 +164,8 @@
final public void invalidateTemplate(String name, ResourceResolver resolver) throws Exception
{
- String resourceId = resolver.createResourceId(name);
- getTemplatesCache().remove(resourceId);
+ ResourceKey resourceKey = resolver.createResourceKey(name);
+ getTemplatesCache().remove(resourceKey);
}
public ExoCache<ResourceKey, GroovyTemplate> getTemplatesCache()
@@ -202,7 +202,7 @@
{
TemplateStatistic app = statisticService.apps.get(name);
ResourceResolver resolver = app.getResolver();
- templatesCache_.remove(resolver.createResourceId(name));
+ templatesCache_.remove(resolver.createResourceKey(name));
}
catch (Exception e)
{
14 years, 7 months
- 1
- 0