diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java index b8a648f..3f12323 100644 --- a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java +++ b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java @@ -15,7 +15,6 @@ package org.gcube.portlets.user.acceptinvite; import java.io.IOException; -import javax.portlet.PortalContext; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.ResourceRequest; @@ -23,6 +22,7 @@ import javax.portlet.ResourceResponse; import javax.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Base64; +import org.gcube.common.portal.PortalContext; import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; import org.gcube.portal.databook.shared.Invite; @@ -130,6 +130,7 @@ public class PortletViewController { model.addAttribute("vreName", site.getName()); model.addAttribute("vreFriendlyURL", site.getFriendlyURL()); model.addAttribute("groupId", site.getGroupId()); + model.addAttribute("landingPage", PortalContext.getConfiguration().getSiteLandingPagePath(httpReq)); return PAGE_INVITE_PROCESS; } diff --git a/src/main/webapp/WEB-INF/jsp/view.jsp b/src/main/webapp/WEB-INF/jsp/view.jsp index 7db95a2..4247d43 100644 --- a/src/main/webapp/WEB-INF/jsp/view.jsp +++ b/src/main/webapp/WEB-INF/jsp/view.jsp @@ -1,6 +1,7 @@ <%@ page contentType="text/html" pageEncoding="UTF-8"%> <%@ page import="javax.portlet.*"%> <%@ page import="org.gcube.common.portal.*"%> +<%@ page import=" org.gcube.portal.invites.InvitesManager"%> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%> <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui"%> <%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%> @@ -32,29 +33,36 @@ $( "#country" ).change(function() { }); }); -
- You have recently received an invitation from
-
- If you already have a D4Science account click here:
-
+
+
-