gatein SVN: r2603 - in components/mop/trunk: api/src/main/java/org/gatein/mop/api/workspace and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-13 09:08:58 -0400 (Tue, 13 Apr 2010)
New Revision: 2603
Modified:
components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java
components/mop/trunk/pom.xml
Log:
GTNMOP-21: Navigation node renaming
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -42,6 +42,13 @@
String getName();
/**
+ * Update the navigation name.
+ *
+ * @param name the new navigation name
+ */
+ void setName(String name);
+
+ /**
* Extends the object type to navigation.
*
* @return the object type
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -54,7 +54,7 @@
public NavigationImpl addNavigation(String name)
{
NavigationImpl page = createNavigation();
- page.setName(name);
+ page.setNodeName(name);
getNavigationList().add(page);
return page;
}
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -34,6 +34,7 @@
import org.gatein.mop.api.workspace.link.PageLink;
import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -80,12 +81,25 @@
public abstract void setTemplatized(TemplatizedImpl templatized);
+ public String getName()
+ {
+ return getNodeName();
+ }
+
+ public void setName(String name)
+ {
+ // todo: change to setNodeName when it is fixed
+ NavigationContainer parent = getParentContainer();
+ Map<String, NavigationImpl> map = parent.getNavigationMap();
+ map.put(name, this);
+ }
+
public ObjectType<? extends Navigation> getObjectType()
{
return ObjectType.NAVIGATION;
}
- public Navigation getParent()
+ public NavigationImpl getParent()
{
NavigationContainer parent = getParentContainer();
if (parent != null)
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -40,6 +40,11 @@
public abstract ObjectType<? extends UIComponent> getObjectType();
+ public String getName()
+ {
+ return getNodeName();
+ }
+
public final UIContainerImpl getParent()
{
return getParentContainer();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -108,7 +108,7 @@
{
throw new UnsupportedOperationException();
}
- child.setName(name);
+ child.setNodeName(name);
List<UIComponentImpl> children = getComponentList();
children.add(index, child);
return componentType.cast(child);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -39,9 +39,9 @@
public ModelImpl model;
@Name
- public abstract String getName();
+ public abstract String getNodeName();
- public abstract void setName(String name);
+ public abstract void setNodeName(String name);
@Id
public abstract String getObjectId();
@@ -67,7 +67,7 @@
ObjectType<?> objectType = getObjectType();
Class<? extends WorkspaceObject> javaType = objectType.getJavaType();
String typeName = javaType.getSimpleName();
- String name = getName();
+ String name = getNodeName();
String id = getObjectId();
return typeName + "[name=" + name + ",id=" + id + "]";
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java 2010-04-13 13:08:58 UTC (rev 2603)
@@ -46,4 +46,15 @@
assertSame(n2, ns.get(1));
assertSame(n3, ns.get(2));
}
+
+ public void testSetName()
+ {
+ ModelImpl model = pomService.getModel();
+ Site portal = model.getWorkspace().addSite(ObjectType.PORTAL_SITE, "portal_for_navigation");
+ Navigation root = portal.getRootNavigation();
+ Navigation n1 = root.addChild("1");
+ assertEquals("1", n1.getName());
+ n1.setName("2");
+ assertEquals("2", n1.getName());
+ }
}
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-13 11:44:36 UTC (rev 2602)
+++ components/mop/trunk/pom.xml 2010-04-13 13:08:58 UTC (rev 2603)
@@ -140,7 +140,7 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
- <org.chromattic.version>1.0.1-cr1</org.chromattic.version>
+ <org.chromattic.version>1.0.1-cr2</org.chromattic.version>
</properties>
14 years, 2 months
gatein SVN: r2602 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-13 07:44:36 -0400 (Tue, 13 Apr 2010)
New Revision: 2602
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_028_CreateNewPortalPageWithNameIsTheSameWithExistingGroupPage.html
Log:
UI Tests: Test POR_20_028 has duplicated visit of Page Management
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_028_CreateNewPortalPageWithNameIsTheSameWithExistingGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_028_CreateNewPortalPageWithNameIsTheSameWithExistingGroupPage.html 2010-04-13 11:09:15 UTC (rev 2601)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_028_CreateNewPortalPageWithNameIsTheSameWithExistingGroupPage.html 2010-04-13 11:44:36 UTC (rev 2602)
@@ -68,16 +68,6 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Page Management</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Page Management</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
14 years, 2 months
gatein SVN: r2601 - portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-13 07:09:15 -0400 (Tue, 13 Apr 2010)
New Revision: 2601
Modified:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
Log:
GTNPORTAL-1007: Update test case on node name immutability
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-04-13 08:01:36 UTC (rev 2600)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-04-13 11:09:15 UTC (rev 2601)
@@ -30,6 +30,7 @@
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageBody;
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.pom.config.POMDataStorage;
import org.exoplatform.portal.pom.config.POMSession;
@@ -704,6 +705,71 @@
}.execute(null);
}
+ public void testNodeNameImmutability()
+ {
+ new UnitTest()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ String ownerType = "group";
+ String ownerId = "/platform/administrators";
+ String formerName = "testtest";
+ String updatedName = "updatedupdated";
+
+ PageNavigation pageNav = new PageNavigation();
+ pageNav.setOwnerType(ownerType);
+ pageNav.setOwnerId(ownerId);
+
+ storage_.remove(pageNav);
+ storage_.create(pageNav);
+
+ pageNav = storage_.getPageNavigation(ownerType, ownerId);
+ assertNotNull("Could not create navigation!", pageNav);
+ PageNode pageNode = new PageNode();
+ pageNode.setName(formerName);
+ pageNode.setUri(formerName + "_uri");
+ pageNode.setLabel(formerName + "_label");
+ pageNav.addNode(pageNode);
+
+ storage_.save(pageNav);
+
+ pageNav = storage_.getPageNavigation(ownerType, ownerId);
+ pageNode = pageNav.getNode(formerName);
+ //Check if the node with name containing '_' has been created
+ assertNotNull("Could not create page node!", pageNode);
+ assertEquals(formerName, pageNode.getName());
+ assertEquals(formerName + "_uri", pageNode.getUri());
+ assertEquals(formerName + "_label", pageNode.getLabel());
+
+ pageNode.setName(updatedName);
+ pageNode.setUri(updatedName + "_uri");
+ pageNode.setLabel(updatedName + "_label");
+
+ storage_.save(pageNav);
+
+ pageNav = storage_.getPageNavigation(ownerType, ownerId);
+ pageNode = pageNav.getNode(updatedName);
+ assertNull("Node name has been updated", pageNode);
+
+ pageNode = pageNav.getNode(formerName);
+ assertNotNull("Could not find node " + formerName, pageNode);
+ assertEquals(formerName, pageNode.getName());
+ assertEquals(updatedName + "_uri", pageNode.getUri());
+ assertEquals(updatedName + "_label", pageNode.getLabel());
+
+ for(PageNode node : pageNav.getNodes())
+ {
+ StringBuffer message = new StringBuffer("Current node metadata: \n");
+ message.append("Name: " + node.getName() + "\n");
+ message.append("Label: " + node.getLabel() + "\n");
+ message.append("Uri: " + node.getUri() + "\n");
+ System.out.println(message.toString());
+ }
+ }
+ }.execute(null);
+ }
+
public void testRenewPage()
{
new UnitTest()
14 years, 2 months
gatein SVN: r2600 - portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-13 04:01:36 -0400 (Tue, 13 Apr 2010)
New Revision: 2600
Modified:
portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
Log:
GTNPORTAL-1028 maximizing a minimized gadget doesn't expand the gadget
Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
===================================================================
--- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-04-13 07:11:23 UTC (rev 2599)
+++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-04-13 08:01:36 UTC (rev 2600)
@@ -20,6 +20,8 @@
package org.exoplatform.dashboard.webui.component;
import org.exoplatform.portal.webui.application.UIGadget;
+import org.exoplatform.portal.webui.page.UIPage;
+import org.exoplatform.portal.webui.page.UIPageBody;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.web.application.ApplicationMessage;
@@ -33,6 +35,8 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
+import javax.portlet.WindowState;
+
@ComponentConfigs({@ComponentConfig(template = "classpath:groovy/dashboard/webui/component/UIDashboard.gtmpl", events = {
@EventConfig(listeners = UIDashboardContainer.MoveGadgetActionListener.class),
@EventConfig(listeners = UIDashboardContainer.AddNewGadgetActionListener.class),
@@ -174,6 +178,12 @@
context.addUIComponentToUpdateByAjax(uiDashboard);
return;
}
+
+ //TODO nguyenanhkien2a(a)gmail.com
+ //We need to expand unminimized state of uiGadget to view all body of gadget, not just a title with no content
+ uiGadget.getProperties().setProperty("minimized", "false");
+ uiDashboardCont.save();
+
if (maximize.equals("maximize"))
{
uiGadget.setView(UIGadget.CANVAS_VIEW);
14 years, 2 months
gatein SVN: r2599 - portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 03:11:23 -0400 (Tue, 13 Apr 2010)
New Revision: 2599
Added:
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties
Modified:
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
Log:
JBEPP-301: register new user page is displayed in french instead of english
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 07:06:53 UTC (rev 2598)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 07:11:23 UTC (rev 2599)
@@ -17,17 +17,17 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
-UIRegisterForm.title=Créer un nouveau compte
-UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+UIRegisterForm.registerWithSuccess.message=You have successfully registered a new account!
+UIRegisterForm.title=Register New Account
+UIRegisterForm.label.action.CheckUsernameAvailability=Search User
-UIRegisterForm.label.username=Nom d'utilisateur:
-UIRegisterForm.label.password=Mot de passe:
-UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
-UIRegisterForm.label.firstName=Prénom:
-UIRegisterForm.label.lastName=Nom:
-UIRegisterForm.label.emailAddress=Addresse EMail:
-UIRegisterForm.label.captcha=Texte de vérification:
+UIRegisterForm.label.username=User Name:
+UIRegisterForm.label.password=Password:
+UIRegisterForm.label.confirmPassword=Confirm Password:
+UIRegisterForm.label.firstName=First Name:
+UIRegisterForm.label.lastName=Last Name:
+UIRegisterForm.label.emailAddress=Email Address:
+UIRegisterForm.label.captcha=Text validation:
-UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
-UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
+UIRegisterEditMode.title=Register Portlet Preferences
+UIRegisterEditMode.label.useCaptcha=Use captcha:
Added: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties (rev 0)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties 2010-04-13 07:11:23 UTC (rev 2599)
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
+UIRegisterForm.title=Créer un nouveau compte
+UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+
+UIRegisterForm.label.username=Nom d'utilisateur:
+UIRegisterForm.label.password=Mot de passe:
+UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
+UIRegisterForm.label.firstName=Prénom:
+UIRegisterForm.label.lastName=Nom:
+UIRegisterForm.label.emailAddress=Addresse EMail:
+UIRegisterForm.label.captcha=Texte de vérification:
+
+UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
+UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
14 years, 2 months
gatein SVN: r2598 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-04-13 03:06:53 -0400 (Tue, 13 Apr 2010)
New Revision: 2598
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-1059 Delete or cut a system node is unallowable
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-04-13 07:04:29 UTC (rev 2597)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-04-13 07:06:53 UTC (rev 2598)
@@ -248,6 +248,18 @@
}
}
+ public boolean isSystem() {
+ switch(visibility) {
+ case SYSTEM:
+ return true;
+ case TEMPORAL:
+ case HIDDEN:
+ case DISPLAYED:
+ return false;
+ default:
+ throw new AssertionError();
+ }
+ }
public void setVisible(Boolean b)
{
if (b != null)
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-04-13 07:04:29 UTC (rev 2597)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-04-13 07:06:53 UTC (rev 2598)
@@ -1088,6 +1088,13 @@
UIGroupManagement.msg.DeleteMandatory=You can't delete this group because it (or its child) is mandatory.
###############################################################################
+ # org.exoplatform.portal.webui.navigation.UINavigationNodeSelector #
+ ###############################################################################
+UINavigationNodeSelector.msg.systemnode-delete=Cannot delete a system node
+UINavigationNodeSelector.msg.systemnode-move=Cannot cut a system node
+
+
+ ###############################################################################
# org.exoplatform.portal.webui.component.customization.UIEditCurentPage #
###############################################################################
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-13 07:04:29 UTC (rev 2597)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-13 07:06:53 UTC (rev 2598)
@@ -579,13 +579,46 @@
{
public void execute(Event<UIRightClickPopupMenu> event) throws Exception
{
- super.execute(event);
- UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
- if (uiNodeSelector.getCopyNode() == null)
- {
- return;
- }
- uiNodeSelector.getCopyNode().setDeleteNode(true);
+ String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
+ WebuiRequestContext pcontext = event.getRequestContext();
+ UIApplication uiApp = pcontext.getUIApplication();
+ UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
+ UINavigationManagement uiManagement = uiNodeSelector.getParent();
+ Class<?>[] childrenToRender = new Class<?>[]{UINavigationNodeSelector.class};
+ uiManagement.setRenderedChildrenOfTypes(childrenToRender);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement);
+
+ PageNavigation nav = uiNodeSelector.getSelectedNavigation();
+ if (nav == null)
+ {
+ return;
+ }
+
+ PageNode[] pageNodes = PageNavigationUtils.searchPageNodesByUri(nav, uri);
+ if (pageNodes == null)
+ {
+ return;
+ }
+
+ for (PageNode pageNode : pageNodes) {
+ if(pageNode != null && pageNode.isSystem()) {
+ uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-move", null, ApplicationMessage.ERROR));
+ return;
+ }
+ }
+
+ SelectedNode selectedNode = new SelectedNode(nav, pageNodes[0], pageNodes[1]);
+ selectedNode.setDeleteNode(false);
+ uiNodeSelector.setCopyNode(selectedNode);
+ event.getSource().setActions(
+ new String[]{"AddNode", "EditPageNode", "EditSelectedNode", "CopyNode", "CloneNode", "CutNode",
+ "PasteNode", "DeleteNode", "MoveUp", "MoveDown"});
+
+ if (uiNodeSelector.getCopyNode() == null)
+ {
+ return;
+ }
+ uiNodeSelector.getCopyNode().setDeleteNode(true);
}
}
@@ -806,6 +839,7 @@
{
String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
WebuiRequestContext pcontext = event.getRequestContext();
+ UIApplication uiApp = pcontext.getUIApplication();
UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
pcontext.addUIComponentToUpdateByAjax(uiNodeSelector);
@@ -823,9 +857,21 @@
if (pageNodes[0] == null)
{
+ if(pageNodes[1].isSystem()) {
+ uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-delete", null, ApplicationMessage.ERROR));
+ return;
+ }
+
nav.getNodes().remove(pageNodes[1]);
return;
}
+
+ for (PageNode pageNode : pageNodes) {
+ if(pageNode.isSystem()) {
+ uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-delete", null, ApplicationMessage.ERROR));
+ return;
+ }
+ }
pageNodes[0].getChildren().remove(pageNodes[1]);
uiNodeSelector.selectPageNodeByUri(pageNodes[0].getUri());
}
14 years, 2 months
gatein SVN: r2597 - portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 03:04:29 -0400 (Tue, 13 Apr 2010)
New Revision: 2597
Added:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties
Modified:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
Log:
JBEPP-301: register new user page is displayed in french instead of english
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 06:34:42 UTC (rev 2596)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 07:04:29 UTC (rev 2597)
@@ -17,17 +17,17 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
-UIRegisterForm.title=Créer un nouveau compte
-UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+UIRegisterForm.registerWithSuccess.message=You have successfully registered a new account!
+UIRegisterForm.title=Register New Account
+UIRegisterForm.label.action.CheckUsernameAvailability=Search User
-UIRegisterForm.label.username=Nom d'utilisateur:
-UIRegisterForm.label.password=Mot de passe:
-UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
-UIRegisterForm.label.firstName=Prénom:
-UIRegisterForm.label.lastName=Nom:
-UIRegisterForm.label.emailAddress=Addresse EMail:
-UIRegisterForm.label.captcha=Texte de vérification:
+UIRegisterForm.label.username=User Name:
+UIRegisterForm.label.password=Password:
+UIRegisterForm.label.confirmPassword=Confirm Password:
+UIRegisterForm.label.firstName=First Name:
+UIRegisterForm.label.lastName=Last Name:
+UIRegisterForm.label.emailAddress=Email Address:
+UIRegisterForm.label.captcha=Text validation:
-UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
-UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
+UIRegisterEditMode.title=Register Portlet Preferences
+UIRegisterEditMode.label.useCaptcha=Use captcha:
Copied: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties (from rev 2596, portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties)
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties (rev 0)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties 2010-04-13 07:04:29 UTC (rev 2597)
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
+UIRegisterForm.title=Créer un nouveau compte
+UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+
+UIRegisterForm.label.username=Nom d'utilisateur:
+UIRegisterForm.label.password=Mot de passe:
+UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
+UIRegisterForm.label.firstName=Prénom:
+UIRegisterForm.label.lastName=Nom:
+UIRegisterForm.label.emailAddress=Addresse EMail:
+UIRegisterForm.label.captcha=Texte de vérification:
+
+UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
+UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
14 years, 2 months
gatein SVN: r2596 - portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 02:34:42 -0400 (Tue, 13 Apr 2010)
New Revision: 2596
Added:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
Log:
GTNPORTAL-1063: register new user page is displayed in french instead of english
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 05:45:17 UTC (rev 2595)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2010-04-13 06:34:42 UTC (rev 2596)
@@ -17,17 +17,17 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
-UIRegisterForm.title=Créer un nouveau compte
-UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+UIRegisterForm.registerWithSuccess.message=You have successfully registered a new account!
+UIRegisterForm.title=Register New Account
+UIRegisterForm.label.action.CheckUsernameAvailability=Search User
-UIRegisterForm.label.username=Nom d'utilisateur:
-UIRegisterForm.label.password=Mot de passe:
-UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
-UIRegisterForm.label.firstName=Prénom:
-UIRegisterForm.label.lastName=Nom:
-UIRegisterForm.label.emailAddress=Addresse EMail:
-UIRegisterForm.label.captcha=Texte de vérification:
+UIRegisterForm.label.username=User Name:
+UIRegisterForm.label.password=Password:
+UIRegisterForm.label.confirmPassword=Confirm Password:
+UIRegisterForm.label.firstName=First Name:
+UIRegisterForm.label.lastName=Last Name:
+UIRegisterForm.label.emailAddress=Email Address:
+UIRegisterForm.label.captcha=Text validation:
-UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
-UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
+UIRegisterEditMode.title=Register Portlet Preferences
+UIRegisterEditMode.label.useCaptcha=Use captcha:
Added: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_fr.properties 2010-04-13 06:34:42 UTC (rev 2596)
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+UIRegisterForm.registerWithSuccess.message=Votre compte a été créé
+UIRegisterForm.title=Créer un nouveau compte
+UIRegisterForm.label.action.CheckUsernameAvailability=Verifier disponibilité
+
+UIRegisterForm.label.username=Nom d'utilisateur:
+UIRegisterForm.label.password=Mot de passe:
+UIRegisterForm.label.confirmPassword=Confirmation du mot de passe:
+UIRegisterForm.label.firstName=Prénom:
+UIRegisterForm.label.lastName=Nom:
+UIRegisterForm.label.emailAddress=Addresse EMail:
+UIRegisterForm.label.captcha=Texte de vérification:
+
+UIRegisterEditMode.title=Préférences de la portlet d'enregistrement
+UIRegisterEditMode.label.useCaptcha=Utiliser captcha:
14 years, 2 months
gatein SVN: r2595 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide: en-US and 1 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-13 01:45:17 -0400 (Tue, 13 Apr 2010)
New Revision: 2595
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/images/test_install.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
Log:
Updated screen shot to include new RH skin
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml 2010-04-13 04:50:30 UTC (rev 2594)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml 2010-04-13 05:45:17 UTC (rev 2595)
@@ -87,9 +87,12 @@
<figure id="Test_your_Installation-Test_your_Installation">
<title>Test your Installation</title>
<mediaobject>
- <imageobject>
- <imagedata align="center" fileref="images/test_install.png" />
+ <imageobject role="html">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" scale="90" />
</imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="150m" />
+ </imageobject>
</mediaobject>
</figure>
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/images/test_install.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-13 04:50:30 UTC (rev 2594)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-13 05:45:17 UTC (rev 2595)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.project</groupId>
- <artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.0.1-GA-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
14 years, 2 months
gatein SVN: r2594 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: benlc
Date: 2010-04-13 00:50:30 -0400 (Tue, 13 Apr 2010)
New Revision: 2594
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation_Guide.ent
Log:
'removing the entities left in the ent file'
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation_Guide.ent
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation_Guide.ent 2010-04-13 04:49:17 UTC (rev 2593)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation_Guide.ent 2010-04-13 04:50:30 UTC (rev 2594)
@@ -5,7 +5,3 @@
<!ENTITY YEAR "2010">
<!ENTITY HOLDER "Red Hat, Inc">
<!ENTITY RHEL "Red Hat Enterprise Linux">
-<!ENTITY START_EDIT "<formalpara><title><remark><!-- Start Edit</remark></title><para></para></formalpara>">
-<!ENTITY END_EDIT "<formalpara><title><remark>End Edit --></remark></title><para></para></formalpara>">
-<!ENTITY START_NOTE "<formalpara><title><remark><!-- Start Note to Reviewer</remark></title><para></para></formalpara>">
-<!ENTITY END_NOTE "<formalpara><title><remark>End Note to Reviewer --></remark></title><para></para></formalpara>">
14 years, 2 months