Index: extension/portlets/platformNavigation/src/main/java/org/exoplatform/platform/component/UIMyGroupsPlatformToolBarPortlet.java
===================================================================
--- extension/portlets/platformNavigation/src/main/java/org/exoplatform/platform/component/UIMyGroupsPlatformToolBarPortlet.java	(revision 0)
+++ extension/portlets/platformNavigation/src/main/java/org/exoplatform/platform/component/UIMyGroupsPlatformToolBarPortlet.java	(revision 0)
@@ -0,0 +1,74 @@
+package org.exoplatform.platform.component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.exoplatform.portal.config.UserACL;
+import org.exoplatform.portal.config.UserPortalConfig;
+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.util.Util;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.core.UIPortletApplication;
+import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
+
+@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/platformNavigation/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.gtmpl")
+public class UIMyGroupsPlatformToolBarPortlet extends UIPortletApplication {
+
+  private OrganizationService organizationService = null;
+  private String userId = null;
+  private boolean groupNavigationPermitted = false;
+
+  public UIMyGroupsPlatformToolBarPortlet() throws Exception {
+    organizationService = getApplicationComponent(OrganizationService.class);
+    UserACL userACL = getApplicationComponent(UserACL.class);
+    //groupNavigationPermitted is set to true if the user is the super user or have the administration rights
+    if (getUserId().equals(userACL.getSuperUser())) {
+      groupNavigationPermitted = true;
+    } else {
+      Collection memberships = organizationService.getMembershipHandler().findMembershipsByUser(getUserId());
+      for (Object object : memberships) {
+        Membership membership = (Membership) object;
+        if (membership.getMembershipType().equals(userACL.getAdminMSType())) {
+          groupNavigationPermitted = true;
+          break;
+        }
+      }
+    }
+  }
+
+  //return group navigation that does not include any space navigation
+  public List<PageNavigation> getGroupNavigations() throws Exception {
+    String remoteUser = getUserId();
+    UserPortalConfig userPortalConfig = Util.getUIPortalApplication().getUserPortalConfig();
+    List<PageNavigation> allNavigations = userPortalConfig.getNavigations();
+    List<PageNavigation> computedNavigations = new ArrayList<PageNavigation>();
+    for (PageNavigation navigation : allNavigations) {
+      if ((navigation.getOwnerType().equals(PortalConfig.GROUP_TYPE)) && (navigation.getOwnerId().indexOf("spaces") < 0)) {
+        computedNavigations.add(PageNavigationUtils.filter(navigation, remoteUser));
+      }
+    }
+    return computedNavigations;
+  }
+
+  public PageNode getSelectedPageNode() throws Exception {
+    return Util.getUIPortal().getSelectedNode();
+  }
+
+  private String getUserId() {
+    if (userId == null) {
+      userId = Util.getPortalRequestContext().getRemoteUser();
+    }
+    return userId;
+  }
+
+  public boolean hasPermission() throws Exception {
+    return groupNavigationPermitted;
+  }
+
+}
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.xml	(revision 69746)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.xml	(working copy)
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bundle>
 	<UIMySpacePlatformToolBarPortlet>
-		<label>
-          My Spaces
-        </label>
-		<find>Find Spaces
-		</find>
-		<manage>Manage groups</manage>
+		<label>My Spaces</label>
+		<find>Find Spaces</find>
+		<more>More...</more>
 	</UIMySpacePlatformToolBarPortlet>
-</bundle>
\ No newline at end of file
+</bundle>
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_en.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_en.xml	(revision 69746)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_en.xml	(working copy)
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bundle>
 	<UIMySpacePlatformToolBarPortlet>
-		<label>
-          My Spaces
-        </label>
-		<find>Find Spaces
-		</find>
-		<manage>Manage groups</manage>
+		<label>My Spaces</label>
+		<find>Find Spaces</find>
+		<more>More...</more>
 	</UIMySpacePlatformToolBarPortlet>
-</bundle>
\ No newline at end of file
+</bundle>
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_fr.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_fr.xml	(revision 69746)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet_fr.xml	(working copy)
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bundle>
 	<UIMySpacePlatformToolBarPortlet>
-		<label>
-            Mes Espaces
-        </label>
-		<find>Trouver des Espaces
-		</find>
-		<manage>Gestion des groupes</manage>
+		<label>Mes Espaces</label>
+		<find>Trouver des Espaces</find>
+		<more>Plus...</more>
 	</UIMySpacePlatformToolBarPortlet>
-</bundle>
\ No newline at end of file
+</bundle>
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.xml	(revision 0)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.xml	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+	<UIMyGroupsPlatformToolBarPortlet>
+		<label>My Groups</label>
+		<manage>Manage groups</manage>
+	</UIMyGroupsPlatformToolBarPortlet>
+</bundle>
\ No newline at end of file
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_en.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_en.xml	(revision 0)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_en.xml	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+	<UIMyGroupsPlatformToolBarPortlet>
+		<label>My Groups</label>
+		<manage>Manage groups</manage>
+	</UIMyGroupsPlatformToolBarPortlet>
+</bundle>
\ No newline at end of file
Index: extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_fr.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_fr.xml	(revision 0)
+++ extension/portlets/platformNavigation/src/main/resources/locale/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet_fr.xml	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+	<UIMyGroupsPlatformToolBarPortlet>
+		<label>Mes Groupes</label>
+		<manage>Gestion des groupes</manage>
+	</UIMyGroupsPlatformToolBarPortlet>
+</bundle>
\ No newline at end of file
Index: extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.gtmpl
===================================================================
--- extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.gtmpl	(revision 69746)
+++ extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMySpacePlatformToolBarPortlet/UIMySpacePlatformToolBarPortlet.gtmpl	(working copy)
@@ -43,15 +43,6 @@
   def findSpacesLink = portalURI + "publicSpace";
   boolean hasPermission = uicomponent.hasPermission();
  
-
-  void renderSpacePageNavigation(PageNavigation navigation) {
-    nodes = navigation.getNodes();
-    if(nodes.size() < 1) return;
-    for(int i = 0; i < nodes.size(); i++) {
-      renderPageNode(nodes.get(i), i%2 == 0);
-    }
-  }
-
   void renderPageNode(PageNode node, boolean flag) {
     PageNode selectedNode = uicomponent.getSelectedPageNode();
     def tabStyleNavigation = "";
@@ -91,11 +82,6 @@
       """;
         for(int j = 0; j < node.getChildren().size(); j++) {
           PageNode childNode = node.getChildren().get(j);
-          /** PLF-971 : we do not separate between group and space navigation, these navigations are rendered in the same level
-          /* this test is no more needed
-          */
-          //def isRender = uicomponent.isRender(node, childNode);
-          //if (isRender) 
           renderPageNode(childNode, j%2 == 0);
         }
       print """
@@ -124,9 +110,7 @@
 
 	}
 
-	/** PLF-488 : construction de la navigation exoadmin:UserToolbarGroupPortlet dans la nouvelle portlet UIMySpace*/
-
-	  void renderGroupPageNavigation(PageNavigation navigation) {
+	void renderSpacePageNavigation(PageNavigation navigation) {
             nodes = navigation.getNodes() ;
             if(nodes.size() < 1) return ;
             String navTitle = OrganizationUtils.getGroupLabel(navigation.ownerId);
@@ -142,19 +126,7 @@
                         </div>
             """ ;
                     }
-                    else {
-            print """
-                        <div class="TitleBar"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
-                        <div class="SubBlock">
-                            """ ;
-                            for(int i = 0; i < nodes.size(); i++) {
-                                renderPageNodeGroup(nodes.get(i), i%2 == 0 ) ;
-                            }
-                            print """
-                        </div>
-            """ ;
-            }
-    }
+             }
 	void renderPageNodeGroup(PageNode node, boolean flag) {
 		PageNode selectedNode = uicomponent.getSelectedPageNode();
 		String tabStyleNavigation = "";
@@ -218,64 +190,56 @@
   <div class="UIHorizontalTabs">
     <div class="TabsContainer">
       <div class="UITab NormalToolbarTab">
-        <div class="">
-		<%
+       		<%
 			if (renderSpacesLink()) {
 		%>
-			  <a class="EditorIcon TBIcon" href="<%= spacesLink %>">
-		
-		        <%                } 
-				else            {
-				%>
-				<a class="EditorIcon TBIcon" href="#">
-				 <%            }
-                 %>
-				<!--
-				/** _ctx.appRes("UISpacesToolBarPortlet.label.Spaces") **/
-				/** _ctx.appRes("UIMySpacesToolBarPortlet.label.myspaces")**/
-				-->
-				 <%=_ctx.appRes("UIMySpacePlatformToolBarPortlet.label")%>
-			  </a>
-		</div>
+	<div class="">
+		  <a class="EditorIcon TBIcon" href="<%= spacesLink %>"><%=_ctx.appRes("UIMySpacePlatformToolBarPortlet.label")%></a>
+	</div>
 
 	  <!-- Merge exoadmin:  navigation-->
 
 		<% if (!groupNavigations.isEmpty()) { %>
 
 			<div style="display:none" class="MenuItemContainer">
-				<% for(navigation in groupNavigations) {
-				if (navigation.getOwnerId().indexOf("spaces")<0){  
-                	break;
+				<% 
+				def MY_SPACES_MAX_NUMBER = 10;
+				def mySpacesDisplayed = 0;
+				for(navigation in groupNavigations) {
+					if (navigation.getOwnerId().indexOf("spaces") < 0 || mySpacesDisplayed == -1){
+						break;
 					}
-					renderGroupPageNavigation(navigation);
+					/** PLF-1521 */
+						if(mySpacesDisplayed < MY_SPACES_MAX_NUMBER){
+							mySpacesDisplayed += 1;
+							renderSpacePageNavigation(navigation);
+						}else{
+							def portalContextPath = Util.getPortalRequestContext().getPortalURI().split("/")[1];
+							def portalContextAccessPath = Util.getPortalRequestContext().getPortalURI().split("/")[2];
+							mySpacesDisplayed = -1;
+							def moreSpacesLabel = _ctx.appRes("UIMySpacePlatformToolBarPortlet.more");
+							def moreSpacesLink = spacesLink;
+							print """
+							<div class="SubBlock">
+								<div class="MenuItem">
+									<a href="$moreSpacesLink">$moreSpacesLabel</a>
+								</div>
+							</div>
+							""" ;
+						}
 					
 					
 				} %>
 				<% if (renderSpacesLink()) { %>
 				<div class="SubBlock">
-                       
-                            <div class="MenuItem">   
-                                <a class="FindPeopleIcon" href="<%= findSpacesLink %>"><%=_ctx.appRes("UIMySpacePlatformToolBarPortlet.find")%></a>
-                            </div>               
-                 </div>
+						<div class="MenuItem">   
+							<a class="FindPeopleIcon" href="<%= findSpacesLink %>"><%=_ctx.appRes("UIMySpacePlatformToolBarPortlet.find")%></a>
+						</div>               
+					</div>
 				<% } %>
-<% for(navigation in groupNavigations) {
-				if (navigation.getOwnerId().indexOf("spaces")<0){
-					renderGroupPageNavigation(navigation);
-					
-                	
-					}
-				} %>				
-			
-			<% if(hasPermission){ %>
-			<div class="SubBlock">
-                       
-                            <div class="MenuItem">   
-                                <a class="ManageSite" href="<%= portalURI + "groupnavigation" %>"><%=_ctx.appRes("UIMySpacePlatformToolBarPortlet.manage")%></a>
-                            </div>               
-            </div>
-			<% } %>
+
 			</div>
+			<% } %>
 		<% } %>
 	   <!-- FIN -->
 
Index: extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.gtmpl
===================================================================
--- extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.gtmpl	(revision 0)
+++ extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIMyGroupsPlatformToolBarPortlet/UIMyGroupsPlatformToolBarPortlet.gtmpl	(revision 0)
@@ -0,0 +1,192 @@
+<%
+/*
+<!--
+
+    Copyright (C) 2003-2007 eXo Platform SAS.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation; either version 3
+    of the License, or (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see<http://www.gnu.org/licenses/>.
+
+-->
+*/
+%>
+<%
+	import org.exoplatform.portal.config.model.PageNavigation;
+	import org.exoplatform.portal.config.model.PageNode;
+	import org.exoplatform.portal.webui.util.Util;
+	import org.exoplatform.webui.organization.OrganizationUtils;
+
+	import org.exoplatform.web.application.JavascriptManager;
+	import org.gatein.common.text.EntityEncoder;
+	def groupNavigations = uicomponent.getGroupNavigations();
+
+
+	def rcontext = _ctx.getRequestContext();
+	def jsManager = rcontext.getJavascriptManager();
+	jsManager.importJavascript('eXo.portal.UIPortalNavigation');
+	jsManager.importJavascript('eXo.portal.UIAdminToolbar');
+	jsManager.addCustomizedOnLoadScript('eXo.portal.UIAdminToolbar.onLoad("' + uicomponent.id + '");');
+	def portalURI = Util.getPortalRequestContext().getPortalURI();
+	boolean hasPermission = uicomponent.hasPermission();
+
+	void renderPageNode(PageNode node, boolean flag) {
+		PageNode selectedNode = uicomponent.getSelectedPageNode();
+		def tabStyleNavigation = "";
+		if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
+		  tabStyleNavigation = "SelectedItem";
+		}
+		def hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
+		def clazz = "";
+		if(hasChild) clazz = "ArrowIcon";
+		def href = Util.getPortalRequestContext().getPortalURI() + node.getUri();
+		def icon = node.getIcon();
+		if(icon == null) icon = "DefaultPageIcon";
+		def toolong = (node.resolvedLabel.length() > 60);
+		def label = (toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel);
+		def title = "";
+		if(toolong == true) {
+		  title = "title='$node.resolvedLabel'";
+		} else {
+		  title = "";
+		}
+		print """
+		  <div class="MenuItem $tabStyleNavigation">
+			<div class="$clazz">
+		""";
+		if(node.pageReference != null) {
+		  print """<a class="ItemIcon $icon" href="$href" $title>$label</a>""";
+		} else {
+		  print """<a class="ItemIcon $icon" href="#" $title>$label</a>""";
+		}
+		print """
+			</div>
+		""";
+		if(hasChild) {
+		  print """
+			<div class="MenuItemContainer" style="position: absolute; display:none">
+			  <div class="SubBlock">
+		  """;
+			for(int j = 0; j < node.getChildren().size(); j++) {
+			  PageNode childNode = node.getChildren().get(j);
+			  renderPageNode(childNode, j%2 == 0);
+			}
+		  print """
+			  </div>
+			</div>
+		  """;
+		}
+		print """
+		  </div>
+		""";
+	}
+
+	void renderGroupPageNavigation(PageNavigation navigation) {
+		nodes = navigation.getNodes() ;
+		if(nodes.size() < 1) return ;
+		String navTitle = OrganizationUtils.getGroupLabel(navigation.ownerId);
+		String groupsNavigations= navigation.getOwnerId();
+		print """
+		<div class="TitleBar"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
+		<div class="SubBlock">
+			""" ;
+			for(int i = 0; i < nodes.size(); i++) {
+				renderPageNodeGroup(nodes.get(i), i%2 == 0 ) ;
+			}
+			print """
+		</div>
+		""" ;
+	}
+	
+	void renderPageNodeGroup(PageNode node, boolean flag) {
+		PageNode selectedNode = uicomponent.getSelectedPageNode();
+		String tabStyleNavigation = "";
+		if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
+				tabStyleNavigation = "SelectedItem";
+		}
+		boolean hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
+		String clazz = "";
+		if(hasChild) clazz = "ArrowIcon";
+		String	href = Util.getPortalRequestContext().getPortalURI() + node.getUri();
+
+		String icon = node.getIcon();
+		if(icon == null) icon = "DefaultPageIcon";
+		boolean toolong = (node.resolvedLabel.length() > 60);
+		String label = ( toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel);
+		String title = "";
+		if(toolong) title = "title='$node.resolvedLabel'";
+		else title = "";
+		EntityEncoder entityEncoder = EntityEncoder.FULL;
+		label = entityEncoder.encode(label);
+		print """
+			<div class="MenuItem $tabStyleNavigation">
+				<div class="$clazz">
+					""";
+					if(node.pageReference != null) {
+						print """<a class="ItemIcon $icon" href="$href" $title>$label</a>""";
+
+					} else {
+						print """<a class="ItemIcon $icon" href="#" $title>$label</a>""";
+					}
+					print """
+				</div>
+		""" ;
+		if(hasChild) {
+			print """
+				<div class="MenuItemContainer" style="position: absolute; display:none">
+					<div class="SubBlock">
+			""" ;
+				for(int j = 0; j < node.getChildren().size(); j++) {
+					renderPageNode(node.getChildren().get(j), j%2 == 0);
+				}
+			print """
+					</div>
+				</div>
+			""" ;
+
+		}
+		print """
+			</div>
+		""" ;
+	}
+%>
+<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id" >
+  <div class="UIHorizontalTabs">
+    <div class="TabsContainer">
+      <div class="UITab NormalToolbarTab">
+        <div class="">
+			<% if(hasPermission){ %>
+				<a class="EditorIcon TBIcon" href="<%= portalURI + "groupnavigation" %>">
+			<% }else{ %>
+				<a class="EditorIcon TBIcon" href="#">
+			<% } %>
+			<%=_ctx.appRes("UIMyGroupsPlatformToolBarPortlet.label")%></a>
+		</div>
+		<% if (!groupNavigations.isEmpty()) { %>
+			<div style="display:none" class="MenuItemContainer">
+				<% 
+				for(navigation in groupNavigations) {
+					renderGroupPageNavigation(navigation);
+				} 
+				if(hasPermission){ %>
+					<div class="SubBlock">
+						<div class="MenuItem">   
+							<a class="ManageSite" href="<%= portalURI + "groupnavigation" %>"><%=_ctx.appRes("UIMyGroupsPlatformToolBarPortlet.manage")%></a>
+						</div>               
+					</div>
+				<% } %>
+			</div>
+		<% } %>
+      </div>
+    </div>
+  </div>
+</div>
Index: extension/portlets/platformNavigation/src/main/webapp/WEB-INF/conf/portlet/UIMyGroupsPlatformToolBarPortlet/configuration.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/webapp/WEB-INF/conf/portlet/UIMyGroupsPlatformToolBarPortlet/configuration.xml	(revision 0)
+++ extension/portlets/platformNavigation/src/main/webapp/WEB-INF/conf/portlet/UIMyGroupsPlatformToolBarPortlet/configuration.xml	(revision 0)
@@ -0,0 +1,9 @@
+<webui-configuration>
+	<application>
+		<ui-component-root>org.exoplatform.platform.component.UIMyGroupsPlatformToolBarPortlet</ui-component-root>
+		<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
+	    <application-lifecycle-listeners>
+            <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
+        </application-lifecycle-listeners>
+    </application>
+</webui-configuration>
\ No newline at end of file
Index: extension/portlets/platformNavigation/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- extension/portlets/platformNavigation/src/main/webapp/WEB-INF/portlet.xml	(revision 69746)
+++ extension/portlets/platformNavigation/src/main/webapp/WEB-INF/portlet.xml	(working copy)
@@ -72,6 +72,28 @@
 		</portlet-info>
 	</portlet>
     <!-- FIN PLF-488-->
+	<portlet>
+		<description xml:lang="EN">PlatformNavigation Portlet</description>
+		<portlet-name>UIMyGroupsPlatformToolBarPortlet</portlet-name>
+		<display-name xml:lang="EN">UIMyGroupsPlatformToolBarPortlet</display-name>
+		<portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class>
+		<init-param>
+			<name>webui.configuration</name>
+			<!-- must match the path to configuration file -->
+			<value>/WEB-INF/conf/portlet/UIMyGroupsPlatformToolBarPortlet/configuration.xml</value>
+		</init-param>
+		<expiration-cache>0</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+			<portlet-mode>help</portlet-mode>
+		</supports>
+		<supported-locale>en</supported-locale>
+		<resource-bundle>locale.portlet.UIMyGroupsPlatformToolBarPortlet.UIMyGroupsPlatformToolBarPortlet</resource-bundle>
+		<portlet-info>
+			<title>UIMyGroupsPlatformToolBarPortlet</title>
+			<short-title>UIMyGroupsPlatformToolBarPortlet</short-title>
+		</portlet-info>
+	</portlet>
 	
 	<portlet>
 		<description xml:lang="EN">PlatformNavigation Portlet</description>
@@ -118,4 +140,4 @@
 	</portlet-info>
 </portlet>
 	
-</portlet-app>
\ No newline at end of file
+</portlet-app>
Index: extension/webapp/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
===================================================================
--- extension/webapp/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml	(revision 69746)
+++ extension/webapp/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml	(working copy)
@@ -59,6 +59,16 @@
 					<show-info-bar>false</show-info-bar>
 				</portlet-application>
 			</container>
+			<container id="GroupsToolbarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
+				<portlet-application>
+					<portlet>
+						<application-ref>platformNavigation</application-ref>
+						<portlet-ref>UIMyGroupsPlatformToolBarPortlet</portlet-ref>
+					</portlet>
+					<access-permissions>Everyone</access-permissions>
+					<show-info-bar>false</show-info-bar>
+				</portlet-application>
+			</container>
 
 			<!--
 		<container id="UserToolBarGroupPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
