X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenu.java;h=ba8e3d48764731c6cb01fe1aae78a7c4afcea393;hb=a54e2b883c05a913a187133f9d141124e26fb1c2;hp=73567886b0f7986575f58f9c7626b68247a3233f;hpb=84bc67864872c2db5169b5d6dde688cae8af7e4c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index 73567886b..ba8e3d487 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -75,20 +75,23 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 	}
 
 	protected void userUi() {
-		setLayout(new GridLayout());
-
-		String username = SecurityContextHolder.getContext()
-				.getAuthentication().getName();
+		setLayout(CmsUtils.noSpaceGridLayout());
+		Composite c = new Composite(this, SWT.NONE);
+		c.setLayout(new GridLayout());
+		c.setLayoutData(CmsUtils.fillAll());
 
-		Label l = new Label(this, SWT.NONE);
-		l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM);
-		l.setData(RWT.MARKUP_ENABLED, true);
-		l.setLayoutData(CmsUtils.fillWidth());
-		l.setText("<b>" + username + "</b>");
+		// String username = SecurityContextHolder.getContext()
+		// .getAuthentication().getName();
+		//
+		// Label l = new Label(c, SWT.NONE);
+		// l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM);
+		// l.setData(RWT.MARKUP_ENABLED, true);
+		// l.setLayoutData(CmsUtils.fillWidth());
+		// l.setText("<b>" + username + "</b>");
 
-		specificUserUi(this);
+		specificUserUi(c);
 
-		l = new Label(this, SWT.NONE);
+		Label l = new Label(c, SWT.NONE);
 		l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM);
 		l.setText(CmsMsg.logout.lead());
 		GridData lData = CmsUtils.fillWidth();
@@ -123,7 +126,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 		c.setLayout(new GridLayout());
 		c.setLayoutData(CmsUtils.fillAll());
 
-		Integer textWidth = 150;
+		Integer textWidth = 120;
 		setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
 
 		// new Label(this, SWT.NONE).setText(CmsMsg.username.lead());