Encoded path for DELETE requests

[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 da692db..cbabf86 100644 (file)
--- a/src/gr/grnet/pithos/web/client/TopPanel.java
+++ b/src/gr/grnet/pithos/web/client/TopPanel.java
@@ -35,18 +35,14 @@
 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.Window;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.Composite;
 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,7 +61,7 @@ public class TopPanel extends Composite {
        /**
         * An image bundle for this widgets images.
         */
-       public interface Images extends FilePropertiesDialog.Images {
+       public interface Images extends FilePermissionsDialog.Images {
 
                @Source("gr/grnet/pithos/resources/pithos2-logo.png")
                ImageResource pithosLogo();
@@ -87,36 +83,48 @@ public class TopPanel extends Composite {
                outer.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
                outer.setStyleName("pithos-topPanel");
 
-               HTML logos = new HTML("<table><tr><td>" + AbstractImagePrototype.create(images.pithosLogo()).getHTML() + "</td></tr></table>");
-               outer.add(logos);
+               HorizontalPanel inner = new HorizontalPanel();
+               inner.setWidth("75%");
+               inner.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
+               
+               HTML logos = new HTML("<table><tr><td><a href='/'>" + AbstractImagePrototype.create(images.pithosLogo()).getHTML() + "</a></td></tr></table>");
+               logos.addStyleName("pithos-logo");
+               inner.add(logos);
 
         MenuBar username = new MenuBar();
         username.setStyleName("pithos-usernameMenu");
         
         MenuBar userItemMenu = new MenuBar(true);
+        userItemMenu.addStyleName("pithos-userItemMenu");
         userItemMenu.addItem(new MenuItem("invite friends...", new Command() {
                        
                        @Override
                        public void execute() {
-                               //Somehow get info from the server about invitations sent/left etc and then show the box
-                               new InvitationsDialog().center();
+                               Window.open("/im/invite", "", "");
                        }
                }));
         userItemMenu.addItem(new MenuItem("send feedback...", new Command() {
                        
                        @Override
                        public void execute() {
-                               new FeedbackDialog().center();
+                               Window.open("/im/feedback", "", "");
                        }
                }));
-        userItemMenu.addItem(new MenuItem("API token", new Command() {
+        userItemMenu.addItem(new MenuItem("profile...", new Command() {
                        
                        @Override
                        public void execute() {
-                               new CredentialsDialog(app, images).center();
+                               Window.open("/im/profile", "", "");
                        }
                }));
-        userItemMenu.addItem(new MenuItem("Log off", new Command() {
+        userItemMenu.addItem(new MenuItem("change password...", new Command() {
+                       
+                       @Override
+                       public void execute() {
+                               Window.open("/im/password", "", "");
+                       }
+               }));
+        userItemMenu.addItem(new MenuItem("logout", new Command() {
                        
                        @Override
                        public void execute() {
@@ -128,9 +136,17 @@ public class TopPanel extends Composite {
         userItem.addStyleName("pithos-usernameMenuItem");
         username.addItem(userItem);
         username.addSeparator();
-        username.addItem(new MenuItem("en", (Command) null));
-        outer.add(username);
-               outer.setCellHorizontalAlignment(username, HasHorizontalAlignment.ALIGN_RIGHT);
+        
+        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);
        }
 }