diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:43:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:43:58 +0100 |
| commit | 523d5bcd0b4883c5046e52d62db59ff588e342c1 (patch) | |
| tree | 2e03fdf537731d9a8d1e8f7a0feaaeb0c9d84eb8 /res | |
| parent | Move SyncHandler out of the Handlers object (diff) | |
| parent | Merge pull request #786 from matrix-org/matthew/email_notifs_tuning (diff) | |
| download | synapse-523d5bcd0b4883c5046e52d62db59ff588e342c1.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler
Diffstat (limited to 'res')
| -rw-r--r-- | res/templates/mail.css | 5 | ||||
| -rw-r--r-- | res/templates/notif_mail.html | 11 |
2 files changed, 16 insertions, 0 deletions
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 42560fdfd5..dc13398df1 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 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") }}, + 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> |