litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2299 Improve the way Email templates are handled - specify HTML and plain text in the same template. Refine the EmailDirective to permit optional parameters.

Browse source
This commit is contained in:
j2blake 2011-06-15 18:23:07 +00:00
parent d42acf48d8
commit 5d587265fa
20 changed files with 237 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

20
webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail-text.ftl
View file

@ -1,20 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that an account has been created. -->
${userAccount.firstName} ${userAccount.lastName}
Congratulations!
We have created your new VIVO account associated with
${userAccount.emailAddress}.
If you did not request this new account you can safely ignore this email.
This request will expire if not acted upon for 30 days.
Paste the link below into your browser's address bar to create your password
for your new account using our secure server.
${passwordLink}
Thanks!

29
webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail-html.ftl → webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
View file

@ -2,9 +2,12 @@
<#-- Confirmation that an account has been created. -->
<#assign subject = "Your VIVO account has been created." />
<#assign html>
<html>
<head>
<title>${subjectLine}</title>
<title>${subject}</title>
</head>
<body>
<p>
@ -40,4 +43,26 @@
Thanks!
</p>
</body>
</html>
</html>
</#assign>
<#assign text>
${userAccount.firstName} ${userAccount.lastName}
Congratulations!
We have created your new VIVO account associated with
${userAccount.emailAddress}.
If you did not request this new account you can safely ignore this email.
This request will expire if not acted upon for 30 days.
Paste the link below into your browser's address bar to create your password
for your new account using our secure server.
${passwordLink}
Thanks!
</#assign>
<@email subject=subject html=html text=text />

10
webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail-text.ftl
View file

@ -1,10 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that the user has changed his email account. -->
Hi, ${userAccount.firstName} ${userAccount.lastName}
You recently changed the email address associated with
${userAccount.firstName} ${userAccount.lastName}
Thank you.

19
webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail-html.ftl → webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
View file

@ -2,9 +2,12 @@
<#-- Confirmation that the user has changed his email account. -->
<#assign subject = "Your VIVO email account has been changed." />
<#assign html>
<html>
<head>
<title>${subjectLine}</title>
<title>${subject}</title>
</head>
<body>
<p>
@ -20,4 +23,16 @@
Thank you.
</p>
</body>
</html>
</html>
</#assign>
<#assign text>
Hi, ${userAccount.firstName} ${userAccount.lastName}
You recently changed the email address associated with
${userAccount.firstName} ${userAccount.lastName}
Thank you.
</#assign>
<@email subject=subject html=html text=text />

12
webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail-text.ftl
View file

@ -1,12 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that an account has been created for an externally-authenticated user. -->
${userAccount.firstName} ${userAccount.lastName}
Congratulations!
We have created your new VIVO account associated with
${userAccount.emailAddress}.
Thanks!

21
webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail-html.ftl → webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
View file

@ -2,9 +2,12 @@
<#-- Confirmation that an account has been created for an externally-authenticated user. -->
<#assign subject = "Your VIVO account has been created." />
<#assign html>
<html>
<head>
<title>${subjectLine}</title>
<title>${subject}</title>
</head>
<body>
<p>
@ -23,4 +26,18 @@
Thanks!
</p>
</body>
</html>
</html>
</#assign>
<#assign text>
${userAccount.firstName} ${userAccount.lastName}
Congratulations!
We have created your new VIVO account associated with
${userAccount.emailAddress}.
Thanks!
</#assign>
<@email subject=subject html=html text=text />

12
webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail-text.ftl
View file

@ -1,12 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that a password has been created. -->
${userAccount.firstName} ${userAccount.lastName}
Password successfully created.
Your new password associated with ${userAccount.emailAddress}
has been created.
Thank you.

21
webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail-html.ftl → webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
View file

@ -2,9 +2,12 @@
<#-- Confirmation that an password has been created. -->
<#assign subject = "Password successfully created." />
<#assign html>
<html>
<head>
<title>${subjectLine}</title>
<title>${subject}</title>
</head>
<body>
<p>
@ -23,4 +26,18 @@
Thank you.
</p>
</body>
</html>
</html>
</#assign>
<#assign text>
${userAccount.firstName} ${userAccount.lastName}
Password successfully created.
Your new password associated with ${userAccount.emailAddress}
has been created.
Thank you.
</#assign>
<@email subject=subject html=html text=text />

12
webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetEmail-text.ftl
View file

@ -1,12 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that a password has been reset. -->
${userAccount.firstName} ${userAccount.lastName}
Password successfully changed.
Your new password associated with ${userAccount.emailAddress}
has been changed.
Thank you.

21
webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetEmail-html.ftl → webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetEmail.ftl
View file

@ -2,9 +2,12 @@
<#-- Confirmation that a password has been reset. -->
<#assign subject = "Password changed." />
<#assign html>
<html>
<head>
<title>${subjectLine}</title>
<title>${subject}</title>
</head>
<body>
<p>
@ -23,4 +26,18 @@
Thank you.
</p>
</body>
</html>
</html>
</#assign>
<#assign text>
${userAccount.firstName} ${userAccount.lastName}
Password successfully changed.
Your new password associated with ${userAccount.emailAddress}
has been changed.
Thank you.
</#assign>
<@email subject=subject html=html text=text />

40
webapp/web/templates/freemarker/body/accounts/userAccounts-resetPasswordEmail-html.ftl
View file

@ -1,40 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Notification that your password has been reset. -->
<html>
<head>
<title>${subjectLine}</title>
</head>
<body>
<p>
${userAccount.firstName} ${userAccount.lastName}
</p>
<p>
We received a request to reset the password for your account (${userAccount.emailAddress}).
Please follow the instructions below to proceed with your password reset.
</p>
<p>
If you did not request this new account you can safely ignore this email.
This request will expire if not acted upon for 30 days.
</p>
<p>
Click the link below to reset your password using our secure server.
</p>
<p>
<a href="${passwordLink}">${passwordLink}</a>
</p>
<p>
If the link above doesn't work, you can copy and paste the link directly into your browser's address bar.
</p>
<p>
Thank you!
</p>
</body>
</html>

19
webapp/web/templates/freemarker/body/accounts/userAccounts-resetPasswordEmail-text.ftl
View file

@ -1,19 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Notification that your password has been reset. -->
${userAccount.firstName} ${userAccount.lastName}
We received a request to reset the password for your account
(${userAccount.emailAddress}).
Please follow the instructions below to proceed with your password reset.
If you did not request this new account you can safely ignore this email.
This request will expire if not acted upon for 30 days.
Paste the link below into your browser's address bar to reset your password
using our secure server.
${passwordLink}
Thank you!