emails: Add base template for missed message and digest emails.

Also removes the files from lint, so that the new indentation doesn't
obscure the change. The files are reindented in the next commit.
This commit is contained in:
James Rowan 2017-06-27 13:09:15 -04:00 committed by Tim Abbott
parent e04bf3273c
commit 0d76da27b4
4 changed files with 38 additions and 0 deletions

View File

@ -1,7 +1,9 @@
{% extends "zerver/emails/email_base_messages.html" %}
{# {#
Mail sent to a user who hasn't logged in for 24 hours. Mail sent to a user who hasn't logged in for 24 hours.
#} #}
{% block content %}
Hello {{ name }}, Hello {{ name }},
<p>A lot has happened on Zulip while you've been away! <a href="{{ realm_uri }}">Visit Zulip</a> to catch up.</p> <p>A lot has happened on Zulip while you've been away! <a href="{{ realm_uri }}">Visit Zulip</a> to catch up.</p>
@ -92,8 +94,11 @@ Hello {{ name }},
<p>Cheers,<br /> <p>Cheers,<br />
The Zulip Team</p> The Zulip Team</p>
{% endblock %}
{% block manage_preferences %}
<p> <p>
<a href="{{ realm_uri }}/#settings">Manage email preferences</a> | <a href="{{ realm_uri }}/#settings">Manage email preferences</a> |
<a href="{{ unsubscribe_link }}">Unsubscribe from digest emails</a> <a href="{{ unsubscribe_link }}">Unsubscribe from digest emails</a>
</p> </p>
{% endblock %}

View File

@ -0,0 +1,26 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Zulip</title>
</head>
<body>
<span style="display:none !important;
visibility:hidden;
color:transparent;
mso-hide:all;
font-size:1px;
color:#ffffff;
line-height:1px;
max-height:0px;
height:0px;
max-width:0px;
width:0px;
opacity:0;
overflow:hidden;">
{% block preheader %}{% endblock %}
</span>
{% block content %}{% endblock %}
{% block manage_preferences %}{% endblock %}
</body>
</html>

View File

@ -1,7 +1,9 @@
{% extends "zerver/emails/email_base_messages.html" %}
{# {#
Mail sent to user when they were not logged in and received a PM or @-mention Mail sent to user when they were not logged in and received a PM or @-mention
#} #}
{% block content %}
Hello {{ name }}, Hello {{ name }},
<p> <p>
@ -43,5 +45,8 @@ Hello {{ name }},
<br></br> <br></br>
The Zulip Team The Zulip Team
</p> </p>
{% endblock %}
{% block manage_preferences %}
<p><a href="{{ realm_uri }}/#settings">Manage email preferences</a> | <a href="{{ unsubscribe_link }}">Unsubscribe from missed message emails</a></p> <p><a href="{{ realm_uri }}/#settings">Manage email preferences</a> | <a href="{{ unsubscribe_link }}">Unsubscribe from missed message emails</a></p>
{% endblock %}

View File

@ -127,6 +127,8 @@ def check_html_templates(templates, all_dups):
'templates/zerver/api.html', 'templates/zerver/api.html',
'templates/zerver/apps.html', 'templates/zerver/apps.html',
'templates/zerver/compose.html', 'templates/zerver/compose.html',
'templates/zerver/emails/digest.html',
'templates/zerver/emails/missed_message.html',
'templates/zerver/hello.html', 'templates/zerver/hello.html',
'templates/zerver/home.html', 'templates/zerver/home.html',
'templates/zerver/index.html', 'templates/zerver/index.html',