[gatein-commits] gatein SVN: r3220 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jun 1 04:11:08 EDT 2010
Author: kien_nguyen
Date: 2010-06-01 04:11:07 -0400 (Tue, 01 Jun 2010)
New Revision: 3220
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
Log:
GTNPORTAL-1264 Change alert message when Start greater than End Publication Date (create page)-fix missing when refactor *2.java
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html 2010-06-01 08:11:07 UTC (rev 3220)
@@ -243,12 +243,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm2']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td>
+ <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm2']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td>
+ <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td>
<td>POR_14_01_044-node</td>
</tr>
<tr>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-06-01 08:11:07 UTC (rev 3220)
@@ -855,7 +855,7 @@
# org.exoplatform.portal.component.customization.UIPageNodeForm#
#############################################################################
-->
- <UIPageNodeForm2>
+ <UIPageNodeForm>
<title>إضافة / تحرير عقدة الصفحة</title>
<msg>
<SameName>!هذه العقدة في القائمة ، من فضلك ادخل واحدة آخرى</SameName>
@@ -886,7 +886,7 @@
<SetDefault>احصل على الافتراضي</SetDefault>
</title>
</Icon>
- </UIPageNodeForm2>
+ </UIPageNodeForm>
<UIPageNodeForm>
<tab>
@@ -2205,7 +2205,7 @@
<UIPopupWindow>
<Close>Close Window</Close>
<title>
- <UIPageNodeForm2>ADD/EDIT PAGE NODE</UIPageNodeForm2>
+ <UIPageNodeForm>ADD/EDIT PAGE NODE</UIPageNodeForm>
<UINavigationManagement>Navigation Management</UINavigationManagement>
<UIPageNavigationForm>Page Navigation Form</UIPageNavigationForm>
</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-06-01 08:11:07 UTC (rev 3220)
@@ -782,7 +782,7 @@
<GroupSelector>그룹 선택</GroupSelector>
</title>
</UIPopupGroupSelector>
- <UIPageNodeForm2>
+ <UIPageNodeForm>
<msg>
<SameName>노드 이름이 이미 존재합니다.</SameName>
<selectPage>페이지를 선택하셔야 합니다.</selectPage>
@@ -812,7 +812,7 @@
<SetDefault>기본값</SetDefault>
</title>
</Icon>
- </UIPageNodeForm2>
+ </UIPageNodeForm>
<UIPageNodeForm>
<tab>
<label>
@@ -1922,7 +1922,7 @@
<UIPopupWindow>
<Close>창 닫기</Close>
<title>
- <UIPageNodeForm2>페이지 노드 추가/편집</UIPageNodeForm2>
+ <UIPageNodeForm>페이지 노드 추가/편집</UIPageNodeForm>
<UINavigationManagement>내비게이션 관리</UINavigationManagement>
<UIPageNavigationForm>페이지 내비게이션 폼</UIPageNavigationForm>
</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-06-01 08:11:07 UTC (rev 3220)
@@ -738,7 +738,7 @@
<GroupSelector>选择组</GroupSelector>
</title>
</UIPopupGroupSelector>
- <UIPageNodeForm2>
+ <UIPageNodeForm>
<msg>
<SameName>该节点名已经存在。</SameName>
<selectPage>您必须选择一个页面。</selectPage>
@@ -768,7 +768,7 @@
<SetDefault>获取默认设置</SetDefault>
</title>
</Icon>
- </UIPageNodeForm2>
+ </UIPageNodeForm>
<UIPageNodeForm>
<tab>
<label>
@@ -1832,7 +1832,7 @@
<UIPopupWindow>
<Close>关闭窗口</Close>
<title>
- <UIPageNodeForm2>增加/编辑页面节点</UIPageNodeForm2>
+ <UIPageNodeForm>增加/编辑页面节点</UIPageNodeForm>
<UINavigationManagement>导航管理</UINavigationManagement>
<UIPageNavigationForm>页面导航表</UIPageNavigationForm>
</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-06-01 08:11:07 UTC (rev 3220)
@@ -883,7 +883,7 @@
<GroupSelector>選擇群組</GroupSelector>
</title>
</UIPopupGroupSelector>
- <UIPageNodeForm2>
+ <UIPageNodeForm>
<msg>
<SameName>該節點名已經存在。</SameName>
<selectPage>您必須選擇一個頁面。</selectPage>
@@ -913,7 +913,7 @@
<SetDefault>設定預設設定</SetDefault>
</title>
</Icon>
- </UIPageNodeForm2>
+ </UIPageNodeForm>
<UIPageNodeForm>
<tab>
<label>
@@ -2006,7 +2006,7 @@
<UIPopupWindow>
<Close>關閉窗口</Close>
<title>
- <UIPageNodeForm2>增加/編輯頁面節點</UIPageNodeForm2>
+ <UIPageNodeForm>增加/編輯頁面節點</UIPageNodeForm>
<UINavigationManagement>導覽器管理</UINavigationManagement>
<UIPageNavigationForm>頁面導覽器表</UIPageNavigationForm>
</title>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-06-01 08:11:07 UTC (rev 3220)
@@ -242,7 +242,7 @@
if (currentDate.after(startDate))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
uiWizard.viewStep(FIRST_STEP);
return;
}
@@ -250,7 +250,7 @@
else if ((endCalendar != null) && (startCalendar != null) && (startDate.after(endDate)))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
uiWizard.viewStep(FIRST_STEP);
return;
}
@@ -258,7 +258,7 @@
else if((endCalendar != null) && (currentDate.after(endDate)))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
uiWizard.viewStep(FIRST_STEP);
return;
}
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-06-01 07:25:41 UTC (rev 3219)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-06-01 08:11:07 UTC (rev 3220)
@@ -273,21 +273,21 @@
if (currentDate.after(startDate))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
return;
}
// Case 2: start date after end date
else if ((endCalendar != null) && (startCalendar != null) && (startDate.after(endDate)))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
return;
}
// Case 3: start date is null and current date after end date
else if((endCalendar != null) && (currentDate.after(endDate)))
{
Object[] args = {};
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
return;
}
@@ -319,7 +319,7 @@
{
if (PageNavigationUtils.searchPageNodeByUri(pageNav, pageNode.getUri()) != null)
{
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.SameName", null));
return;
}
pageNav.addNode(pageNode);
@@ -339,7 +339,7 @@
{
if (PageNavigationUtils.searchPageNodeByUri(parentNode, pageNode.getUri()) != null)
{
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm.msg.SameName", null));
return;
}
children.add(pageNode);
More information about the gatein-commits
mailing list