From d558bff0ea8b1eab2cd275a9af1b1c8590a32515 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 15 May 2017 09:03:21 +0000 Subject: [PATCH] Added support for template emails git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@148650 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 + distro/changelog.xml | 3 +- pom.xml | 7 +- .../user/joinvre/server/LoginServiceUtil.java | 150 +- src/main/webapp/email_templates/HOWTO.txt | 20 - .../user_has_requested_access.html | 1494 ----------------- 6 files changed, 61 insertions(+), 1616 deletions(-) delete mode 100644 src/main/webapp/email_templates/HOWTO.txt delete mode 100644 src/main/webapp/email_templates/user_has_requested_access.html diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2ff775f..3f9fee0 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/distro/changelog.xml b/distro/changelog.xml index 2b56eae..862fa77 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,6 +1,7 @@ - + Ported to Java8 + Added support for template emails Removed ASL Session diff --git a/pom.xml b/pom.xml index b0504f2..7123284 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user join-vre war - 3.3.1-SNAPSHOT + 3.3.0-SNAPSHOT gCube Join VRE Portlet Display the available VRE to Join @@ -56,6 +56,11 @@ ${gwtVersion} provided + + org.gcube.portal.mailing + email-templates-library + [1.0.0-SNAPSHOT,) + com.google.gwt gwt-dev diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java b/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java index 34c5933..f4aa97b 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/server/LoginServiceUtil.java @@ -1,17 +1,20 @@ package org.gcube.portlets.user.joinvre.server; import java.util.ArrayList; -import java.util.Base64; import java.util.List; import java.util.Map; import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.gcube.common.portal.GCubePortalConstants; import org.gcube.common.portal.PortalContext; import org.gcube.common.portal.mailing.EmailNotification; import org.gcube.portal.databook.shared.Invite; +import org.gcube.portal.mailing.message.Recipient; +import org.gcube.portal.mailing.service.EmailTemplateService; +import org.gcube.portal.mailing.templates.TemplateUserAcceptedInvite; +import org.gcube.portal.mailing.templates.TemplateUserRequestedAccessVRE; +import org.gcube.portal.mailing.templates.TemplateUserSelfRegisteredVRE; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; @@ -34,8 +37,7 @@ public class LoginServiceUtil { * */ public static final String ROOT_ORG = "rootorganization"; - - public static final String MANAGE_USERS_REQUESTS_FRIENDLY_URL = "/manage-user-and-requests"; + /** * */ @@ -97,60 +99,30 @@ public class LoginServiceUtil { public static void addMembershipRequest(String username, String scope, String optionalMessage, HttpServletRequest request) throws Exception{ String gatewayName = PortalContext.getConfiguration().getGatewayName(request); - String portalbasicurl = PortalContext.getConfiguration().getGatewayURL(request); + String gatewayURL = PortalContext.getConfiguration().getGatewayURL(request); _log.info("gatewayName = " + gatewayName + " Message=" + optionalMessage); - - + ArrayList adminEmails = LoginServiceUtil.getAdministratorsEmails(scope); - + ArrayList recipients = new ArrayList<>(); + for (String email : adminEmails) { + recipients.add(new Recipient(email)); + } UserManager um = new LiferayUserManager(); - GCubeUser currUser = um.getUserByUsername(username); - String fullName = currUser.getFullname(); String selectedVRE = scope.substring(scope.lastIndexOf("/")+1, scope.length()); _log.info("Requested MEMBERSHIP for: " + selectedVRE + " scope: " + scope); GroupManager gm = new LiferayGroupManager(); - long gatewayGroupId = gm.getGroupId(gatewayName); + long vreGroupId = gm.getGroupIdFromInfrastructureScope(scope); um.requestMembership(currUser.getUserId(),vreGroupId, optionalMessage); + GCubeGroup theRequestingVRE = gm.getGroup(vreGroupId); - String manageRequestURL = portalbasicurl + GCubePortalConstants.PREFIX_GROUP_URL + "/"+ selectedVRE.toLowerCase() + MANAGE_USERS_REQUESTS_FRIENDLY_URL; - - long vreLogoId = gm.getGroup(vreGroupId).getLogoId(); - String vreLogoURL = portalbasicurl + gm.getGroupLogoURL(vreLogoId); - - long gatewayLogoId = gm.getGroup(gatewayGroupId).getLogoId(); - String gatewayLogoURL = portalbasicurl + gm.getGroupLogoURL(gatewayLogoId); - - StringBuffer body = new StringBuffer(); - - String encodedTemplate = "<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="min-height: 100%; background-color: #f3f3f3 !important;">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <meta name="viewport" content="width=device-width" />
    <title>Title</title>
  </head>
  <body style="width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; background-color: #f3f3f3 !important; margin: 0; padding: 0;" bgcolor="#f3f3f3 !important">
    <table class="body" data-made-with-foundation="" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; background-color: #f3f3f3 !important; height: 100%; width: 100%; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" bgcolor="#f3f3f3 !important"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td class="float-center" align="center" valign="top" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: center; float: none; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0;">
          <center data-parsed="" style="width: 100%; min-width: 580px;">
            <table align="center" class="wrapper header float-center" style="width: 100%; border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; float: none; margin: 0 auto; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td class="wrapper-inner" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                  <table align="center" class="container" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: inherit; width: 580px; background: #fefefe; margin: 0 auto; padding: 0;" bgcolor="#fefefe"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                          <table class="row collapse" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: table; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th class="small-6 large-6 columns first" style="width: 298px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 0 16px;" align="left">
                                  <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left"> <img src="{{GATEWAY_LOGO:URL}}" style="width: 200px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; max-width: 100%; clear: both; display: block;" /></th>
                                    </tr></table></th>
                                <th class="small-6 large-6 columns last" style="width: 298px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 0 16px;" align="left">
                                  <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left">
                                        <p class="text-right" style="text-align: right; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="right">{{GATEWAY_NAME}}</p>
                                      </th>
                                    </tr></table></th>
                              </tr></tbody></table></td>
                      </tr></tbody></table></td>
              </tr></table><table align="center" class="container body-border float-center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; width: 580px; float: none; border-top-width: 8px; border-top-color: #225f97; border-top-style: solid; background: #fefefe; margin: 0 auto; padding: 0;" bgcolor="#fefefe"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left" valign="top">
                    <table class="row" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; position: relative; display: table; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th class="small-12 large-12 columns first last" style="width: 564px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 auto; padding: 0 16px 16px;" align="left">
                            <table style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><th style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left">
                                  <table class="spacer" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td height="32px" style="font-size: 32px; line-height: 32px; word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; mso-line-height-rule: exactly; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; padding: 0;" align="left" valign="top"> </td>
                                      </tr></tbody></table><center data-parsed="" style="width: 100%; min-width: 532px;">  <img src="{{VRE_LOGO:URL}}" style="width: 150px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; max-width: 100%; clear: both; display: block; float: none; text-align: center; margin: 0 auto;" align="center" class="float-center" /></center>
                                  <table class="spacer" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td height="16px" style="font-size: 16px; line-height: 16px; word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; mso-line-height-rule: exactly; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; padding: 0;" align="left" valign="top"> </td>
                                      </tr></tbody></table><p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">You received this email because you are a manager of {{SELECTED_VRE_NAME}}.</p>
                                  <h4 style="color: inherit; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; word-wrap: normal; font-size: 24px; margin: 0 0 10px; padding: 0;" align="left">{{USER_FULLNAME}} would like to access {{SELECTED_VRE_NAME}} VRE,</h4>
                                  
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Further info about {{USER_FULLNAME}}:</p>
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Email: {{USER_EMAIL}}</p>
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Username: {{USER_ID}}</p>
                                  <p style="color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0 0 10px; padding: 0;" align="left">Optional message: {{OPTIONAL_MESSAGE}}</p>
                                  <br /><h4 style="color: inherit; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; word-wrap: normal; font-size: 24px; margin: 0 0 10px; padding: 0;" align="left">Please <a href="{{MANAGE_REQUEST_URL}}" style="color: #2199e8; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; text-decoration: none; margin: 0; padding: 0;">click here</a> to manage this request</h4>
<!--                                   <center data-parsed=""> -->
<!--                                     <table align="center" class="menu float-center"> -->
<!--                                       <tr> -->
<!--                                         <td> -->
<!--                                           <table> -->
<!--                                             <tr> -->
<!--                                               <th class="menu-item float-center"><a href="http://www.d4science.org">D4Science.org website</a></th> -->
<!--                                               <th class="menu-item float-center"><a href="https://twitter.com/d4science">Twitter</a></th> -->
<!--                                               <th class="menu-item float-center"><a href="mailto: support@d4science.org">Contact D4Science</a></th> -->
<!--                                             </tr> -->
<!--                                           </table> -->
<!--                                         </td> -->
<!--                                       </tr> -->
<!--                                     </table> -->
<!--                                   </center> -->
                                </th>
                                <th class="expander" style="visibility: hidden; width: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; text-align: left; line-height: 1.3; font-size: 16px; margin: 0; padding: 0;" align="left"></th>
                              </tr></table></th>
                        </tr></tbody></table><table class="spacer" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: left; width: 100%; padding: 0;"><tbody><tr style="vertical-align: top; text-align: left; padding: 0;" align="left"><td height="16px" style="font-size: 16px; line-height: 16px; word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; vertical-align: top; text-align: left; mso-line-height-rule: exactly; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-weight: normal; margin: 0; padding: 0;" align="left" valign="top"> </td>
                        </tr></tbody></table></td>
                </tr></tbody></table></center>
        </td>
      </tr></table></body>
</html>
"; - /** - * Decoding our HTML and substituting required values. - */ - byte[] base64DecodedData = Base64.getDecoder().decode(encodedTemplate); - - String template = new String(base64DecodedData) - .replace("{{SELECTED_VRE_NAME}}", selectedVRE) - .replace("{{VRE_LOGO:URL}}", vreLogoURL) - .replace("{{GATEWAY_LOGO:URL}}", gatewayLogoURL) - .replace("{{GATEWAY_NAME}}", gatewayName) - .replace("{{MANAGE_REQUEST_URL}}", manageRequestURL) - .replace("{{USER_EMAIL}}", currUser.getEmail()) - .replace("{{USER_ID}}", username) - .replace("{{USER_FULLNAME}}", fullName) - .replace("{{OPTIONAL_MESSAGE}}", optionalMessage); - - body.append(template); - - String[] allMails = new String[adminEmails.size()]; - - adminEmails.toArray(allMails); - - EmailNotification mailToAdmin = new EmailNotification(allMails , "Request for access to VRE " + selectedVRE, body.toString(), request); - - mailToAdmin.sendEmail(); + EmailTemplateService.send( + "Request for access to VRE " + selectedVRE, + new TemplateUserRequestedAccessVRE(currUser, theRequestingVRE, optionalMessage, gatewayName, gatewayURL), + request, + recipients.toArray(new Recipient[recipients.size()])); } /** @@ -161,35 +133,27 @@ public class LoginServiceUtil { public static void notifyUserSelfRegistration(String username, String scope, HttpServletRequest request) throws Exception { ArrayList adminEmails = LoginServiceUtil.getAdministratorsEmails(scope); + ArrayList recipients = new ArrayList<>(); + for (String email : adminEmails) { + recipients.add(new Recipient(email)); + } + LiferayUserManager um = new LiferayUserManager(); GCubeUser currUser = um.getUserByUsername(username); - String name = currUser.getFirstName(); - String lastname = currUser.getLastName(); - String portalbasicurl = PortalContext.getConfiguration().getGatewayURL(request); + String gatewayURL = PortalContext.getConfiguration().getGatewayURL(request); String gatewayName = PortalContext.getConfiguration().getGatewayName(request); - StringBuffer body = new StringBuffer(); - body.append("

Dear manager of "+ scope +",
this email message was automatically generated by " + portalbasicurl +" to inform you that "); - body.append("

").append("

") - .append(""+name + " " + lastname +" has self registered to the following environment: ") - .append("

") - .append("" + scope+"") - .append("
") - .append("
") - .append("Username: " + username) - .append("
") - .append("e-mail: " + currUser.getEmail()) - .append("

") - .append("

") - .append("
" + portalbasicurl) - .append("

"); String[] allMails = new String[adminEmails.size()]; - adminEmails.toArray(allMails); - - EmailNotification mailToAdmin = new EmailNotification(allMails , "[" + gatewayName + "] - Self Registration", body.toString(), request); - - mailToAdmin.sendEmail(); + + String selectedVRE = scope.substring(scope.lastIndexOf("/")+1, scope.length()); + _log.info("NotifyUser Self Registration for: " + selectedVRE + " scope: " + scope); + + EmailTemplateService.send( + "Self Registration to VRE " + selectedVRE, + new TemplateUserSelfRegisteredVRE(currUser, selectedVRE, gatewayName, gatewayURL), + request, + recipients.toArray(new Recipient[recipients.size()])); } @@ -198,44 +162,30 @@ public class LoginServiceUtil { * @param scope . * @param optionalMessage . */ - public static void notifyUserAcceptedInvite(String username, String scope, Invite invite, HttpServletRequest request) throws Exception { - - String portalbasicurl = PortalContext.getConfiguration().getGatewayURL(request); - String gatewayName = PortalContext.getConfiguration().getGatewayName(request); - + public static void notifyUserAcceptedInvite(String username, String scope, Invite invite, HttpServletRequest request) throws Exception { + String gatewayURL = PortalContext.getConfiguration().getGatewayURL(request); + String gatewayName = PortalContext.getConfiguration().getGatewayName(request); ArrayList adminEmails = LoginServiceUtil.getAdministratorsEmails(scope); + ArrayList recipients = new ArrayList<>(); + for (String email : adminEmails) { + recipients.add(new Recipient(email)); + } LiferayUserManager um = new LiferayUserManager(); GCubeUser currUser = um.getUserByUsername(username); - String name = currUser.getFirstName(); - String lastname = currUser.getLastName(); - - - StringBuffer body = new StringBuffer(); - body.append("

Dear manager of "+ scope +",
this email message was automatically generated by " + portalbasicurl +" to inform you that "); - body.append("

") - .append("

") - .append(""+name + " " + lastname +" has accepted an invitation to the following environment: ") - .append("

") - .append("" + scope+"") - .append("
") - .append("
") - .append("Username: " + username) - .append("
") - .append("e-mail: " + currUser.getEmail()) - .append("

") - .append("

") - .append("The invitation was sent by " + invite.getSenderFullName() +" (" + invite.getSenderUserId()+") on " + invite.getTime()+"") - .append("

"); - String[] allMails = new String[adminEmails.size()]; - adminEmails.toArray(allMails); - EmailNotification mailToAdmin = new EmailNotification(allMails , "[" + gatewayName + "] - Accepted Invitation", body.toString(), request); - - mailToAdmin.sendEmail(); + String selectedVRE = scope.substring(scope.lastIndexOf("/")+1, scope.length()); + _log.info("NotifyUser Self Registration for: " + selectedVRE + " scope: " + scope); + + EmailTemplateService.send( + "Accepted Invitation to VRE " + selectedVRE, + new TemplateUserAcceptedInvite(currUser, selectedVRE, invite.getSenderFullName(), invite.getSenderUserId(), gatewayName, gatewayURL), + request, + recipients.toArray(new Recipient[recipients.size()])); } + } diff --git a/src/main/webapp/email_templates/HOWTO.txt b/src/main/webapp/email_templates/HOWTO.txt deleted file mode 100644 index 5358098..0000000 --- a/src/main/webapp/email_templates/HOWTO.txt +++ /dev/null @@ -1,20 +0,0 @@ -STEP 1: - -open link “http://foundation.zurb.com/emails/inliner.html” and paste $yourfile.html code inside the textarea provided. -Click on “Convert Email” button. - -Remove the complete - - - - - - - - - - -
-
- - - - -
- - - - - - -
- - - - - - - -
- - - - -
- 		- - - - -
-

{{GATEWAY_NAME}}

-
-
-
-
- - - - - - -
- - - - - - -
- - - - - -
- - - - - - -
 
-
- - - - - - -
 
-

You received this email because you are a manager of {{SELECTED_VRE_NAME}}.

-

{{USER_FULLNAME}} would like to access {{SELECTED_VRE_NAME}} VRE,

- -

Further info about {{USER_FULLNAME}}:

-

Email: {{USER_EMAIL}}

-

Username: {{USER_ID}}

-

Optional message: {{OPTIONAL_MESSAGE}}

-
-

Please click here to manage this request

- - - - - - - - - - - - - - - -
-
- - - - - - -
 
-
-
-
- - - \ No newline at end of file