From 4734c5a82910728e6944e5fd3c75b74a0f3b4ced Mon Sep 17 00:00:00 2001
From: "massimiliano.assante" <massimiliano.assante@isti.cnr.it>
Date: Fri, 14 Oct 2016 12:58:32 +0000
Subject: [PATCH] fixed bug not dsplaying correctly Confirm Leave option

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gcube-loggedin@133200 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                                |  6 ------
 .../user/gcubeloggedin/client/ui/AboutView.java        |  3 ++-
 .../user/gcubeloggedin/server/LoggedinServiceImpl.java |  3 ++-
 src/main/webapp/GCubeLoggedin.css                      | 10 ++++++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9abc508..7c275b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,19 +80,16 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>custom-portal-handler</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
 			<artifactId>portal-manager</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -108,7 +105,6 @@
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -119,7 +115,6 @@
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>${liferay.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -137,7 +132,6 @@
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>util-java</artifactId>
-			<version>${liferay.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
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