diff --git a/pom.xml b/pom.xml
index 9abc508..7c275b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,19 +80,16 @@
org.gcube.portal
custom-portal-handler
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
org.gcube.common.portal
portal-manager
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
org.gcube.portlets.user
gcube-widgets
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
compile
@@ -108,7 +105,6 @@
org.gcube.dvos
usermanagement-core
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
@@ -119,7 +115,6 @@
com.liferay.portal
portal-service
- ${liferay.version}
provided
@@ -137,7 +132,6 @@
com.liferay.portal
util-java
- ${liferay.version}
provided
diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.java b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.java
index 47f0a6f..efa3111 100644
--- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.java
+++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.java
@@ -149,7 +149,7 @@ public class AboutView extends Composite {
// show alert block
alertBlockOnLeave.setVisible(true);
-
+ leaveVreButton.setVisible(false);
}
});
@@ -179,6 +179,7 @@ public class AboutView extends Composite {
// just hide alertBlock
alertBlockOnLeave.setVisible(false);
+ leaveVreButton.setVisible(true);
}
});
diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
index 1de0f16..697359c 100644
--- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java
@@ -235,7 +235,8 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi
sendUserUnregisteredNotification(username, getASLSession().getScope(),
PortalContext.getConfiguration().getGatewayURL(getThreadLocalRequest()),
PortalContext.getConfiguration().getGatewayName(getThreadLocalRequest()));
- return "/";
+
+ return PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
} catch (Exception e) {
e.printStackTrace();
return null;
diff --git a/src/main/webapp/GCubeLoggedin.css b/src/main/webapp/GCubeLoggedin.css
index d58c56f..5195f5c 100644
--- a/src/main/webapp/GCubeLoggedin.css
+++ b/src/main/webapp/GCubeLoggedin.css
@@ -13,4 +13,14 @@ div.gwt-HTML.vre-description {
.loading-text {
width: 100%;
text-align: center;
+}
+
+.cancel-leave-button {
+ font-weight: bold;
+}
+
+.cancel-leave-button:hover {
+ cursor: pointer;
+ cursor: hand;
+ text-decoration: underline;
}
\ No newline at end of file