From 781d9334833f2f173c863a1b7534d980e50507ea Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Thu, 21 Jul 2016 16:12:35 +0000 Subject: [PATCH] fixed link to explore VREs when user has no VREs yet git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/my-vres@130655 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/my_vres/client/MyVREsService.java | 2 ++ .../my_vres/client/MyVREsServiceAsync.java | 2 ++ .../user/my_vres/client/NoVresPanel.java | 25 +++++++++++++++---- .../user/my_vres/client/NoVresPanel.ui.xml | 6 ++--- .../my_vres/server/MyVREsServiceImpl.java | 8 ++++++ src/main/webapp/MyVREs.css | 2 -- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java index 61b470d..17adba8 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java @@ -18,4 +18,6 @@ public interface MyVREsService extends RemoteService { void loadLayout(String scope, String URL); String showMoreVREs(); + + String getSiteLandingPagePath(); } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java index 45adcc2..32222ef 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java @@ -17,4 +17,6 @@ public interface MyVREsServiceAsync { void showMoreVREs(AsyncCallback callback); + void getSiteLandingPagePath(AsyncCallback callback); + } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.java b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.java index 094f7e4..302d7e9 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.java @@ -2,6 +2,9 @@ package org.gcube.portlet.user.my_vres.client; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -10,14 +13,26 @@ public class NoVresPanel extends Composite { private static NoVresPanelUiBinder uiBinder = GWT .create(NoVresPanelUiBinder.class); + private final MyVREsServiceAsync myVREsService = GWT.create(MyVREsService.class); + interface NoVresPanelUiBinder extends UiBinder { } - + @UiField Anchor joinLink; + @UiField Anchor availableLink; public NoVresPanel() { initWidget(uiBinder.createAndBindUi(this)); - } - - public NoVresPanel(String firstName) { - initWidget(uiBinder.createAndBindUi(this)); + myVREsService.getSiteLandingPagePath(new AsyncCallback() { + + @Override + public void onSuccess(String result) { + joinLink.setHref(result); + availableLink.setHref(result); + } + + @Override + public void onFailure(Throwable caught) { + + } + }); } } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml index c9a208e..9460749 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml @@ -4,9 +4,9 @@
You are not subscribed to any environment, - please begin by - joining one.

- Explore the research environments available in the infrastructure. + please begin by + joining one.

+ Explore the Virtual Research Environments available in the infrastructure.
\ No newline at end of file diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java index ebabd59..b2dbafe 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java @@ -57,6 +57,13 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer public String showMoreVREs() { return PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest()); } + @Override + public String getSiteLandingPagePath() { + String user = getASLSession().getUsername(); + _log.debug("user=" + user + " has no VREs"); + String toReturn = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest())+GCubePortalConstants.VRES_EXPLORE_FRIENDLY_URL; + return toReturn; + } /** * * @return true if you're running into the portal, false if in development @@ -236,4 +243,5 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer return toReturn; } + } \ No newline at end of file diff --git a/src/main/webapp/MyVREs.css b/src/main/webapp/MyVREs.css index a412b17..d512c52 100644 --- a/src/main/webapp/MyVREs.css +++ b/src/main/webapp/MyVREs.css @@ -33,8 +33,6 @@ a.vrelink:hover { .NoVresStyle { line-height: 25px; - font-family: 'Architects Daughter', Arial, Verdana, sans-serif; - font-size: 15px; padding-left: 0px; }