Skip to content

Commit a95566e

Browse files
joshsmithjoshsmith
authored
Merge pull request #1321 from code-corps/1311-emails-for-messages
Add new message emails
2 parents faa4353 + 98e1ea0 commit a95566e

23 files changed

+624
-59
lines changed

‎config/dev.exs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ config :code_corps, CodeCorps.Mailer, adapter: Bamboo.LocalAdapter
6060

6161
config :code_corps,
6262
postmark_forgot_password_template: "123",
63+
postmark_message_initiated_by_project_template: "123",
6364
postmark_organization_invite_email_template: "123",
6465
postmark_project_approval_request_template: "123",
6566
postmark_project_approved_template: "123",
6667
postmark_project_user_acceptance_template: "123",
6768
postmark_project_user_request_template: "123",
68-
postmark_receipt_template: "123"
69+
postmark_receipt_template: "123",
70+
postmark_reply_to_conversation_template: "123"
6971

7072
# If the dev environment has no CLOUDEX_API_KEY set, we want the app
7173
# to still run, with cloudex in test API mode

‎config/prod.exs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,14 @@ config :code_corps, CodeCorps.Mailer,
6161

6262
config :code_corps,
6363
postmark_forgot_password_template: "1989483",
64+
postmark_message_initiated_by_project_template: "4324242",
6465
postmark_organization_invite_email_template: "3441863",
6566
postmark_project_approval_request_template: "4105824",
6667
postmark_project_approved_template: "4105822",
6768
postmark_project_user_acceptance_template: "1447041",
6869
postmark_project_user_request_template: "4017262",
69-
postmark_receipt_template: "1255222"
70+
postmark_receipt_template: "1255222",
71+
postmark_reply_to_conversation_template: "4324082"
7072

7173
# ## SSL Support
7274
#

‎config/remote-development.exs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ config :code_corps, CodeCorps.Mailer,
4444

4545
config :code_corps,
4646
postmark_forgot_password_template: "123",
47+
postmark_message_initiated_by_project_template: "123",
4748
postmark_organization_invite_email_template: "123",
4849
postmark_project_approval_request_template: "123",
4950
postmark_project_approved_template: "123",
5051
postmark_project_user_acceptance_template: "123",
5152
postmark_project_user_request_template: "123",
52-
postmark_receipt_template: "123"
53+
postmark_receipt_template: "123",
54+
postmark_reply_to_conversation_template: "123"
5355

5456
# ## SSL Support
5557
#

‎config/staging.exs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ config :code_corps, CodeCorps.Mailer,
6060

6161
config :code_corps,
6262
postmark_forgot_password_template: "1989481",
63+
postmark_message_initiated_by_project_template: "4324241",
6364
postmark_organization_invite_email_template: "3442401",
6465
postmark_project_approval_request_template: "4105823",
6566
postmark_project_approved_template: "4105744",
6667
postmark_project_user_acceptance_template: "1447022",
6768
postmark_project_user_request_template: "4017261",
68-
postmark_receipt_template: "1252361"
69+
postmark_receipt_template: "1252361",
70+
postmark_reply_to_conversation_template: "4324243"
6971

7072
# ## SSL Support
7173
#

‎config/test.exs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ config :code_corps, CodeCorps.Mailer,
6666

6767
config :code_corps,
6868
postmark_forgot_password_template: "123",
69+
postmark_message_initiated_by_project_template: "123",
6970
postmark_organization_invite_email_template: "123",
7071
postmark_project_approval_request_template: "123",
7172
postmark_project_approved_template: "123",
7273
postmark_project_user_acceptance_template: "123",
7374
postmark_project_user_request_template: "123",
74-
postmark_receipt_template: "123"
75+
postmark_receipt_template: "123",
76+
postmark_reply_to_conversation_template: "123"
7577

7678
config :code_corps, :cloudex, CloudexTest
7779
config :cloudex, api_key: "test_key", secret: "test_secret", cloud_name: "test_cloud_name"

‎emails/forgot_password.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
Thanks!
5757
<br><strong>The Code Corps Team</strong>
5858
</p>
59-
<p class="center small">
60-
Questions? Feedback?
61-
<br>Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.</p>
6259
</td>
6360
</tr>
6461
</table>
@@ -71,9 +68,18 @@
7168
<td>
7269
<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
7370
<tr>
74-
<td class="content-cell" align="center">
75-
<p class="sub align-center">
76-
Code Corps PBC
71+
<td class="email-footer__cell" align="center">
72+
<p class="align-center">
73+
Questions? Feedback? Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.
74+
</p>
75+
</td>
76+
</tr>
77+
<tr>
78+
<td class="email-footer__cell" align="center">
79+
<p class="align-center">
80+
Send us 🐌 mail!
81+
<br>
82+
<br>Code Corps PBC
7783
<br>4166 Wilson Ave #1
7884
<br>San Diego, CA 92104
7985
</p>

‎emails/message_initiated_by_project.html‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6+
<title>You have a new message from {{project_title}}.</title>
7+
<!--
8+
Make sure you copy the styles from styles.css into the email template in Postmark before saving there.
9+
10+
<style type="text/css" rel="stylesheet" media="all">
11+
</style>
12+
-->
13+
<link rel="stylesheet" type="text/css" href="styles.css" media="screen" />
14+
</head>
15+
<body>
16+
<span class="preheader">You have a new message from {{project_title}}.</span>
17+
<table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0">
18+
<tr>
19+
<td align="center">
20+
<table class="email-content" width="100%" cellpadding="0" cellspacing="0">
21+
<tr>
22+
<td class="email-masthead" width="100%" cellpadding="0" cellspacing="0">
23+
<table class="email-masthead_inner" align="center" width="570" cellpadding="0" cellspacing="0">
24+
<tr>
25+
<td>
26+
<a href="https://www.codecorps.org">
27+
<img src="https://d3pgew4wbk2vb1.cloudfront.net/emails/images/[email protected]" class="email-masthead_logo" />
28+
</a>
29+
</td>
30+
</tr>
31+
</table>
32+
</td>
33+
</tr>
34+
<!-- Email Body -->
35+
<tr>
36+
<td class="email-body" width="100%" cellpadding="0" cellspacing="0">
37+
<table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0">
38+
<!-- Body content -->
39+
<tr>
40+
<td class="content-cell">
41+
<table width="100%" cellpadding="0" cellspacing="0">
42+
<tr>
43+
<td>
44+
<p class="center">
45+
<img src="https://d3pgew4wbk2vb1.cloudfront.net/emails/images/[email protected]" width="100" height="100" />
46+
</p>
47+
<p>Hi {{name}},</p>
48+
<p>You have a new message from {{project_title}}.</p>
49+
<p><a class="button" href="{{conversation_url}}">See your message</a></p>
50+
</td>
51+
</tr>
52+
</table>
53+
<table class="body-signature">
54+
<tr>
55+
<td>
56+
<p>
57+
Thanks!
58+
<br><strong>The Code Corps Team</strong>
59+
</p>
60+
</td>
61+
</tr>
62+
</table>
63+
</td>
64+
</tr>
65+
</table>
66+
</td>
67+
</tr>
68+
<tr>
69+
<td>
70+
<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
71+
<tr>
72+
<td class="email-footer__cell" align="center">
73+
<p class="align-center">
74+
Questions? Feedback? Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.
75+
</p>
76+
</td>
77+
</tr>
78+
<tr>
79+
<td class="email-footer__cell" align="center">
80+
<p class="align-center">
81+
Send us 🐌 mail!
82+
<br>
83+
<br>Code Corps PBC
84+
<br>4166 Wilson Ave #1
85+
<br>San Diego, CA 92104
86+
</p>
87+
</td>
88+
</tr>
89+
</table>
90+
</td>
91+
</tr>
92+
</table>
93+
</td>
94+
</tr>
95+
</table>
96+
</body>
97+
</html>

‎emails/organization_invite.html‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,13 @@
4949
</td>
5050
</tr>
5151
</table>
52-
<table class="body-signature">
52+
<table class="body-signature" width="100%" cellpadding="0" cellspacing="0">
5353
<tr>
5454
<td>
5555
<p>
5656
Thanks!
5757
<br><strong>The Code Corps Team</strong>
5858
</p>
59-
<p class="center small">
60-
Questions? Feedback?
61-
<br>Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.</p>
6259
</td>
6360
</tr>
6461
</table>
@@ -71,9 +68,18 @@
7168
<td>
7269
<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
7370
<tr>
74-
<td class="content-cell" align="center">
75-
<p class="sub align-center">
76-
Code Corps PBC
71+
<td class="email-footer__cell" align="center">
72+
<p class="align-center">
73+
Questions? Feedback? Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.
74+
</p>
75+
</td>
76+
</tr>
77+
<tr>
78+
<td class="email-footer__cell" align="center">
79+
<p class="align-center">
80+
Send us 🐌 mail!
81+
<br>
82+
<br>Code Corps PBC
7783
<br>4166 Wilson Ave #1
7884
<br>San Diego, CA 92104
7985
</p>

‎emails/project_approval_request.html‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,18 @@
102102
<td>
103103
<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
104104
<tr>
105-
<td class="content-cell" align="center">
106-
<p class="sub align-center">
107-
Code Corps PBC
105+
<td class="email-footer__cell" align="center">
106+
<p class="align-center">
107+
Questions? Feedback? Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.
108+
</p>
109+
</td>
110+
</tr>
111+
<tr>
112+
<td class="email-footer__cell" align="center">
113+
<p class="align-center">
114+
Send us 🐌 mail!
115+
<br>
116+
<br>Code Corps PBC
108117
<br>4166 Wilson Ave #1
109118
<br>San Diego, CA 92104
110119
</p>

‎emails/project_approved.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
Cheers,
6767
<br><strong>The Code Corps Team</strong>
6868
</p>
69-
<p class="center small">
70-
Questions? Feedback?
71-
<br>Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.</p>
7269
</td>
7370
</tr>
7471
</table>
@@ -81,9 +78,18 @@
8178
<td>
8279
<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
8380
<tr>
84-
<td class="content-cell" align="center">
85-
<p class="sub align-center">
86-
Code Corps PBC
81+
<td class="email-footer__cell" align="center">
82+
<p class="align-center">
83+
Questions? Feedback? Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.
84+
</p>
85+
</td>
86+
</tr>
87+
<tr>
88+
<td class="email-footer__cell" align="center">
89+
<p class="align-center">
90+
Send us 🐌 mail!
91+
<br>
92+
<br>Code Corps PBC
8793
<br>4166 Wilson Ave #1
8894
<br>San Diego, CA 92104
8995
</p>

0 commit comments

Comments
 (0)