Add mark as confirmed button in email notifications

diff --git a/com.woltlab.wcf/templates/email_html.tpl b/com.woltlab.wcf/templates/email_html.tpl
index 32311972d5d9b4dee4ccc7f5c8c9d2780f7d3475..6134d8a55d3c00b341a5244760f899e13cad2c49 100644 (file)
--- a/com.woltlab.wcf/templates/email_html.tpl
+++ b/com.woltlab.wcf/templates/email_html.tpl
@@ -20,6 +20,11 @@
                        text-decoration: none;
                }
                
+               p, .paragraphMargin {
+                       margin-top: 1em;
+                       margin-bottom: 1em;
+               }
+               
                td {
                        vertical-align: top;
                }

diff --git a/com.woltlab.wcf/templates/email_notification.tpl b/com.woltlab.wcf/templates/email_notification.tpl
index 5fb06f5b02db7435108d3c91ef50781d9af38835..b7e7ec855dc2cdf6402253aa34d1653a7447940b 100644 (file)
--- a/com.woltlab.wcf/templates/email_notification.tpl
+++ b/com.woltlab.wcf/templates/email_notification.tpl
@@ -18,6 +18,13 @@
                {@$notificationContent}
        {/if}
 
+       {capture assign=button}
+       <a href="{link controller='NotificationConfirm' isEmail=true id=$event->getNotification()->notificationID}{/link}">
+               {lang}wcf.user.notification.markAsConfirmed{/lang}
+       </a>
+       {/capture}
+       {include file='email_paddingHelper' class='button' outerClass='paragraphMargin' content=$button sandbox=true}
+
        {lang}wcf.user.notification.mail.html.outro{/lang}
        {/capture}
        {include file='email_html'}

diff --git a/com.woltlab.wcf/templates/email_paddingHelper.tpl b/com.woltlab.wcf/templates/email_paddingHelper.tpl
index e18171b88da4f4865704d4e4b4839f78005fb079..67cb26edc3248ec93e181a720e04fceb693e20bf 100644 (file)
--- a/com.woltlab.wcf/templates/email_paddingHelper.tpl
+++ b/com.woltlab.wcf/templates/email_paddingHelper.tpl
@@ -1,5 +1,5 @@
 {* This construct is needed for Microsoft Outlook: https://litmus.com/help/email-clients/outlookcom-margins/ *}
-<table cellpadding="0" cellspacing="0" border="0" class="paddingHelper{if $block|isset && $block} block{/if}">
+<table cellpadding="0" cellspacing="0" border="0" class="paddingHelper{if $block|isset && $block} block{/if}{if $outerClass|isset && $outerClass} {$outerClass}{/if}">
        <tr>
                <td class="{$class}">
                        {@$content}