gatein SVN: r5644 - in portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui: workspace and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-12-24 06:14:01 -0500 (Fri, 24 Dec 2010)
New Revision: 5644
Modified:
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
GTNPORTAL-1719 UIComponent emitting UI event should be retreived via Event<> object
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-12-24 10:01:14 UTC (rev 5643)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-12-24 11:14:01 UTC (rev 5644)
@@ -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/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-24 10:01:14 UTC (rev 5643)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-24 11:14:01 UTC (rev 5644)
@@ -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);
@@ -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);
14 years
gatein SVN: r5643 - portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-12-24 05:01:14 -0500 (Fri, 24 Dec 2010)
New Revision: 5643
Modified:
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
Log:
GTNPORTAL-1658 Add gadget window in the dashboard can't be closed or moved
Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-12-24 09:22:56 UTC (rev 5642)
+++ portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-12-24 10:01:14 UTC (rev 5643)
@@ -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/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-12-24 09:22:56 UTC (rev 5642)
+++ portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-12-24 10:01:14 UTC (rev 5643)
@@ -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();
14 years
gatein SVN: r5642 - portal/branches/branch-GTNPORTAL-1731/component/web/server/src/main/java/org/exoplatform/web/handler.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-12-24 04:22:56 -0500 (Fri, 24 Dec 2010)
New Revision: 5642
Modified:
portal/branches/branch-GTNPORTAL-1731/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java
Log:
GTNPORTAL-1660 Download file name in chrome browser always be download.* or command.*
Modified: portal/branches/branch-GTNPORTAL-1731/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2010-12-24 08:06:27 UTC (rev 5641)
+++ portal/branches/branch-GTNPORTAL-1731/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2010-12-24 09:22:56 UTC (rev 5642)
@@ -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
+}
14 years
gatein SVN: r5641 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-24 03:06:27 -0500 (Fri, 24 Dec 2010)
New Revision: 5641
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
Log:
TESTVN-2247 - Daily tests on GateIn - Clean and improve scripts
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2010-12-24 06:44:05 UTC (rev 5640)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2010-12-24 08:06:27 UTC (rev 5641)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2010-12-24 06:44:05 UTC (rev 5640)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2010-12-24 08:06:27 UTC (rev 5641)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2010-12-24 06:44:05 UTC (rev 5640)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2010-12-24 08:06:27 UTC (rev 5641)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
14 years
gatein SVN: r5640 - exo/portal/branches/3.1.x/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-24 01:44:05 -0500 (Fri, 24 Dec 2010)
New Revision: 5640
Removed:
exo/portal/branches/3.1.x/testsuite/eXo_FunctionTest_GateIn_v3.1.x_TechTests_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Deleted: exo/portal/branches/3.1.x/testsuite/eXo_FunctionTest_GateIn_v3.1.x_TechTests_TestDefinition.ods
===================================================================
(Binary files differ)
14 years
gatein SVN: r5639 - portal/trunk/testsuite/testdefinitions.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-23 23:29:54 -0500 (Thu, 23 Dec 2010)
New Revision: 5639
Modified:
portal/trunk/testsuite/testdefinitions/eXo_RegressTest_GateIn_3.2.x_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Modified: portal/trunk/testsuite/testdefinitions/eXo_RegressTest_GateIn_3.2.x_TestDefinition.ods
===================================================================
(Binary files differ)
14 years
gatein SVN: r5638 - portal/trunk/testsuite/testdefinitions.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-23 23:23:07 -0500 (Thu, 23 Dec 2010)
New Revision: 5638
Modified:
portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
14 years
gatein SVN: r5637 - exo/portal/branches/3.1.x/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-23 06:37:27 -0500 (Thu, 23 Dec 2010)
New Revision: 5637
Modified:
exo/portal/branches/3.1.x/testsuite/eXo_FunctionTest_GateIn_v3.1.x_BasicPortlets_TestDefinition.ods
exo/portal/branches/3.1.x/testsuite/eXo_RegressTest_GateIn_3.1.x_TestDefinition.ods
exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Modified: exo/portal/branches/3.1.x/testsuite/eXo_FunctionTest_GateIn_v3.1.x_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: exo/portal/branches/3.1.x/testsuite/eXo_RegressTest_GateIn_3.1.x_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods
===================================================================
(Binary files differ)
14 years
gatein SVN: r5636 - portal/trunk/testsuite/testdefinitions.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-23 04:05:46 -0500 (Thu, 23 Dec 2010)
New Revision: 5636
Modified:
portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods
===================================================================
(Binary files differ)
14 years
gatein SVN: r5635 - portal/trunk/testsuite/testdefinitions.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-23 03:05:42 -0500 (Thu, 23 Dec 2010)
New Revision: 5635
Modified:
portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_MainFunctions_TestDefinition.ods
portal/trunk/testsuite/testdefinitions/eXo_RegressTest_GateIn_3.2.x_TestDefinition.ods
portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.2.x_TestDefinition.ods
Log:
TESTVN-2271 - Update Referential Normalization for GateIn base on PLF 3.0.2 feedback
Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_MainFunctions_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/testdefinitions/eXo_RegressTest_GateIn_3.2.x_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.2.x_TestDefinition.ods
===================================================================
(Binary files differ)
14 years