summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatrix <matrix@matrix.org>2016-05-18 01:07:44 +0100
committerDavid Baker <dave@matrix.org>2016-05-24 14:52:29 +0100
commit95b86e6dada4135c2b30932809084510adb3a076 (patch)
tree1b2f7a9e5df23f1df809a56a8521865d0427cf12
parentMerge pull request #799 from matrix-org/matthew/quieter-email-notifs (diff)
downloadsynapse-95b86e6dada4135c2b30932809084510adb3a076.tar.xz
tweak mail notifs
-rw-r--r--res/templates/notif_mail.html14
1 files changed, 8 insertions, 6 deletions
diff --git a/res/templates/notif_mail.html b/res/templates/notif_mail.html
index 1146ee133b..8aee68b591 100644
--- a/res/templates/notif_mail.html
+++ b/res/templates/notif_mail.html
@@ -30,18 +30,20 @@
                         {% include 'room.html' with context %}
                     {% endfor %}
                     <div class="footer">
+                        <a href="{{ unsubscribe_link }}">Unsubscribe</a>
+                        <br/>
+                        <br/>
                         <div class="debug">
-                            Sending email at {{ reason.now|format_ts("%c") }} due to activity in room '{{ reason.room_name }}' because:<br/>
-                            1. An event was received at {{ reason.received_at|format_ts("%c") }}
-                            which is more than {{ "%.1f"|format(reason.delay_before_mail_ms / (60*1000)) }} (delay_before_mail_ms) mins ago.<br/>
+                            Sending email at {{ reason.now|format_ts("%c") }} due to activity in room {{ reason.room_name }} because
+                            an event was received at {{ reason.received_at|format_ts("%c") }}
+                            which is more than {{ "%.1f"|format(reason.delay_before_mail_ms / (60*1000)) }} (delay_before_mail_ms) mins ago,
                             {% if reason.last_sent_ts %}
-                                2. The last time we sent a mail for this room was {{ reason.last_sent_ts|format_ts("%c") }},
+                                and the last time we sent a mail for this room was {{ reason.last_sent_ts|format_ts("%c") }},
                                 which is more than {{ "%.1f"|format(reason.throttle_ms / (60*1000)) }} (current throttle_ms) mins ago.
                             {% else %}
-                                2. We can't remember the last time we sent a mail for this room.
+                                and we don't have a last time we sent a mail for this room.
                             {% endif %}
                         </div>
-                        <a href="{{ unsubscribe_link }}">Unsubscribe</a>
                     </div>
                 </td>
                 <td> </td>