mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-22 14:17:57 +01:00
Minor fix.
This commit is contained in:
Paulo Gustavo Veiga
parent
35346bfba2
commit
9836ffdecf
@ -57,7 +57,9 @@ final public class NotificationService {
|
|||||||
model.put("message", "message");
|
model.put("message", "message");
|
||||||
model.put("ownerName", user.getFirstname());
|
model.put("ownerName", user.getFirstname());
|
||||||
model.put("mapEditUrl", baseUrl + "/c/maps/" + mindmap.getId() + "/edit");
|
model.put("mapEditUrl", baseUrl + "/c/maps/" + mindmap.getId() + "/edit");
|
||||||
model.put("baseUrl", baseUrl);
|
model.put("baseUrl", formMail);
|
||||||
|
model.put("senderMail", user.getEmail());
|
||||||
|
|
||||||
|
|
||||||
mailer.sendEmail(formMail, collabEmail, subject, model, "newCollaboration.vm");
|
mailer.sendEmail(formMail, collabEmail, subject, model, "newCollaboration.vm");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@ -68,7 +68,7 @@ public class UserServiceImpl
|
|||||||
model.put("user", user);
|
model.put("user", user);
|
||||||
model.put("password", password);
|
model.put("password", password);
|
||||||
|
|
||||||
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Recovery Password", model, "recoveryMail.vm");
|
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Recovery Password", model, "passwordRecovery.vm");
|
||||||
} else {
|
} else {
|
||||||
throw new InvalidUserEmailException("The email '" + email + "' does not exists.");
|
throw new InvalidUserEmailException("The email '" + email + "' does not exists.");
|
||||||
}
|
}
|
||||||
@ -134,8 +134,6 @@ public class UserServiceImpl
|
|||||||
model.put("emailcheck", activationUrl);
|
model.put("emailcheck", activationUrl);
|
||||||
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,
|
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,
|
||||||
"confirmationMail.vm");
|
"confirmationMail.vm");
|
||||||
mailer.sendEmail(mailer.getRegistrationEmail(), mailer.getRegistrationEmail(), "Wisemapping : New User", model,
|
|
||||||
"activeUserAccountMail.vm");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void changePassword(User user) {
|
public void changePassword(User user) {
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
<html>
|
|
||||||
<body>
|
|
||||||
<h3>We have a new User !!</h3>
|
|
||||||
<p>
|
|
||||||
Id: ${user.id} <br/>
|
|
||||||
First Name: ${user.firstname} <br/>
|
|
||||||
Last Name: ${user.lastname} <br/>
|
|
||||||
Username: ${user.username} <br/>
|
|
||||||
Email: ${user.email} <br/>
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,32 +1,41 @@
|
|||||||
<html>
|
<html>
|
||||||
<body>
|
<body>
|
||||||
<div style="background-color: #fbeed5; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
|
<div style="background-color: #fbeed5; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
|
||||||
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
|
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
|
||||||
<table style="display: inline;width: 100%;">
|
<table style="display: inline;width: 100%;">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td height="50px" width="2px" style="padding: 0; padding-right: 5px; text-align:center">
|
<td height="50px" width="2px"
|
||||||
<a href="${baseUrl}">
|
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
|
||||||
<img style="border: 0;margin-top: 10px;"
|
<a href="${baseUrl}">
|
||||||
src="${baseUrl}/images/logo-small.png"
|
<img style="border: 0;margin-top: 10px;"
|
||||||
alt="WiseMapping Log"/>
|
src="${baseUrl}/images/logo-small.png"
|
||||||
|
alt="WiseMapping Log"/>
|
||||||
|
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td valign="bottom" height="32px" style="padding: 0;">I've shared <a href='${mapEditUrl}'>
|
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">I've shared <a
|
||||||
${mindmap.title}</a> mindmap with you.
|
href='${mapEditUrl}'>
|
||||||
</td>
|
${mindmap.title}</a> mindmap with you.
|
||||||
</tr>
|
</td>
|
||||||
</tbody>
|
</tr>
|
||||||
</table>
|
</tbody>
|
||||||
</div>
|
</table>
|
||||||
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 150px">
|
</div>
|
||||||
#if( ! $message )
|
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
|
||||||
<p>${message}</p>
|
#if( ! $message )
|
||||||
#end
|
<p>${message}</p>
|
||||||
<p>Click to open: <a href="${mapEditUrl}">${mindmap.title}</a></p>
|
#end
|
||||||
<span style="color: #898989;">WiseMapping makes easy to create, store and share online mindmap. </span>
|
<p>Click to open: <a href="${mapEditUrl}">${mindmap.title}</a></p>
|
||||||
|
<br/>
|
||||||
|
|
||||||
|
<p style="color: #898989;">Do you have a WiseMapping account ?. Don't worry, you can create an account for
|
||||||
|
free. </p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p style="font-size: 13px;font-family: Arial, sans-serif">Important: Do not reply this email. If
|
||||||
|
you need to contact mindmap sender, you can send an email clicking <a href="mailto:${senderMail}">here</a>.
|
||||||
|
</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@ -1,21 +1,23 @@
|
|||||||
<html>
|
<html>
|
||||||
<body>
|
<body style="font-family: Arial, sans-serif; color: #000;">
|
||||||
<p>
|
<p>
|
||||||
Hi,
|
Hi,
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Thank you so much for your interest in WiseMapping. Your subscription was a success! If you have any questions or have any feedback, please don't hesitate to reply to this email, or use the on line form. We'd love to hear from you.
|
Thank you so much for your interest in WiseMapping. Your subscription was a success! If you have any questions or
|
||||||
|
have any feedback, please don't hesitate to reply to this email, or use the on line form. We'd love to hear from
|
||||||
|
you.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Since we are currently in "private beta" phase, we are inviting people from the list you just signed up for every day. So sit tight because you might be the next one.
|
For questions or concerns regarding your account, send us an email to ${supportEmail}.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
For questions or concerns regarding your account, send us an email to support@wisemapping.com.
|
Cheers, <br/>
|
||||||
</p>
|
The WiseMapping Team.
|
||||||
<p>
|
<a href="${baseUrl}">WiseMapping Site</a>
|
||||||
Cheers, <br/>
|
|
||||||
The WiseMapping Team.
|
|
||||||
<a href="http://www.wisemapping.com">WiseMapping Site</a>
|
|
||||||
</p>
|
</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
Loading…
Reference in New Issue
Block a user