Modified text to make evident you can create an account via SSO

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/accept-invite-portlet@181902 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -15,6 +15,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

.settings/org.eclipse.jdt.core.prefs

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.component

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="accept-invite-portlet-portlet">
+    <wb-module deploy-name="accept-invite-portlet">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="email-templates-library-1.2.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/email-templates-library/email-templates-library">
+        <dependent-module archiveName="invites-common-library-1.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/invites-common-library/invites-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="email-templates-library-1.4.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/email-templates-library/email-templates-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="accept-invite-portlet"/>

distro/changelog.xml

@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.accept-invite.1-2-0"
+		date="2019-08-10">
+			<Change>Modified text to make evident you can create an account via SSO
+			</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.accept-invite.1-1-0"
 		date="2018-02-22">
 			<Change>The created account now automatic set email as verified

pom.xml

@@ -13,7 +13,7 @@
 	<artifactId>accept-invite-portlet</artifactId>
 	<packaging>war</packaging>
 	<name>accept-invite-portlet Portlet</name>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<description>
 		accept-invite-portlet manage the sent invitations
 		</description>

src/main/webapp/WEB-INF/jsp/view.jsp

@@ -6,6 +6,7 @@
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui"%>
 <%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%>
 <%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
+<%@ page import="java.net.URLEncoder"%>
 
 <portlet:defineObjects />
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
@@ -42,6 +43,13 @@
 		}
 	});
 </script>
+
+<%
+	String academicRedirectURL = request.getAttribute("landingPage") + "/explore?" + InvitesManager.SITEID_ATTR
+			+ "=" + request.getAttribute("groupId");
+    pageContext.setAttribute("academicRedirectURL", academicRedirectURL);
+%>
+
 <div id="errorDiv" style="display: none;" class="alert alert-error">
 	<button type="button" class="close" data-dismiss="alert">&times;</button>
 	<h1>Oh snap! You got an error</h1>
@@ -51,9 +59,11 @@
 	to ask for D4Science Help Desk support. <br> <br />
 </div>
 
-<div id="successDiv"  style="display: none;" class="alert alert-success">
+<div id="successDiv" style="display: none;" class="alert alert-success">
 	<h1>Well done!</h1>
-	Your account has been successfully created! You will now be asked to sign in using your yet created account. Please, click on the button below to continue.
+	Your account has been successfully created! You will now be asked to
+	sign in using your yet created account. Please, click on the button
+	below to continue.
 	<%
 		String acceptInviteURL = request.getAttribute("landingPage") + "/explore?" + InvitesManager.SITEID_ATTR
 				+ "=" + request.getAttribute("groupId");
@@ -67,27 +77,24 @@
 	</p>
 </div>
 <div id="formCreateAccountWrapper">
-	<h1>
+	<p>
-		Hello
+		<span class="lead"> <b>Hello <c:out escapeXml="true"
-		<c:out escapeXml="true" value="${invitedUser.firstName}" />
+					value="${invitedUser.firstName}" /> !
-		!<br>
+		</b>You received an invitation from <c:out escapeXml="true"
-	</h1>
+				value="${inviteInstance.senderFullName}" /> to join <a
-	<p class="lead">
-		You have recently received an invitation from
-		<c:out escapeXml="true" value="${inviteInstance.senderFullName}" />
-		to join the <a
 			href="/web<c:out escapeXml="true" value="${vreFriendlyURL}" />"
-			target="_blank"><c:out escapeXml="true" value="${vreName}" /></a>
+			target="_blank"><c:out escapeXml="true" value="${vreName}" /></a>.
-		Virtual Research Environment. <img id="loadingAjaxCallback"
+		</span>
-			style="display: none;"
+	</p>
+	<p class="lead">
+		<img id="loadingAjaxCallback" style="display: none;"
 			src="<%=renderRequest.getContextPath()%>/images/loader.gif" />
 		<c:choose>
 			<c:when test="${empty invitedUser}">
-				<br />
+			
-				<span style="font-style: italic;">Please note</span>: the invite is valid for your email <a
+				To accept the invite, you can choose to create a new account by filling in the information below or 
-					href="mailto:<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />">
+				<a href="${academicRedirectURL}">sign up with your
-					<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />
+					academic/social account</a>.
-				</a> only. To accept the invite, please fill in the information below:
         <br />
 
 				<div class="container-fluid">
@@ -119,13 +126,23 @@
 						</div>
 					</div>
 				</div>
-
+				<p><br />
+					<c:if test="${empty invitedUser}">
+						<span><b>Please note</b>: this invite is only valid for
+							your email <a
+							href="mailto:<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />">
+								<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />
+						</a>. If you own a <a
+							href="https://services.d4science.org/thematic-gateways"
+							target="_blank">D4Science account</a> or are willing to use a different email, please ask to get the invite by a different email. </span>
+				</p>
+				</c:if>
 			</c:when>
 			<c:otherwise>
     This invite is valid for your email <a
 					href="mailto:<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />">
 					<c:out escapeXml="true" value="${inviteInstance.invitedEmail}" />
-				</a> only, you will be asked to enter your password associated to it on this portal. 
+				</a> only, please click the button below and login with your credentials. 
  
  <%
 					String exploreURL = request.getAttribute("landingPage") + "/explore?" + InvitesManager.SITEID_ATTR