From cbd2adc95e793cb232263efd05b025d6098356af Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 16 May 2016 18:58:38 +0100
Subject: tune email notifs, fix CSS a bit, and add debugging details

---
 res/templates/mail.css        |  5 +++++
 res/templates/notif_mail.html | 11 +++++++++++
 2 files changed, 16 insertions(+)

(limited to 'res/templates')

diff --git a/res/templates/mail.css b/res/templates/mail.css
index b02f509e58..f2b5e84abc 100644
--- a/res/templates/mail.css
+++ b/res/templates/mail.css
@@ -2,6 +2,11 @@ body {
     margin: 0px;
 }
 
+pre, code {
+    word-break: break-word;
+    white-space: pre-wrap;
+}
+
 #page {
     font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
     font-color: #454545;
diff --git a/res/templates/notif_mail.html b/res/templates/notif_mail.html
index 4034f3c601..ba65a80291 100644
--- a/res/templates/notif_mail.html
+++ b/res/templates/notif_mail.html
@@ -30,6 +30,17 @@
                         {% include 'room.html' with context %}
                     {% endfor %}
                     <div class="footer">
+                        <small>
+                            Sending at {{ reason.now|format_ts("%c") }} due to activity in room {{ reason.room_name }} because:<br/>
+                            1. The most recent notifiable 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/>
+                            {% if reason.last_sent_ts %}
+                                2. 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.
+                            {% endif %}
+                        </small>
                         <a href="{{ unsubscribe_link }}">Unsubscribe</a>
                     </div>
                 </td>
-- 
cgit 1.4.1


From e501e9ecb2026afa0b97348c98b4fb5caa9974f4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 16 May 2016 19:02:22 +0100
Subject: tweak text

---
 res/templates/notif_mail.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res/templates')

diff --git a/res/templates/notif_mail.html b/res/templates/notif_mail.html
index ba65a80291..ced62c19ae 100644
--- a/res/templates/notif_mail.html
+++ b/res/templates/notif_mail.html
@@ -31,8 +31,8 @@
                     {% endfor %}
                     <div class="footer">
                         <small>
-                            Sending at {{ reason.now|format_ts("%c") }} due to activity in room {{ reason.room_name }} because:<br/>
-                            1. The most recent notifiable event was received at {{ reason.received_at|format_ts("%c") }}
+                            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/>
                             {% if reason.last_sent_ts %}
                                 2. The last time we sent a mail for this room was {{ reason.last_sent_ts|format_ts("%c") }},
-- 
cgit 1.4.1