gatein SVN: r5875 - components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/unit.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-02-14 04:55:55 -0500 (Mon, 14 Feb 2011)
New Revision: 5875
Modified:
components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java
Log:
typo minor
Modified: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java
===================================================================
--- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java 2011-02-14 08:48:27 UTC (rev 5874)
+++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java 2011-02-14 09:55:55 UTC (rev 5875)
@@ -1493,7 +1493,7 @@
API286_MIME_RESPONSE_1(new API(MimeResponse.class), "CACHE_SCOPE"),
API286_MIME_RESPONSE_2(new API(MimeResponse.class), "ETAG"),
- API286_MIME_RESPONSE_3(new API(MimeResponse.class), "EXPIRIATION_CACHE"),
+ API286_MIME_RESPONSE_3(new API(MimeResponse.class), "EXPIRATION_CACHE"),
API286_MIME_RESPONSE_4(new API(MimeResponse.class), "MARKUP_HEAD_ELEMENT"),
API286_MIME_RESPONSE_5(new API(MimeResponse.class), "NAMESPACED_RESPONSE"),
API286_MIME_RESPONSE_6(new API(MimeResponse.class), "PRIVATE_SCOPE"),
13 years, 10 months
gatein SVN: r5874 - portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-02-14 03:48:27 -0500 (Mon, 14 Feb 2011)
New Revision: 5874
Modified:
portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1747 Labels of portlets in Edit Inline Composer are localized after switch of view mode
Modified: portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2011-02-14 06:40:35 UTC (rev 5873)
+++ portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2011-02-14 08:48:27 UTC (rev 5874)
@@ -303,6 +303,10 @@
markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
}
}
+ else
+ {
+ uicomponent.setConfiguredTitle(null);
+ }
}
}
catch (Exception e)
13 years, 10 months
gatein SVN: r5873 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2011-02-14 01:40:35 -0500 (Mon, 14 Feb 2011)
New Revision: 5873
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_06_CreateNewAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_07_UsersManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_09_GroupManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_11_MembershipManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_21_CreateNewPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_22_DeletePortal.html
Log:
TESTVN-2484 - Daily tests on GateIn - Clean and improve scripts
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_06_CreateNewAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_06_CreateNewAccount.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_06_CreateNewAccount.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -302,6 +302,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_06</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_06</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_07_UsersManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_07_UsersManagement.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_07_UsersManagement.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -302,6 +302,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_07</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_07</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -311,7 +321,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_09_GroupManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_09_GroupManagement.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_09_GroupManagement.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -187,6 +187,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_09</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_09</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -196,7 +206,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_11_MembershipManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_11_MembershipManagement.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_11_MembershipManagement.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -182,6 +182,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_11</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_11</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -191,7 +201,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_21_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_21_CreateNewPortal.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_21_CreateNewPortal.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -272,6 +272,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_21</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_21</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -281,7 +291,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_22_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_22_DeletePortal.html 2011-02-14 04:52:06 UTC (rev 5872)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_22_DeletePortal.html 2011-02-14 06:40:35 UTC (rev 5873)
@@ -247,6 +247,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_SNF_PRL_22</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>Test_SNF_PRL_22</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -256,7 +266,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
13 years, 10 months
gatein SVN: r5872 - portal/branches/branch-GTNPORTAL-1790/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-02-13 23:52:06 -0500 (Sun, 13 Feb 2011)
New Revision: 5872
Modified:
portal/branches/branch-GTNPORTAL-1790/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css
Log:
GTNPORTAL-1401 Error UI in Page Editor composer when resize on IE7
Modified: portal/branches/branch-GTNPORTAL-1790/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-02-14 03:51:18 UTC (rev 5871)
+++ portal/branches/branch-GTNPORTAL-1790/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-02-14 04:52:06 UTC (rev 5872)
@@ -124,18 +124,32 @@
padding: 0px 4px;
}
-.UIAction .SimpleStyle1 .ButtonMiddle .PageProfileIcon {
- background: transparent url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */
- background: transparent url(background/PageProfileIcon.gif) no-repeat right; /* orientation=rt */
- line-height: 20px;
- padding-left: 22px; /* orientation=lt */
- padding-right: 22px; /* orientation=rt */
-}
-
-.UIAction .SimpleStyle1 .ButtonMiddle .ViewAsBlockIcon {
- background: transparent url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */
- background: transparent url(background/ViewAsBlockIcon.gif) no-repeat right; /* orientation=rt */
- line-height: 20px;
- padding-left: 22px; /* orientation=lt */
- padding-right: 22px; /* orientation=rt */
+.UIAction .SimpleStyle1 .ButtonMiddle .PageProfileIcon {
+ background: transparent url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */
+ background: transparent url(background/PageProfileIcon.gif) no-repeat right; /* orientation=rt */
+ line-height: 20px;
+ padding-left: 22px; /* orientation=lt */
+ padding-right: 22px; /* orientation=rt */
+ white-space: nowrap;
}
+
+.UIAction .SimpleStyle1 .ButtonMiddle .ViewAsBlockIcon {
+ background: transparent url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */
+ background: transparent url(background/ViewAsBlockIcon.gif) no-repeat right; /* orientation=rt */
+ line-height: 20px;
+ padding-left: 22px; /* orientation=lt */
+ padding-right: 22px; /* orientation=rt */
+ white-space: nowrap;
+}
+
+.UIAction .portlet-form-button {
+ -moz-border-radius: 0px;
+ background: none;
+ border: none;
+ display: block;
+ line-height: auto;
+ margin: 0px 3px;
+ padding: 0px;
+ text-align: center;
+ white-space: nowrap;
+}
13 years, 10 months
gatein SVN: r5871 - portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-02-13 22:51:18 -0500 (Sun, 13 Feb 2011)
New Revision: 5871
Modified:
portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-1757 NPE when click link to request a new password for the username in mail after delete user
Modified: portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-02-12 04:43:14 UTC (rev 5870)
+++ portal/branches/branch-GTNPORTAL-1790/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-02-14 03:51:18 UTC (rev 5871)
@@ -419,23 +419,29 @@
RemindPasswordTokenService tokenService = uiPortal.getApplicationComponent(RemindPasswordTokenService.class);
String tokenId = event.getRequestContext().getRequestParameter("tokenId");
+ WebuiRequestContext requestContext = event.getRequestContext();
GateInToken token = tokenService.getToken(tokenId);
if (token == null)
{
- WebuiRequestContext requestContext = event.getRequestContext();
requestContext.getUIApplication()
.addMessage(new ApplicationMessage("UIForgetPassword.msg.expration", null));
requestContext.addUIComponentToUpdateByAjax(uiPortal.getParent());
return;
}
- UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
- UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
-
OrganizationService orgSrc = uiPortal.getApplicationComponent(OrganizationService.class);
// get user
User user = orgSrc.getUserHandler().findUserByName(token.getPayload().getUsername());
+ if (user == null)
+ {
+ requestContext.getUIApplication()
+ .addMessage(new ApplicationMessage("UIForgetPassword.msg.user-delete", null));
+ return;
+ }
+ UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
+ UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
+
UIResetPassword uiReset = uiMaskWS.createUIComponent(UIResetPassword.class, null, null);
uiReset.setUser(user);
uiReset.setTokenId(tokenId);
13 years, 10 months
gatein SVN: r5870 - portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-02-11 23:43:14 -0500 (Fri, 11 Feb 2011)
New Revision: 5870
Modified:
portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java
portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
Log:
GTNPORTAL-1798 Some portlets are duplicated in category after add an application
Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2011-02-11 11:33:14 UTC (rev 5869)
+++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2011-02-12 04:43:14 UTC (rev 5870)
@@ -265,23 +265,24 @@
return;
}
- UIFormRadioBoxInput uiRadio = uiForm.getUIInput("application");
- String displayName = uiForm.getUIStringInput(FIELD_NAME).getValue();
if (uiForm.getApplications().size() == 0)
{
ctx.getUIApplication().addMessage(new ApplicationMessage("UIAddApplicationForm.msg.appNotExists", null));
ctx.addUIComponentToUpdateByAjax(uiOrganizer);
return;
}
+ UIFormRadioBoxInput uiRadio = uiForm.getUIInput("application");
+ String displayName = uiForm.getUIStringInput(FIELD_NAME).getValue();
Application tmp = uiForm.getApplications().get(Integer.parseInt(uiRadio.getValue()));
-
+
// check portet name is exist
- if (appRegService.getApplication(selectedCate.getName(), tmp.getApplicationName()) != null)
+ for (Application application : appRegService.getApplications(selectedCate))
{
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- UIApplication uiApp = context.getUIApplication();
- uiApp.addMessage(new ApplicationMessage("UIAddApplicationForm.msg.PortletExist", null));
- return;
+ if (application.getContentId().equals(tmp.getContentId()))
+ {
+ ctx.getUIApplication().addMessage(new ApplicationMessage("UIAddApplicationForm.msg.PortletExist", null));
+ return;
+ }
}
Application app = cloneApplication(tmp);
Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2011-02-11 11:33:14 UTC (rev 5869)
+++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2011-02-12 04:43:14 UTC (rev 5870)
@@ -93,9 +93,12 @@
for (ApplicationCategory category : allCategories)
{
- if (appRegService.getApplication(category.getName(), portlet_.getName()) != null)
+ for (Application application : appRegService.getApplications(category))
{
- nameList.add(category.getDisplayName());
+ if (application.getContentId().equals(portlet_.getId()))
+ {
+ nameList.add(category.getDisplayName());
+ }
}
}
StringBuffer names = new StringBuffer("");
13 years, 10 months
gatein SVN: r5869 - portal/branches/branch-GTNPORTAL-1790/component/application-registry/src/main/java/org/exoplatform/application/registry/impl.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-02-11 06:33:14 -0500 (Fri, 11 Feb 2011)
New Revision: 5869
Modified:
portal/branches/branch-GTNPORTAL-1790/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
Log:
GTNPORTAL-1781 Some portlet are duplicated after imported applications
Modified: portal/branches/branch-GTNPORTAL-1790/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2011-02-10 09:49:40 UTC (rev 5868)
+++ portal/branches/branch-GTNPORTAL-1790/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2011-02-11 11:33:14 UTC (rev 5869)
@@ -524,11 +524,25 @@
contentId = info.getApplicationName() + "/" + info.getName();
}
- //
- app = category.createContent(portletName, contentType, contentId);
- app.setDisplayName(displayName);
- app.setDescription(getLocalizedStringValue(descriptionLS, portletName));
- app.setAccessPermissions(permissions);
+ // Check if the portlet has already existed in this category
+ List<Application> applications = load(category).getApplications();
+ boolean isExist = false;
+ for (Application application : applications)
+ {
+ if (application.getContentId().equals(contentId))
+ {
+ isExist = true;
+ break;
+ }
+ }
+
+ if (!isExist)
+ {
+ app = category.createContent(portletName, contentType, contentId);
+ app.setDisplayName(displayName);
+ app.setDescription(getLocalizedStringValue(descriptionLS, portletName));
+ app.setAccessPermissions(permissions);
+ }
}
}
}
13 years, 10 months
gatein SVN: r5868 - epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: mputz
Date: 2011-02-10 04:49:40 -0500 (Thu, 10 Feb 2011)
New Revision: 5868
Modified:
epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
JBEPP-795: Patch for GTNPORTAL-1753: The header will be duplicated if contains a portlet adding more one resource to header
Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-02-10 08:39:41 UTC (rev 5867)
+++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-02-10 09:49:40 UTC (rev 5868)
@@ -429,9 +429,9 @@
List<String> markupHeaders = new ArrayList<String>();
if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty())
{
- StringWriter sw = new StringWriter();
for (Element element : extraMarkupHeaders)
{
+ StringWriter sw = new StringWriter();
DOMSerializer.serialize(element, sw);
markupHeaders.add(sw.toString());
}
13 years, 10 months
gatein SVN: r5867 - portal/branches/branch-GTNPORTAL-1790/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-02-10 03:39:41 -0500 (Thu, 10 Feb 2011)
New Revision: 5867
Modified:
portal/branches/branch-GTNPORTAL-1790/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-1434 Don't show name of Save button when move cursor on it when change URL in edit mode of logo portlet
Modified: portal/branches/branch-GTNPORTAL-1790/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultStylesheet.css
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultStylesheet.css 2011-02-10 08:29:12 UTC (rev 5866)
+++ portal/branches/branch-GTNPORTAL-1790/portlet/web/src/main/webapp/skin/portal/webui/component/UILogoPortlet/DefaultStylesheet.css 2011-02-10 08:39:41 UTC (rev 5867)
@@ -75,7 +75,7 @@
}
.UILogoPortlet a:hover {
- color: #e7e7e7;
+ color: #058ee6;
}
.UILogoPortlet .Name {
13 years, 10 months
gatein SVN: r5866 - portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-02-10 03:29:12 -0500 (Thu, 10 Feb 2011)
New Revision: 5866
Modified:
portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-1735 Error UI when click the link to add into category in Application Registry
Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-02-10 08:02:14 UTC (rev 5865)
+++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-02-10 08:29:12 UTC (rev 5866)
@@ -483,7 +483,7 @@
/******************************** UIGadgetManagement ******************************/
.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons {
- width: 150px; height: 120px;
+ width: 150px;
padding-top: 20px; text-align: center;
}
13 years, 10 months