From 33dfbdc59faf4470f9b1259fe80aa09f53cab81c Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Tue, 11 Apr 2017 15:47:11 +0200
Subject: [PATCH] OO-2619 Beautify change-password mails
---
.../org/olat/registration/PwChangeController.java | 14 +++++++++++---
.../registration/_i18n/LocalStrings_de.properties | 2 +-
.../registration/_i18n/LocalStrings_en.properties | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/registration/PwChangeController.java b/src/main/java/org/olat/registration/PwChangeController.java
index bc821f63779..0b63b7a2e2d 100644
--- a/src/main/java/org/olat/registration/PwChangeController.java
+++ b/src/main/java/org/olat/registration/PwChangeController.java
@@ -271,10 +271,18 @@ public class PwChangeController extends BasicController {
}
myContent.contextPut("pwKey", tk.getRegistrationKey());
StringBuilder body = new StringBuilder();
- body.append(userTrans.translate("pwchange.intro", new String[] { identity.getName() }))
+ body.append("<style>")
+ .append(".o_m_bground {background: #FAFAFA; border: 1px solid #eee; border-radius: 5px; padding: 1em; margin: 1em;}")
+ .append("</style>")
+ .append("<div class='o_m_bground'>")
+ .append(userTrans.translate("pwchange.intro", new String[] { identity.getName() }))
+ .append("</div>")
+ .append("<div class='o_m_bground'>")
.append(userTrans.translate("pwchange.body", new String[] { serverpath, tk.getRegistrationKey(), I18nManager.getInstance().getLocaleKey(ureq.getLocale()) }))
- .append(SEPARATOR)
- .append(userTrans.translate("reg.wherefrom", new String[] { serverpath, today, ip }));
+ .append("</div>")
+ .append("<div class='o_m_bground'>")
+ .append(userTrans.translate("reg.wherefrom", new String[] { serverpath, today, ip }))
+ .append("</div>");
MailBundle bundle = new MailBundle();
bundle.setToId(identity);
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
index ab83331134b..3334b755101 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
@@ -65,7 +65,7 @@ pw.change.confirm.token=SMS Authentifizierungscode
pw.change.sms=SMS Authentifizierung starten
pw.change.sms.descr=Sie haben eine Mobile Telefonnummer in OpenOLAT hinterlegt. Sie k\u00F6nnen sich daher \u00FCber SMS authentifizieren. W\u00E4hlen Sie den untenstehenden Button, um die SMS-Authentifizierung zu starten\:
pw.change.sms.title=SMS Authentifizierung
-pwchange.body=\u00DCber den Link {0}/dmz/pwchange/index.html?key\={1}&language\={2} \nk\u00F6nnen Sie Ihr OpenOLAT-Passwort neu setzen und sich anschlie\u00DFend unter {0}/dmz/1%3A1%3Aomain_loging%3A1%3A0%3Acid%3Alogin/?lp\=OLAT einloggen. \n\nIhr OpenOLAT-Team \n
+pwchange.body=\u00DCber den Link <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a> \nk\u00F6nnen Sie Ihr OpenOLAT-Passwort neu setzen und sich anschlie\u00DFend unter {0}/dmz/1%3A1%3Aomain_loging%3A1%3A0%3Acid%3Alogin/?lp\=OLAT einloggen. \n\nIhr OpenOLAT-Team \n
pwchange.homelink=Klicken Sie hier um sich anzumelden
pwchange.intro=Sie oder eine andere Person haben f\u00FCr den OpenOLAT-Benutzeraccount {0} ein neues Passwort angefordert.\n\n
pwchange.subject=Schl\u00FCssel f\u00FCr neues OpenOLAT-Passwort
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
index 8ad185fbc44..4045d0d9737 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
@@ -65,7 +65,7 @@ pw.change.confirm.token=SMS authentication code
pw.change.sms=Start authentication by SMS
pw.change.sms.descr=You have enter a mobile telecom number in OpenOLAT. You can authenticate you by SMS. Choose the button below to start the authentication by SMS\:
pw.change.sms.title=Authentication by SMS
-pwchange.body=Please use the link {0}/dmz/pwchange/index.html?key\={1}&language\={2} \r\nto change your OpenOLAT password. \r\n\r\nYour OpenOLAT team
+pwchange.body=Please use the link <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a> \r\nto change your OpenOLAT password. \r\n\r\nYour OpenOLAT team
pwchange.homelink=Please click here to log on
pwchange.intro=You have (or somebody else has) asked for a new password regarding the OpenOLAT user account {0}.
pwchange.subject=Key to a new OpenOLAT password
--
GitLab