CSS fixes

[pithos-web-client] / src / gr / grnet / pithos / web / client / TopPanel.java

diff --git a/src/gr/grnet/pithos/web/client/TopPanel.java b/src/gr/grnet/pithos/web/client/TopPanel.java
index f1842ab..47ecb1a 100644 (file)
--- a/src/gr/grnet/pithos/web/client/TopPanel.java
+++ b/src/gr/grnet/pithos/web/client/TopPanel.java
@@ -35,6 +35,9 @@
 package gr.grnet.pithos.web.client;
 
 import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Cookies;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
@@ -43,6 +46,7 @@ import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.MenuBar;
 import com.google.gwt.user.client.ui.MenuItem;
 
@@ -65,6 +69,9 @@ public class TopPanel extends Composite {
 
                @Source("gr/grnet/pithos/resources/pithos2-logo.png")
                ImageResource pithosLogo();
+               
+               @Source("gr/grnet/pithos/resources/desc.png")
+               ImageResource downArrow();
        }
 
        /**
@@ -80,17 +87,32 @@ public class TopPanel extends Composite {
                outer.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
                outer.setStyleName("pithos-topPanel");
 
+               HorizontalPanel inner = new HorizontalPanel();
+               inner.setWidth("75%");
+               inner.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
+               
                HTML logos = new HTML("<table><tr><td>" + AbstractImagePrototype.create(images.pithosLogo()).getHTML() + "</td></tr></table>");
-               outer.add(logos);
+               logos.addStyleName("pithos-logo");
+               inner.add(logos);
 
         MenuBar username = new MenuBar();
         username.setStyleName("pithos-usernameMenu");
+        
         MenuBar userItemMenu = new MenuBar(true);
-        userItemMenu.addItem(new MenuItem("Log off", new Command() {
+        userItemMenu.addStyleName("pithos-userItemMenu");
+        userItemMenu.addItem(new MenuItem("invite friends...", new Command() {
                        
                        @Override
                        public void execute() {
-                               app.logoff();
+                               //Somehow get info from the server about invitations sent/left etc and then show the box
+                               new InvitationsDialog().center();
+                       }
+               }));
+        userItemMenu.addItem(new MenuItem("send feedback...", new Command() {
+                       
+                       @Override
+                       public void execute() {
+                               new FeedbackDialog().center();
                        }
                }));
         userItemMenu.addItem(new MenuItem("API token", new Command() {
@@ -100,13 +122,29 @@ public class TopPanel extends Composite {
                                new CredentialsDialog(app, images).center();
                        }
                }));
+        userItemMenu.addItem(new MenuItem("Log off", new Command() {
+                       
+                       @Override
+                       public void execute() {
+                               app.logoff();
+                       }
+               }));
+
         MenuItem userItem = new MenuItem(_app.getUsername(), userItemMenu);
-        userItem.addStyleName("pithos-usernameMenu");
-        userItem.setWidth("68px");
+        userItem.addStyleName("pithos-usernameMenuItem");
         username.addItem(userItem);
-        outer.add(username);
-               outer.setCellHorizontalAlignment(username, HasHorizontalAlignment.ALIGN_RIGHT);
-
+        username.addSeparator();
+        
+        MenuItem langItem = new MenuItem("en", (Command) null);
+        langItem.addStyleName("pithos-langMenuItem");
+        username.addItem(langItem);
+        
+        inner.add(username);
+        inner.setCellHorizontalAlignment(username, HasHorizontalAlignment.ALIGN_RIGHT);
+        
+        outer.add(inner);
+        outer.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);
+        outer.setCellVerticalAlignment(inner, HasVerticalAlignment.ALIGN_BOTTOM);
                initWidget(outer);
        }
 }