diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java index 173f692a..f46e2f18 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java @@ -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) { diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java index f134eeb3..6fe708d9 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java @@ -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) { diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm deleted file mode 100755 index c253cc84..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/activeUserAccountMail.vm +++ /dev/null @@ -1,12 +0,0 @@ - -
-
- Id: ${user.id}
- First Name: ${user.firstname}
- Last Name: ${user.lastname}
- Username: ${user.username}
- Email: ${user.email}
-
${message}
+ #end +Click to open: ${mindmap.title}
+Do you have a WiseMapping account ?. Don't worry, you can create an account for + free.
+Important: Do not reply this email. If + you need to contact mindmap sender, you can send an email clicking here. +
\ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/passwordRecovery.vm similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/classes/mail/recoveryMail.vm rename to wise-webapp/src/main/webapp/WEB-INF/classes/mail/passwordRecovery.vm diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm index c051db6e..fffefe30 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm @@ -1,21 +1,23 @@ - +- Hi, + Hi,
+-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.
+-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}.
+- For questions or concerns regarding your account, send us an email to support@wisemapping.com. -
-
-Cheers,
-The WiseMapping Team.
-WiseMapping Site
+ Cheers,
+ The WiseMapping Team.
+ WiseMapping Site