From 582dd1ed2eb68616f53c1ad7d8621dffb8a67ec6 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 14 Jul 2017 13:09:35 -0400
Subject: [PATCH] testing new footer with new_post tpl

---
 public/images/emails/unreadpost.png  | Bin 0 -> 3733 bytes
 src/topics/follow.js                 |   1 +
 src/views/emails/notif_post.tpl      |  61 +++++++++++++++++++++++----
 src/views/emails/partials/footer.tpl |   4 +-
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 public/images/emails/unreadpost.png

diff --git a/public/images/emails/unreadpost.png b/public/images/emails/unreadpost.png
new file mode 100644
index 0000000000000000000000000000000000000000..8228478618dada1fb80ebfce8c2f333796f62677
GIT binary patch
literal 3733
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

literal 0
HcmV?d00001

diff --git a/src/topics/follow.js b/src/topics/follow.js
index 62ee424eea..5d0de0e5a5 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -265,6 +265,7 @@ module.exports = function (Topics) {
 								topicSlug: postData.topic.slug,
 								postCount: postData.topic.postcount,
 								base_url: nconf.get('url'),
+								showUnsubscribe: true,
 							}, next);
 						} else {
 							winston.debug('[topics.notifyFollowers] uid ' + toUid + ' does not have post notifications enabled, skipping.');
diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl
index 4fd360575f..d85ed96606 100644
--- a/src/views/emails/notif_post.tpl
+++ b/src/views/emails/notif_post.tpl
@@ -1,13 +1,56 @@
-<p>[[email:greeting_with_name, {username}]],</p>
+<!-- IMPORT emails/partials/header.tpl -->
 
-<p>{intro}:</p>
-<blockquote>{postBody}</blockquote>
+<!-- Email Body : BEGIN -->
+<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px;">
 
-<a href="{url}">[[email:notif.post.cta]]</a>
+	<!-- Hero Image, Flush : BEGIN -->
+	<tr>
+		<td bgcolor="#efeff0" style="text-align: center; background-image: url({url}/assets/images/emails/triangularbackground.png); background-size: cover; background-repeat: no-repeat;">
+			<img src="{url}/assets/images/emails/unreadpost.png" width="300" height="300" border="0" align="center" style="width: 300px; height: 300px; max-width: 300px; height: auto; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;" class="g-img">
+		</td>
+	</tr>
+	<!-- Hero Image, Flush : END -->
 
-<!-- IMPORT emails/partials/footer.tpl -->
+	<!-- 1 Column Text + Button : BEGIN -->
+	<tr>
+		<td bgcolor="#efeff0">
+			<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
+				<tr>
+					<td style="padding: 40px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
+						<p style="margin: 0;">{intro}</p>
+					</td>
+				</tr>
+				<tr>
+					<td style="padding: 60px; font-family: sans-serif; font-size: 12px; font-style: italic; line-height: 20px; color: #777777;">
+						<p style="margin: 0;">{postBody}</p>
+					</td>
+				</tr>
+				<tr>
+					<td style="padding: 0 40px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
+						<!-- Button : BEGIN -->
+						<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" style="margin: auto;">
+							<tr>
+								<td style="border-radius: 3px; background: #222222; text-align: center;" class="button-td">
+									<a href="{url}" style="background: #222222; border: 15px solid #222222; font-family: sans-serif; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
+										<span style="color:#ffffff;" class="button-link">&nbsp;&nbsp;&nbsp;&nbsp;[[email:notif.post.cta]]&nbsp;&nbsp;&nbsp;&nbsp;</span>
+									</a>
+								</td>
+							</tr>
+						</table>
+						<!-- Button : END -->
+					</td>
+				</tr>
+				<tr>
+					<td style="padding: 40px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
+						<p style="margin: 0;">{site_title}</p>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<!-- 1 Column Text + Button : END -->
+
+</table>
+<!-- Email Body : END -->
 
-<hr />
-<p>
-	[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
-</p>
+<!-- IMPORT emails/partials/footer.tpl -->
diff --git a/src/views/emails/partials/footer.tpl b/src/views/emails/partials/footer.tpl
index af6b7d4369..236887425c 100644
--- a/src/views/emails/partials/footer.tpl
+++ b/src/views/emails/partials/footer.tpl
@@ -3,7 +3,9 @@
 				<tr>
 					<td style="padding: 40px 10px;width: 100%;font-size: 12px; font-family: sans-serif; line-height:18px; text-align: center; color: #888888;" class="x-gmail-data-detectors">
 						<br><br>
-						&nbsp;
+						<!-- IF showUnsubscribe -->
+						[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
+						<!-- ENDIF showUnsubscribe -->
 						<br><br>
 					</td>
 				</tr>