From 219eb1ae619a488fcdc53fb945c0b1fa86fb9789 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 27 Aug 2016 17:53:36 +0200 Subject: [PATCH] Improve design of HTML emails --- .../templates/email_adminActivation.tpl | 2 +- .../email_changeEmailNeedReactivation.tpl | 2 +- com.woltlab.wcf/templates/email_html.tpl | 15 ++++++++++++--- com.woltlab.wcf/templates/email_lostPassword.tpl | 2 +- .../templates/email_registerNeedActivation.tpl | 2 +- .../templates/email_sendNewPassword.tpl | 2 +- wcfsetup/install/lang/de.xml | 6 +++--- wcfsetup/install/lang/en.xml | 6 +++--- wcfsetup/setup/db/install.sql | 2 +- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/com.woltlab.wcf/templates/email_adminActivation.tpl b/com.woltlab.wcf/templates/email_adminActivation.tpl index 0c649ac7c8..c49a2d371f 100644 --- a/com.woltlab.wcf/templates/email_adminActivation.tpl +++ b/com.woltlab.wcf/templates/email_adminActivation.tpl @@ -3,7 +3,7 @@ {include file='email_plaintext'} {else} {capture assign='content'} -

{lang}wcf.acp.user.activation.mail.html.headline{/lang}

{lang}wcf.acp.user.activation.mail.html.text{/lang} {/capture} diff --git a/com.woltlab.wcf/templates/email_changeEmailNeedReactivation.tpl b/com.woltlab.wcf/templates/email_changeEmailNeedReactivation.tpl index 069f5c642e..8dd16dd1e6 100644 --- a/com.woltlab.wcf/templates/email_changeEmailNeedReactivation.tpl +++ b/com.woltlab.wcf/templates/email_changeEmailNeedReactivation.tpl @@ -3,7 +3,7 @@ {include file='email_plaintext'} {else} {capture assign='content'} -

{lang}wcf.user.changeEmail.needReactivation.mail.html.headline{/lang}

{lang}wcf.user.changeEmail.needReactivation.mail.html.intro{/lang} {capture assign=button} diff --git a/com.woltlab.wcf/templates/email_html.tpl b/com.woltlab.wcf/templates/email_html.tpl index 4a4c871fee..b41740a0f3 100644 --- a/com.woltlab.wcf/templates/email_html.tpl +++ b/com.woltlab.wcf/templates/email_html.tpl @@ -3,8 +3,9 @@