Increase width for menu in workspace

zanata · May 31, 2012 · 56e8e79 · 56e8e79
1 parent 08ee4cd
commit 56e8e79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
@@ -11,7 +11,7 @@
 
 		.label
 		{
-			padding-left:3px;
+			padding-left:5px;
 		}
 
 	</ui:style>

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
@@ -74,6 +74,10 @@ interface Styles extends CssResource
       String hasError();
 
       String image();
+
+      String menuBar();
+
+      String menuItem();
    }
 
    private static AppViewUiBinder uiBinder = GWT.create(AppViewUiBinder.class);
@@ -225,6 +229,7 @@ public HasClickHandlers getDocumentsLink()
    public void initMenuList(String userLabel, Command helpMenuCommand, Command leaveWorkspaceMenuCommand, Command signOutMenuCommand, Command layoutMenuCommand)
    {
       MenuBar menuBar = new MenuBar(true);
+      menuBar.addStyleName(style.menuBar());
 
       ImageLabel helpImageLabel = new ImageLabel(resources.help(), messages.help());
       helpImageLabel.setImageStyle(style.image());
@@ -235,16 +240,22 @@ public void initMenuList(String userLabel, Command helpMenuCommand, Command leav
       ImageLabel signOutImageLabel = new ImageLabel(resources.logout(), messages.signOut());
       signOutImageLabel.setImageStyle(style.image());
 
+      ImageLabel leaveWorkspaceImageLabel = new ImageLabel("", messages.leaveWorkspace());
+      leaveWorkspaceImageLabel.setImageStyle(style.image());
+
       helpMenuItem = menuBar.addItem(helpImageLabel.getElement().getString(), true, helpMenuCommand);
+      helpMenuItem.addStyleName(style.menuItem());
       menuBar.addSeparator();
 
       layoutMenuItem = menuBar.addItem(layoutImageLabel.getElement().getString(), true, layoutMenuCommand);
+      layoutMenuItem.addStyleName(style.menuItem());
       layoutMenuSeperator = menuBar.addSeparator();
 
-      leaveWorkspaceMenuItem = new MenuItem(messages.leaveWorkspace(), leaveWorkspaceMenuCommand);
-      menuBar.addItem(leaveWorkspaceMenuItem);
+      leaveWorkspaceMenuItem = menuBar.addItem(leaveWorkspaceImageLabel.getElement().getString(), true, leaveWorkspaceMenuCommand);
+      leaveWorkspaceMenuItem.addStyleName(style.menuItem());
 
       signOutMenuItem = menuBar.addItem(signOutImageLabel.getElement().getString(), true, signOutMenuCommand);
+      signOutMenuItem.addStyleName(style.menuItem());
 
       ImageLabel userMenu = new ImageLabel(userAvatarUrl, userLabel + " " + messages.downArrow());
       userMenu.setLabelStyle(style.userName());

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
@@ -147,6 +147,16 @@
 			color:#ADD8E6;
 		}
 
+		.menuBar
+		{
+			width:150px;
+		}
+
+		.menuItem
+		{
+			width:150px;
+		}
+
 	</ui:style>
 	<g:LayoutPanel>
 		<g:layer top="0px" height="35px">