X-Git-Url: https://code.grnet.gr/git/pithos-web-client/blobdiff_plain/fb3c97f83db9e385c4df2999771c9e4315128140..73a93609745961398005455fb3ace4fae1aac813:/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 24968cf..b755e7f 100644 --- a/src/gr/grnet/pithos/web/client/TopPanel.java +++ b/src/gr/grnet/pithos/web/client/TopPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 GRNET S.A. All rights reserved. + * Copyright 2011-2012 GRNET S.A. All rights reserved. * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following @@ -34,26 +34,15 @@ */ package gr.grnet.pithos.web.client; -import gr.grnet.pithos.web.client.foldertree.Resource; -import gr.grnet.pithos.web.client.rest.GetRequest; -import gr.grnet.pithos.web.client.rest.RestException; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.http.client.Response; 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; @@ -72,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(); @@ -101,75 +90,6 @@ public class TopPanel extends Composite { HTML logos = new HTML("
" + AbstractImagePrototype.create(images.pithosLogo()).getHTML() + "
"); 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() { - GetRequest getInvitations = new GetRequest (Invitations.class, "/im/", "", "invite?format=json") { - - @Override - public void onSuccess(Invitations _result) { - new InvitationsDialog(app, _result).center(); - } - - @Override - public void onError(Throwable t) { - GWT.log("", t); - if (t instanceof RestException) - app.displayError("Error getting invitations: " + ((RestException) t).getHttpStatusText()); - else - app.displayError("System error getting invitations: " + t.getMessage()); - } - - @Override - protected void onUnauthorized(Response response) { - app.sessionExpired(); - } - }; - getInvitations.setHeader("X-Auth-Token", app.getToken()); - Scheduler.get().scheduleDeferred(getInvitations); - } - })); - userItemMenu.addItem(new MenuItem("send feedback...", new Command() { - - @Override - public void execute() { - new FeedbackDialog(app).center(); - } - })); - userItemMenu.addItem(new MenuItem("API access", new Command() { - - @Override - public void execute() { - new CredentialsDialog(app, images).center(); - } - })); - userItemMenu.addItem(new MenuItem("logout", new Command() { - - @Override - public void execute() { - app.logoff(); - } - })); - - MenuItem userItem = new MenuItem(_app.getUsername(), userItemMenu); - userItem.addStyleName("pithos-usernameMenuItem"); - username.addItem(userItem); - 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);