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() { }); }); -

Hello!

+

+ Hello + !
+

- You have recently received an invitation from - - to join the - " target="_blank"> Virtual Research Environment. -This invite is valid for the email address: - "> - only. - - - - var1 is empty or null. + You have recently received an invitation from + + to join the " + target="_blank"> + Virtual Research Environment. + + + var1 is empty or null.landingPage
-
- -

- If you already have a D4Science account click here: -

- - + + + This invite is valid for your email "> + + only, you will be asked to enter your password associated to it on this portal. + <% String exploreURL = request.getAttribute("landingPage") + "/explore?" + InvitesManager.SITEID_ATTR+"="+request.getAttribute("groupId");%> +

+ +

+
+ +


diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml index 843bdc9..7909049 100644 --- a/src/main/webapp/WEB-INF/liferay-display.xml +++ b/src/main/webapp/WEB-INF/liferay-display.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties index 39ebf86..c297e79 100644 --- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties +++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties @@ -4,6 +4,6 @@ module-incremental-version=1 tags= short-description= change-log= -page-url=http://www.liferay.com -author=Liferay, Inc. -licenses=LGPL \ No newline at end of file +page-url=http://www.gcube-system.org +author=M. Assante +licenses=EUPL \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml index c7ab88b..49d51fd 100644 --- a/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -7,7 +7,6 @@ /icon.png false /css/main.css - https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js /js/main.js