From 35346bfba21897df02e9dc940ce673d517f7a664 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 13 Jun 2012 23:50:21 -0300 Subject: [PATCH] Improve email. --- .../wisemapping/mail/NotificationService.java | 2 +- .../src/main/webapp/WEB-INF/app.properties | 2 +- .../WEB-INF/classes/mail/newCollaboration.vm | 53 +++++++++---------- 3 files changed, 26 insertions(+), 31 deletions(-) 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 c48201ae..173f692a 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,7 @@ 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 + "/c/maps/" + mindmap.getId() + "/edit"); + model.put("baseUrl", baseUrl); mailer.sendEmail(formMail, collabEmail, subject, model, "newCollaboration.vm"); } catch (Exception e) { diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index 204712c4..16257303 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -35,7 +35,7 @@ database.password= mail.smtp.port=587 mail.smtp.host=smtp.gmail.com mail.username=pveiga@gmail.com -mail.password=p0w3rwdgg +mail.password= mail.smtp.auth=true mail.smtp.starttls.enable=true mail.smtp.quitwait=false diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm index 6cd19052..e94f476f 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm @@ -1,37 +1,32 @@
-
- - - - - - - -
- Mindmap - I've shared - ${mindmap.title} mindmap with you. -
-
-
- #if( ! $message ) -

${message}

- #end -

Click to open: ${mindmap.title}

+
+ + + + + + + +
+ + WiseMapping Log - WiseMapping makes it easy to create, store and share online mindmap. + + I've shared + ${mindmap.title} mindmap with you. +
+
+
+ #if( ! $message ) +

${message}

+ #end +

Click to open: ${mindmap.title}

+ WiseMapping makes easy to create, store and share online mindmap. -
- - WiseMapping Log - - -
-
\ No newline at end of file