Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: restored email logo to all outgoing emails

Browse Source
This commit is contained in:
Julian Lam
2019-02-22 15:03:16 -05:00
parent e613f88b29
commit 6c1f9c3c46
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emailer.js
View File

@@ -142,7 +142,7 @@ Emailer.registerApp = function (expressApp) {
app = expressApp;
var logo = null;
if (meta.configs.hasOwnProperty('brand:emailLogo')) {
if (meta.config.hasOwnProperty('brand:emailLogo')) {
logo = (!meta.config['brand:emailLogo'].startsWith('http') ? nconf.get('url') : '') + meta.config['brand:emailLogo'];
}

1
src/meta/configs.js
View File

@@ -163,6 +163,7 @@ function processConfig(data, callback) {
return next(err);
}
data['brand:emailLogo'] = nconf.get('url') + path.join(nconf.get('upload_url'), 'system', 'site-logo-x50.png');
data['brand:emailLogo:height'] = size.height;
data['brand:emailLogo:width'] = size.width;
next();

2
src/views/emails/partials/header.tpl
View File

@@ -173,7 +173,7 @@
<tr>
<td style="padding: 20px 0; text-align: center">
<!-- IF logo.src -->
<img src="{logo.src}" height="{logo.height}" width="{logo.width}" alt="{site_title}" border="0" style="height: {logo.height}px; width: {logo.width}px; background: #222222; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
<img src="{logo.src}" height="{logo.height}" width="{logo.width}" alt="{site_title}" border="0" style="height: {logo.height}px; width: {logo.width}px; background: #f6f6f6; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #333333;">
<!-- ELSE -->
&nbsp;
<!-- ENDIF logo.src -->