Feature #11900, Revise email templates to not be intercepted by MailScanner

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/email-templates-library@169413 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2018-06-25 10:23:23 +00:00
parent 397a167b08
commit 078dfc1087
7 changed files with 395 additions and 114 deletions

View File

@ -1,5 +1,8 @@
<ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
<Changeset component=" org.gcube.portal.mailing.email-templates-library.1-3-0" date="2018-06-25">
<Change>Feature #11900, Revise email templates to not be intercepted by MailScanner</Change>
</Changeset>
<Changeset component=" org.gcube.portal.mailing.email-templates-library.1-1-0" date="2017-11-29">
<Change>Invite email template revised to support double step in case of user registration</Change>
</Changeset>

View File

@ -10,7 +10,7 @@
<groupId>org.gcube.portal.mailing</groupId>
<artifactId>email-templates-library</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>email-templates-library</name>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2,8 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Title</title>
<style>
.wrapper {
@ -1354,10 +1354,7 @@ body.outlook p {
table.button.small-expand center,
table.button.small-expanded center {
min-width: 0; } }
</style>
<style>
body,
html,
.body {
@ -1435,7 +1432,7 @@ body.outlook p {
</tbody>
</table>
<p class="lead">Dear {{GATEWAY_NAME}} user,</p>
<p>Wednesday, November 29th from 2:00pm to 4:00pm CET some services including Workspace, Social applications and Data Miner may be temporarily unavailable for a short time. </p>
<p>Wednesday, April 4th from 2:00pm to 4:00pm CEST some services including Workspace, Social applications and Data Miner may be temporarily unavailable for a short time. </p>
<p>
We appreciate your patience and understanding. <span style="text-decoration: underline;">We will make every effort to minimize any downtime associated with this maintenance.</span>
</p>
@ -1449,7 +1446,7 @@ body.outlook p {
<table class="callout">
<tr>
<th class="callout-inner warning">
<p>Duration: Wednesday (11/29) from 2:00pm CET to 4:00pm CET some services may be temporarily unavailable for a short time.</p>
<p>Duration: Wednesday (04/04) from 2:00pm CEST to 4:00pm CEST some services may be temporarily unavailable for a short time.</p>
</th>
<th class="expander"></th>
</tr>

View File

@ -2,10 +2,10 @@
----------------------------------
Dear {{GATEWAY_NAME}} user,
Tomorrow, December 19th from 2:00pm to 6:00pm CET some services including Workspace and Social and Data Miner applications may be temporarily unavailable for a short time.
Wednesday, April 4th from 2:00pm to 6:00pm CEST some services including Workspace and Data Miner applications may be temporarily unavailable for a short time.
We appreciate your patience and understanding.
Motivation: D4Science infrastructure upgrade to gCube 4.9.0
Motivation: D4Science infrastructure upgrade to gCube 4.11.0
We will make every effort to minimize any downtime associated with this maintenance.

View File

@ -1,108 +1,388 @@
<!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">
<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="-moz-box-sizing: border-box; -ms-text-size-adjust: 100%; -webkit-box-sizing: border-box; -webkit-text-size-adjust: 100%; Margin: 0; box-sizing: border-box; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; min-width: 100%; padding: 0; text-align: left; width: 100% !important">
<style>
@media only screen {
html {
min-height: 100%;
background: #f3f3f3
}
}
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width">
<title>Title</title>
@media only screen and (max-width:596px) {
.small-float-center {
margin: 0 auto !important;
float: none !important;
text-align: center !important
}
.small-text-center {
text-align: center !important
}
.small-text-left {
text-align: left !important
}
.small-text-right {
text-align: right !important
}
}
</head>
@media only screen and (max-width:596px) {
.hide-for-large {
display: block !important;
width: auto !important;
overflow: visible !important;
max-height: none !important;
font-size: inherit !important;
line-height: inherit !important
}
}
<body>
<table class="body" data-made-with-foundation="">
<tr>
<td class="float-center" align="center" valign="top">
<center data-parsed="">
<table align="center" class="wrapper header float-center">
<tr>
<td class="wrapper-inner">
<table align="center" class="container">
<tbody>
<tr>
<td>
<table class="row collapse">
<tbody>
<tr>
<th class="small-6 large-6 columns first">
<table>
<tr>
<th> <img src="{{GATEWAY_LOGO:URL}}" style="width:200px;" alt="{{GATEWAY_NAME}}" title="{{GATEWAY_NAME}}"/> </th>
</tr>
</table>
</th>
<th class="small-6 large-6 columns last">
<table>
<tr>
<th>
<p class="text-right"></p>
</th>
</tr>
</table>
</th>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
<table align="center" class="container body-border float-center">
<tbody>
<tr>
<td>
<table class="row">
<tbody>
<tr>
<th class="small-12 large-12 columns first last">
<table>
<tr>
<h1>Hi {{INVITED_USER_NAME}},</h1>
<p class="lead"> {{INVITING_USER_FULLNAME}} has invited you to {{SELECTED_VRE_NAME}}, you can find a brief description below:</p>
<p>{{SELECTED_VRE_DESCRIPTION}}</p>
<p class="lead">If you wish to accept the invite <a href="{{ACCEPT_INVITE_URL}}">Click Here</a></p>
</tr>
</table>
</th>
</tr>
</tbody>
</table>
<table class="callout">
<tr>
<th class="callout-inner warning">
<p>If the button above does not work copy and paste this URL in your browser to accept the invite: {{ACCEPT_INVITE_URL}}</p>
</th>
<th class="expander"></th>
</tr>
@media only screen and (max-width:596px) {
table.body table.container .hide-for-large, table.body table.container .row.hide-for-large
{
display: table !important;
width: 100% !important
}
}
@media only screen and (max-width:596px) {
table.body table.container .callout-inner.hide-for-large {
display: table-cell !important;
width: 100% !important
}
}
@media only screen and (max-width:596px) {
table.body table.container .show-for-large {
display: none !important;
width: 0;
mso-hide: all;
overflow: hidden
}
}
@media only screen and (max-width:596px) {
table.body img {
width: auto;
height: auto
}
table.body center {
min-width: 0 !important
}
table.body .container {
width: 95% !important
}
table.body .column, table.body .columns {
height: auto !important;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-left: 16px !important;
padding-right: 16px !important
}
table.body .column .column, table.body .column .columns, table.body .columns .column,
table.body .columns .columns {
padding-left: 0 !important;
padding-right: 0 !important
}
table.body .collapse .column, table.body .collapse .columns {
padding-left: 0 !important;
padding-right: 0 !important
}
td.small-1, th.small-1 {
display: inline-block !important;
width: 8.33333% !important
}
td.small-2, th.small-2 {
display: inline-block !important;
width: 16.66667% !important
}
td.small-3, th.small-3 {
display: inline-block !important;
width: 25% !important
}
td.small-4, th.small-4 {
display: inline-block !important;
width: 33.33333% !important
}
td.small-5, th.small-5 {
display: inline-block !important;
width: 41.66667% !important
}
td.small-6, th.small-6 {
display: inline-block !important;
width: 50% !important
}
td.small-7, th.small-7 {
display: inline-block !important;
width: 58.33333% !important
}
td.small-8, th.small-8 {
display: inline-block !important;
width: 66.66667% !important
}
td.small-9, th.small-9 {
display: inline-block !important;
width: 75% !important
}
td.small-10, th.small-10 {
display: inline-block !important;
width: 83.33333% !important
}
td.small-11, th.small-11 {
display: inline-block !important;
width: 91.66667% !important
}
td.small-12, th.small-12 {
display: inline-block !important;
width: 100% !important
}
.column td.small-12, .column th.small-12, .columns td.small-12, .columns th.small-12
{
display: block !important;
width: 100% !important
}
table.body td.small-offset-1, table.body th.small-offset-1 {
margin-left: 8.33333% !important;
Margin-left: 8.33333% !important
}
table.body td.small-offset-2, table.body th.small-offset-2 {
margin-left: 16.66667% !important;
Margin-left: 16.66667% !important
}
table.body td.small-offset-3, table.body th.small-offset-3 {
margin-left: 25% !important;
Margin-left: 25% !important
}
table.body td.small-offset-4, table.body th.small-offset-4 {
margin-left: 33.33333% !important;
Margin-left: 33.33333% !important
}
table.body td.small-offset-5, table.body th.small-offset-5 {
margin-left: 41.66667% !important;
Margin-left: 41.66667% !important
}
table.body td.small-offset-6, table.body th.small-offset-6 {
margin-left: 50% !important;
Margin-left: 50% !important
}
table.body td.small-offset-7, table.body th.small-offset-7 {
margin-left: 58.33333% !important;
Margin-left: 58.33333% !important
}
table.body td.small-offset-8, table.body th.small-offset-8 {
margin-left: 66.66667% !important;
Margin-left: 66.66667% !important
}
table.body td.small-offset-9, table.body th.small-offset-9 {
margin-left: 75% !important;
Margin-left: 75% !important
}
table.body td.small-offset-10, table.body th.small-offset-10 {
margin-left: 83.33333% !important;
Margin-left: 83.33333% !important
}
table.body td.small-offset-11, table.body th.small-offset-11 {
margin-left: 91.66667% !important;
Margin-left: 91.66667% !important
}
table.body table.columns td.expander, table.body table.columns th.expander
{
display: none !important
}
table.body .right-text-pad, table.body .text-pad-right {
padding-left: 10px !important
}
table.body .left-text-pad, table.body .text-pad-left {
padding-right: 10px !important
}
table.menu {
width: 100% !important
}
table.menu td, table.menu th {
width: auto !important;
display: inline-block !important
}
table.menu.small-vertical td, table.menu.small-vertical th, table.menu.vertical td,
table.menu.vertical th {
display: block !important
}
table.menu[align=center] {
width: auto !important
}
table.button.small-expand, table.button.small-expanded {
width: 100% !important
}
table.button.small-expand table, table.button.small-expanded table {
width: 100%
}
table.button.small-expand table a, table.button.small-expanded table a {
text-align: center !important;
width: 100% !important;
padding-left: 0 !important;
padding-right: 0 !important
}
table.button.small-expand center, table.button.small-expanded center {
min-width: 0
}
}
</style>
<table class="body" data-made-with-foundation=""
style="Margin: 0; background: #f3f3f3; border-collapse: collapse; border-spacing: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; height: 100%; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<td class="float-center" align="center" valign="top"
style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0 auto; border-collapse: collapse !important; color: #0a0a0a; float: none; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; hyphens: auto; line-height: 1.3; margin: 0 auto; padding: 0; text-align: center; vertical-align: top; word-wrap: break-word"><center
data-parsed="" style="min-width:580px;width:100%">
<table align="center" class="wrapper header float-center"
style="Margin: 0 auto; border-collapse: collapse; border-spacing: 0; float: none; margin: 0 auto; padding: 0; text-align: center; vertical-align: top; width: 100%">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<td class="wrapper-inner"
style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word"><table
align="center" class="container"
style="Margin: 0 auto; background: #fefefe; border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: inherit; vertical-align: top; width: 580px">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<td
style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word"><table
class="row collapse"
style="border-collapse: collapse; border-spacing: 0; display: table; padding: 0; position: relative; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr
style="padding: 0; text-align: left; vertical-align: top">
<th class="small-6 large-6 columns first"
style="Margin: 0 auto; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 0; padding-bottom: 16px; padding-left: 0; padding-right: 0; text-align: left; width: 298px"><table
style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr
style="padding: 0; text-align: left; vertical-align: top">
<th
style="Margin: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left"><img
src="{{GATEWAY_LOGO:URL}}"
style="-ms-interpolation-mode: bicubic; clear: both; display: block; max-width: 100%; outline: 0; text-decoration: none; width: 200px"
alt="{{GATEWAY_NAME}}" title="{{GATEWAY_NAME}}"></th>
</tr>
</tbody>
</table></th>
<th class="small-6 large-6 columns last"
style="Margin: 0 auto; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 0; padding-bottom: 16px; padding-left: 0; padding-right: 0; text-align: left; width: 298px"><table
style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr
style="padding: 0; text-align: left; vertical-align: top">
<th
style="Margin: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left"><p
class="text-right"
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: right"></p></th>
</tr>
</tbody>
</table></th>
</tr>
</tbody>
</table></td>
</tr>
</tbody>
</table></td>
</tr>
</tbody>
</table>
<center data-parsed="">
<table align="center" class="menu float-center">
<tr>
<td>
<table>
<tr>
<th class="menu-item float-center"><a href="{{GATEWAY_URL}}/terms-of-use">{{GATEWAY_NAME}} Terms of Use</a></th>
<th class="menu-item float-center"><a href="https://www.iubenda.com/privacy-policy/441050">Privacy</a></th>
<th class="menu-item float-center"><a href="https://www.d4science.org">About D4Science</a></th>
</tr>
</table>
</td>
</tr>
</table>
</center>
</td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
</table>
</body>
<table align="center" class="container body-border float-center"
style="Margin: 0 auto; background: #fefefe; border-collapse: collapse; border-spacing: 0; float: none; margin: 0 auto; padding: 0; text-align: center; vertical-align: top; width: 580px">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<td
style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word"><table
class="row"
style="border-collapse: collapse; border-spacing: 0; display: table; padding: 0; position: relative; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<th class="small-12 large-12 columns first last"
style="Margin: 0 auto; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 0; padding-bottom: 16px; padding-left: 16px; padding-right: 16px; text-align: left; width: 564px"><h1
style="Margin: 0; Margin-bottom: 10px; color: inherit; font-family: Helvetica, Arial, sans-serif; font-size: 34px; font-weight: 400; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left; word-wrap: normal">Hi
{{INVITED_USER_NAME}},</h1>
<p class="lead"
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: 400; line-height: 1.6; margin: 0; margin-bottom: 10px; padding: 0; text-align: left">{{INVITING_USER_FULLNAME}}
has invited you to {{SELECTED_VRE_NAME}}, you can find a
brief description below:</p>
<p
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left">{{SELECTED_VRE_DESCRIPTION}}</p>
<p class="lead"
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: 400; line-height: 1.6; margin: 0; margin-bottom: 10px; padding: 0; text-align: left">If
you wish to accept the invite please Click the link below:</p>
<p
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left">
<a href="{{ACCEPT_INVITE_URL}}"
style="Margin: 0; color: #2199e8; font-family: Helvetica, Arial, sans-serif; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none">{{ACCEPT_INVITE_URL}}</a>
</p>
<table
style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%">
<tbody>
<tr
style="padding: 0; text-align: left; vertical-align: top"></tr>
</tbody>
</table></th>
</tr>
</tbody>
</table>
<table class="callout"
style="Margin-bottom: 16px; border-collapse: collapse; border-spacing: 0; margin-bottom: 16px; padding: 0; text-align: left; vertical-align: top">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<th class="callout-inner warning"
style="Margin: 0; background: #fff3d9; border: 1px solid #996800; color: #fefefe; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; padding: 10px; text-align: left; width: 100%"><p
style="Margin: 0; Margin-bottom: 10px; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left">If
the link above does not work copy and paste this URL in
your browser to accept the invite: {{ACCEPT_INVITE_URL}}</p></th>
<th class="expander"
style="Margin: 0; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0; padding: 0 !important; text-align: left; visibility: hidden; width: 0"></th>
</tr>
</tbody>
</table>
<center data-parsed="" style="min-width:580px;width:100%">
<table align="center" class="menu float-center"
style="Margin: 0 auto; border-collapse: collapse; border-spacing: 0; float: none; margin: 0 auto; padding: 0; text-align: center; vertical-align: top; width: auto !important">
<tbody>
<tr style="padding: 0; text-align: left; vertical-align: top">
<td
style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #0a0a0a; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word"><table
style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top">
<tbody>
<tr
style="padding: 0; text-align: left; vertical-align: top">
<th class="menu-item float-center"
style="Margin: 0 auto; color: #0a0a0a; float: none; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 10px; padding-right: 10px; text-align: center"><a
href="{{GATEWAY_URL}}/terms-of-use"
style="Margin: 0; color: #2199e8; font-family: Helvetica, Arial, sans-serif; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none">{{GATEWAY_NAME}}
Terms of Use</a></th>
<th class="menu-item float-center"
style="Margin: 0 auto; color: #0a0a0a; float: none; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 10px; padding-right: 10px; text-align: center"><a
href="https://www.iubenda.com/privacy-policy/441050"
style="Margin: 0; color: #2199e8; font-family: Helvetica, Arial, sans-serif; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none">Privacy</a></th>
<th class="menu-item float-center"
style="Margin: 0 auto; color: #0a0a0a; float: none; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400; line-height: 1.3; margin: 0 auto; padding: 10px; padding-right: 10px; text-align: center"><a
href="https://www.d4science.org"
style="Margin: 0; color: #2199e8; font-family: Helvetica, Arial, sans-serif; font-weight: 400; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none">About
D4Science</a></th>
</tr>
</tbody>
</table></td>
</tr>
</tbody>
</table>
</center></td>
</tr>
</tbody>
</table>
</center></td>
</tr>
</tbody>
</table>
</body>
</html>