Refactor the emails to have a base template

opentech/apply/activity/messaging.py

@@ -151,11 +151,12 @@ class EmailAdapter(AdapterBase):
         MESSAGES.COMMENT: 'notify_comment',
     }
 
-    def notify_comment(self, comment, **kwargs):
+    def notify_comment(self, **kwargs):
+        comment = kwargs['comment']
         if not comment.private:
             return render_to_string('messages/email/comment.html', kwargs)
 
-    def email_from_submission(self, submission, **kwargs):
+    def email_from_submission(self, **kwargs):
         return render_to_string('funds/email/confirmation.html', kwargs)
 
     def send_message(self, message, submission, **kwargs):

opentech/apply/activity/templates/messages/email/base.html

+Dear {{ submission.user.get_full_name|default:"applicant" }},
+
+{% block content %}{% endblock %}
+
+You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+
+If you have any questions, please email us at info@opentechfund.org.
+
+Kind Regards,
+The OTF Team
+
+--
+Open Technology Fund
+https://www.opentech.fund/

opentech/apply/activity/templates/messages/email/comment.html

-Dear {{ submission.user.get_full_name|default:"applicant" }},
+{% extends "messages/email/base.html" %}
 
+{% block content %}
 There has been a new comment on your application: {{ submission.title }}
 
 {{ comment.message }}
-
-You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
-
-If you have any questions, please email us at info@opentechfund.org.
-
-Kind Regards,
-The OTF Team
-
---
-Open Technology Fund
-https://www.opentech.fund/
+{% endblock %}

opentech/apply/funds/templates/funds/email/confirmation.html

-Dear {{ submission.user.get_full_name|default:"applicant" }},
+{% extends "messages/email/base.html" %}
 
+{% block content %}
 {% with email_context=submission.page.specific %}
 We appreciate your {{ email_context.title }} application submission to the Open Technology Fund. We will review and reply to your
 submission as quickly as possible. Our reply will have the next steps for your {{ email_context.title }} application.
@@ -8,17 +9,7 @@ You can find more information about our support options, review process and sele
 {{ email_context.confirmation_text_text }}
 {% endwith %}
 
-If you have any questions, please email us at info@opentechfund.org.
-
-You can access your application at {{ submission.get_absolute_url }}
-
 Project name: {{ submission.title }}
 Contact name: {{ submission.user.get_full_name }}
 Contact email: {{ submission.user.email }}
-
-Thanks again,
-The OTF Team
-
---
-Open Technology Fund
-https://www.opentech.fund/
+{% endblock %}