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
This commit is contained in:
parent
638c842784
commit
4734c5a829
6
pom.xml
6
pom.xml
|
@ -80,19 +80,16 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.portal</groupId>
|
||||||
<artifactId>custom-portal-handler</artifactId>
|
<artifactId>custom-portal-handler</artifactId>
|
||||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.common.portal</groupId>
|
<groupId>org.gcube.common.portal</groupId>
|
||||||
<artifactId>portal-manager</artifactId>
|
<artifactId>portal-manager</artifactId>
|
||||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>gcube-widgets</artifactId>
|
<artifactId>gcube-widgets</artifactId>
|
||||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -108,7 +105,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.dvos</groupId>
|
<groupId>org.gcube.dvos</groupId>
|
||||||
<artifactId>usermanagement-core</artifactId>
|
<artifactId>usermanagement-core</artifactId>
|
||||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -119,7 +115,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.liferay.portal</groupId>
|
<groupId>com.liferay.portal</groupId>
|
||||||
<artifactId>portal-service</artifactId>
|
<artifactId>portal-service</artifactId>
|
||||||
<version>${liferay.version}</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -137,7 +132,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.liferay.portal</groupId>
|
<groupId>com.liferay.portal</groupId>
|
||||||
<artifactId>util-java</artifactId>
|
<artifactId>util-java</artifactId>
|
||||||
<version>${liferay.version}</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -149,7 +149,7 @@ public class AboutView extends Composite {
|
||||||
|
|
||||||
// show alert block
|
// show alert block
|
||||||
alertBlockOnLeave.setVisible(true);
|
alertBlockOnLeave.setVisible(true);
|
||||||
|
leaveVreButton.setVisible(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -179,6 +179,7 @@ public class AboutView extends Composite {
|
||||||
|
|
||||||
// just hide alertBlock
|
// just hide alertBlock
|
||||||
alertBlockOnLeave.setVisible(false);
|
alertBlockOnLeave.setVisible(false);
|
||||||
|
leaveVreButton.setVisible(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -235,7 +235,8 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi
|
||||||
sendUserUnregisteredNotification(username, getASLSession().getScope(),
|
sendUserUnregisteredNotification(username, getASLSession().getScope(),
|
||||||
PortalContext.getConfiguration().getGatewayURL(getThreadLocalRequest()),
|
PortalContext.getConfiguration().getGatewayURL(getThreadLocalRequest()),
|
||||||
PortalContext.getConfiguration().getGatewayName(getThreadLocalRequest()));
|
PortalContext.getConfiguration().getGatewayName(getThreadLocalRequest()));
|
||||||
return "/";
|
|
||||||
|
return PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -14,3 +14,13 @@ div.gwt-HTML.vre-description {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cancel-leave-button {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cancel-leave-button:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
cursor: hand;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
Loading…
Reference in New Issue