vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-08-20 04:30:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-14 08:47:23 -03:00
parent 35346bfba2
commit 9836ffdecf
6 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
View File

@ -57,7 +57,9 @@ final public class NotificationService {
model.put("message", "message");
model.put("ownerName", user.getFirstname());
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");
} catch (Exception e) {

4
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@ -68,7 +68,7 @@ public class UserServiceImpl
model.put("user", user);
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 {
throw new InvalidUserEmailException("The email '" + email + "' does not exists.");
}
@ -134,8 +134,6 @@ public class UserServiceImpl
model.put("emailcheck", activationUrl);
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,
"confirmationMail.vm");
mailer.sendEmail(mailer.getRegistrationEmail(), mailer.getRegistrationEmail(), "Wisemapping : New User", model,
"activeUserAccountMail.vm");
}
public void changePassword(User user) {

12
wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm
View File

@ -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>

57
wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm
View File

@ -1,32 +1,41 @@
<html>
<body>
<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;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px" style="padding: 0; padding-right: 5px; text-align:center">
<a href="${baseUrl}">
<img style="border: 0;margin-top: 10px;"
src="${baseUrl}/images/logo-small.png"
alt="WiseMapping Log"/>
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}">
<img style="border: 0;margin-top: 10px;"
src="${baseUrl}/images/logo-small.png"
alt="WiseMapping Log"/>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;">I've shared <a href='${mapEditUrl}'>
${mindmap.title}</a> mindmap with you.
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 150px">
#if( ! $message )
<p>${message}</p>
#end
<p>Click to open: <a href="${mapEditUrl}">${mindmap.title}</a></p>
<span style="color: #898989;">WiseMapping makes easy to create, store and share online mindmap. </span>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">I've shared <a
href='${mapEditUrl}'>
${mindmap.title}</a> mindmap with you.
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
#if( ! $message )
<p>${message}</p>
#end
<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>
<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>
</html>

0
wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm → wise-webapp/src/main/webapp/WEB-INF/classes/mail/passwordRecovery.vm
View File

22
wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm
View File

@ -1,21 +1,23 @@
<html>
<body>
<body style="font-family: Arial, sans-serif; color: #000;">
<p>
Hi,
Hi,
</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>
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>
For questions or concerns regarding your account, send us an email to support@wisemapping.com.
</p>
<p>
Cheers, <br/>
The WiseMapping Team.
<a href="http://www.wisemapping.com">WiseMapping Site</a>
Cheers, <br/>
The WiseMapping Team.
<a href="${baseUrl}">WiseMapping Site</a>
</p>
</body>
</html>