Email templates

funnel/__init__.py

@@ -8,6 +8,7 @@
 from email.utils import parseaddr
 
 import geoip2.database
+import phonenumbers
 from flask import Flask
 from flask_babel import get_locale
 from flask_executor import Executor
@@ -120,6 +121,10 @@
     each_app.config['MAIL_DEFAULT_SENDER_ADDR'] = parseaddr(
         app.config['MAIL_DEFAULT_SENDER']
     )[1]
+    each_app.config['SITE_SUPPORT_PHONE_FORMATTED'] = phonenumbers.format_number(
+        phonenumbers.parse(each_app.config['SITE_SUPPORT_PHONE']),
+        phonenumbers.PhoneNumberFormat.INTERNATIONAL,
+    )
     proxies.init_app(each_app)
     manifest.init_app(each_app)
     db.init_app(each_app)

funnel/models/notification_types.py

@@ -30,6 +30,7 @@
     'RegistrationCancellationNotification',
     'RegistrationConfirmationNotification',
     'ProjectStartingNotification',
+    'ProjectPublishedNotification',
     'OrganizationAdminMembershipNotification',
     'OrganizationAdminMembershipRevokedNotification',
 ]
@@ -154,6 +155,22 @@ class ProjectStartingNotification(
     # This is a notification triggered without an actor
 
 
+class ProjectPublishedNotification(
+    DocumentHasProfile, Notification, type='project_published'
+):
+    """Notifications of a newly published project."""
+
+    category = notification_categories.participant
+    title = __("When a project is published")
+    description = __(
+        "Notifies all members of a profile when a new project is published"
+    )
+
+    document_model = Project
+    roles = ['project_crew', 'project_participant', 'account_participant']
+    exclude_actor = False  # Send to everyone including the actor
+
+
 # --- Comment notifications ------------------------------------------------------------
 
 

funnel/templates/email_account_reset.html.jinja2

@@ -1,16 +1,32 @@
 {% extends "notifications/layout_email.html.jinja2" %}
-{% block content -%}
-
-  <p>{% trans %}Hello {{ fullname }},{% endtrans %}</p>
-
-  <p>{% trans %}You – or someone claiming to be you – asked for your password to be reset. This OTP is valid for 15 minutes.{% endtrans %}</p>
-
-  <p><big>{% trans %}OTP:{% endtrans %} <strong>{{ otp }}</strong></big></p>
-
-  <p>{% trans %}You can also use this link:{% endtrans %}</p>
-
-  <p class="btn-bar"><a class="btn" href="{{ url }}">{% trans %}Reset your password{% endtrans %}</a></p>
-
-  <p>{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
+{%- from "notifications/macros_email.html.jinja2" import cta_button -%}
 
+{% block content -%}
+    <tr>
+      <td  align="center"><br>
+        <p class="otp"><b>{{ otp }}</b></p>
+        <br>
+        <p>{% trans %}You – or someone claiming to be you – asked for your password to be reset. This OTP is valid for 15 minutes.{% endtrans %}</p>
+      </td>
+  </tr>
+  <br>
+  <tr>
+    <td  align="center">
+      <p>{% trans %}You can also use this link:{% endtrans %}</p>
+    </td>
+  </tr>
+  {# Button : BEGIN #}
+  {{ cta_button(url, gettext("Reset your password") )}}
+  {# Button : END #}
+  <tr>
+    <td class="spacer-16px"></td>
+  </tr>
+  <tr>
+    <td class="line-separator"></td>
+  </tr>
+  <tr>
+    <td class="footer-text footer-align">
+      <p>{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
+    </td>
+  </tr>
 {%- endblock content %}

funnel/templates/email_account_verify.html.jinja2

@@ -1,10 +1,24 @@
 {% extends "notifications/layout_email.html.jinja2" %}
-{% block content -%}
-
-  <p>{% trans %}Hello {{ fullname }},{% endtrans %}</p>
-
-  <p class="btn-bar"><a class="btn" href="{{ url }}">{% trans %}Confirm your email address{% endtrans %}</a></p>
-
-  <p>{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
+{%- from "notifications/macros_email.html.jinja2" import cta_button -%}
 
+{% block content -%}
+  <tr>
+    <td align="center">
+      <p>{% trans %}Hello {{ fullname }}{% endtrans %}</p><br>
+    </td>
+  </tr>
+  {# Button : BEGIN #}
+  {{ cta_button(url, gettext("Confirm your email address") )}}
+  {# Button : END #}
+  <tr>
+    <td class="spacer-16px"></td>
+  </tr>
+  <tr>
+    <td class="line-separator"></td>
+  </tr>
+  <tr>
+    <td class="footer-text footer-align">
+      <p>{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
+    </td>
+  </tr>
 {%- endblock %}

funnel/templates/email_login_otp.html.jinja2

@@ -1,15 +1,19 @@
 {% extends "notifications/layout_email.html.jinja2" %}
 {% block content -%}
 
-  {%- if fullname %}
-    <p>{% trans %}Hello {{ fullname }},{% endtrans %}</p>
-  {%- else %}
-    <p>{% trans %}Hello!{% endtrans %}</p>
-  {%- endif %}
-  <p>{% trans %}This login OTP is valid for 15 minutes.{% endtrans %}</p>
-
-  <p><big>{% trans %}OTP:{% endtrans %} <strong>{{ otp }}</strong></big></p>
-
-  <p>{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
-
+  <tr>
+    <td><br>
+      <p class="otp"><b>{{ otp }}</b></p>
+      <br>
+      <p align="center">{% trans %}This login OTP is valid for 15 minutes.{% endtrans %}</p>
+    </td>
+  </tr>
+  <tr>
+    <td class="line-separator"></td>
+  </tr>
+  <tr>
+    <td>
+      <p class="footer-text footer-align">{% trans %}If you did not ask for this, you may safely ignore this email.{% endtrans %}</p>
+    </td>
+  </tr>
 {%- endblock %}

funnel/templates/email_sudo_otp.html.jinja2

@@ -1,10 +1,10 @@
 {% extends "notifications/layout_email.html.jinja2" %}
 {% block content -%}
-
-  <p>{% trans %}Hello {{ fullname }},{% endtrans %}</p>
-
-  <p>{% trans %}You are about to perform a critical action. This OTP serves as your confirmation to proceed and is valid for 15 minutes.{% endtrans %}</p>
-
-  <p><big>{% trans %}OTP:{% endtrans %} <strong>{{ otp }}</strong></big></p>
-
+  <tr>
+    <td><br>
+      <p class="otp"><b>{{ otp }}</b></p>
+      <br>
+      <p align="center">{% trans %}You are about to perform a critical action. This OTP serves as your confirmation to proceed and is valid for 15 minutes.{% endtrans %}</p>
+    </td>
+  </tr>
 {%- endblock %}

funnel/templates/notifications/comment_received_email.html.jinja2

@@ -1,19 +1,30 @@
 {%- extends "notifications/layout_email.html.jinja2" -%}
+{%- from "notifications/macros_email.html.jinja2" import cta_button -%}
 {%- block content -%}
 
-  {%- if view.notification.document_type == 'project' -%}
-    <h2><a href="{{ view.document.url_for(_external=true, **view.tracking_tags()) }}">{{ view.document.joined_title }}</a></h2>
-  {%- elif view.notification.document_type == 'proposal' -%}
-    <h2><a href="{{ view.document.url_for(_external=true, **view.tracking_tags()) }}">{{ view.document.title }}</a></h2>
-  {%- elif view.notification.document_type == 'comment' -%}
-    <p>{% trans %}You wrote:{% endtrans %}</p>
-    <blockquote type="cite">{{ view.document.message }}</blockquote>
-  {%- endif %}
+    <tr align="center">
+        <td class="text-content">
+            {%- if view.notification.document_type == 'project' -%}
+            <h3><a href="{{ view.document.url_for(_external=true, **view.tracking_tags()) }}">{{ view.document.joined_title }}</a></h3>
+            {%- elif view.notification.document_type == 'proposal' -%}
+            <h3><a href="{{ view.document.url_for(_external=true, **view.tracking_tags()) }}">{{ view.document.title }}</a></h3>
+            {%- elif view.notification.document_type == 'comment' -%}
+            <p>{% trans %}You wrote:{% endtrans %}</p>
+            <blockquote type="cite">{{ view.document.message }}</blockquote>
+            {%- endif %}
 
-  <p>{{ view.activity_html() }}</p>
+            <p>{{ view.activity_html() }}</p>
+        </td>
+    </tr>
+    <tr>
+        <td align="left">
+            <blockquote type="cite">{{ view.comment.message }}</blockquote>
+        </td>
+    </tr>
+    <br/>
 
-  <blockquote type="cite">{{ view.comment.message }}</blockquote>
-
-  <p class="btn-bar"><a class="btn" href="{{ view.comment.url_for(_external=true, **view.tracking_tags()) }}">{% trans %}View comment{% endtrans %}</a></p>
+    {# Button : BEGIN #}
+    {{ cta_button(view.comment.url_for(_external=true, **view.tracking_tags()), gettext("View comment") )}}
+    {# Button : END #}
 
 {%- endblock content -%}

funnel/templates/notifications/comment_report_received_email.html.jinja2

@@ -1,14 +1,16 @@
-{%- extends "notifications/layout_email.html.jinja2" %}
+{%- extends "notifications/layout_email.html.jinja2" -%}
+{%- from "notifications/macros_email.html.jinja2" import cta_button -%}
 {%- block content -%}
 
-  <p>
-    {%- trans %}A comment has been reported as spam{% endtrans -%}
-  </p>
+    <tr align="center">
+        <td class="text-content">
+            <p class="body-content">{%- trans %}A comment has been reported as spam{% endtrans -%}</p>
+        </td>
+    </tr>
+    <br>
 
-  <p class="btn-bar">
-    <a class="btn" href="{{ url_for('siteadmin_review_comment', report=view.report.uuid_b58) }}">
-      {%- trans %}Review comment{% endtrans -%}
-    </a>
-  </p>
+    {# Button : BEGIN #}
+    {{ cta_button(url_for('siteadmin_review_comment', report=view.report.uuid_b58), gettext("Review comment") )}}
+    {# Button : END #}
 
 {%- endblock content -%}