diff --git a/README.md b/README.md index a989898c..5dcc9326 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ in development environment. * prepare virtual environment (with virtualenv you get pip, we'll use it soon to install requirements): - $ virtualenv --python=python3 hc-venv + $ python3 -m venv hc-venv $ source hc-venv/bin/activate * check out project code: diff --git a/hc/front/templatetags/hc_extras.py b/hc/front/templatetags/hc_extras.py index 2ebed6e7..ad255431 100644 --- a/hc/front/templatetags/hc_extras.py +++ b/hc/front/templatetags/hc_extras.py @@ -20,11 +20,6 @@ def site_name(): return settings.SITE_NAME -@register.simple_tag -def escaped_site_name(): - return mark_safe(settings.SITE_NAME.replace(".", ".")) - - @register.filter def mangle_link(s): return mark_safe(escape(s).replace(".", ".")) diff --git a/templates/emails/alert-body-html.html b/templates/emails/alert-body-html.html index c9938870..ce5b0a51 100644 --- a/templates/emails/alert-body-html.html +++ b/templates/emails/alert-body-html.html @@ -16,7 +16,7 @@ Here is a summary of your checks: {% include "emails/summary-html.html" %} Thanks,
-The {% escaped_site_name %} Team +The {% site_name %} Team {% endblock %} diff --git a/templates/emails/alert-subject.html b/templates/emails/alert-subject.html index ee060ce9..299e02c9 100644 --- a/templates/emails/alert-subject.html +++ b/templates/emails/alert-subject.html @@ -1,2 +1,2 @@ -{{ check.name_then_code }} is {{ check.status }} +{{ check.status|upper }} | {{ check.name_then_code }} diff --git a/templates/emails/base.html b/templates/emails/base.html index 2375e085..8d15e929 100644 --- a/templates/emails/base.html +++ b/templates/emails/base.html @@ -89,6 +89,51 @@ } + .new, .paused { + background: #AAA; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 10px; + line-height: 10px; + color: white; + padding: 6px; + margin: 0; + border-radius: 3px; + } + + .grace { + background: #f0ad4e; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 10px; + line-height: 10px; + color: white; + padding: 6px; + border-radius: 3px; + } + + .up { + background: #5cb85c; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 10px; + line-height: 10px; + color: white; + padding: 6px; + border-radius: 3px; + } + + .down { + background: #d9534f; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 10px; + line-height: 10px; + color: white; + padding: 6px; + border-radius: 3px; + } + /* ANDROID CENTER FIX */ div[style*="margin: 16px 0;"] { margin: 0 !important; } @@ -191,7 +236,7 @@ diff --git a/templates/emails/change-email-body-html.html b/templates/emails/change-email-body-html.html index f4cae9ca..235a98a5 100644 --- a/templates/emails/change-email-body-html.html +++ b/templates/emails/change-email-body-html.html @@ -9,5 +9,5 @@ the button below:

{% block content_more %} Regards,
-The {% escaped_site_name %} Team +The {% site_name %} Team {% endblock %} diff --git a/templates/emails/invoice-body-html.html b/templates/emails/invoice-body-html.html index 05c85a1b..cb130538 100644 --- a/templates/emails/invoice-body-html.html +++ b/templates/emails/invoice-body-html.html @@ -11,5 +11,5 @@ Here's your invoice from {% site_name %} for {% block content_more %} Thanks,
-The {% escaped_site_name %} Team +The {% site_name %} Team {% endblock %} diff --git a/templates/emails/login-body-html.html b/templates/emails/login-body-html.html index d40d76e1..42df5f8f 100644 --- a/templates/emails/login-body-html.html +++ b/templates/emails/login-body-html.html @@ -7,7 +7,7 @@ Hello, {% if inviting_profile %} {{ inviting_profile }} invites you to their - {% escaped_site_name %} account. + {% site_name %} account.

You will be able to manage their @@ -17,14 +17,14 @@ Hello,

{% endif %} -To log into {% escaped_site_name %}, +To log into {% site_name %}, please press the button below: {% endblock %} {% block content_more %} Thanks,
-The {% escaped_site_name %} Team +The {% site_name %} Team

P.S. Need help getting started? Check out our diff --git a/templates/emails/report-body-html.html b/templates/emails/report-body-html.html index 4d1a7cca..da214c7a 100644 --- a/templates/emails/report-body-html.html +++ b/templates/emails/report-body-html.html @@ -35,7 +35,7 @@ Get the ball rolling by adding one more!

Cheers,
-The {% escaped_site_name %} Team +The {% site_name %} Team {% endblock %} diff --git a/templates/emails/set-password-body-html.html b/templates/emails/set-password-body-html.html index df5aabfb..9e76be04 100644 --- a/templates/emails/set-password-body-html.html +++ b/templates/emails/set-password-body-html.html @@ -9,5 +9,5 @@ button below:

{% block content_more %} Regards,
-The {% escaped_site_name %} Team +The {% site_name %} Team {% endblock %} diff --git a/templates/emails/summary-html.html b/templates/emails/summary-html.html index 6925186c..36928703 100644 --- a/templates/emails/summary-html.html +++ b/templates/emails/summary-html.html @@ -13,17 +13,13 @@ @@ -62,6 +58,8 @@ {% else %} Never {% endif %} +
+ Details… {% endfor %}
- © 2018 {% escaped_site_name %}. All rights reserved. + © 2018 {% site_name %}. All rights reserved. {% block unsub %}{% endblock %}
- {% if check.get_status == "new" %} - - {% elif check.get_status == "paused" %} - - {% elif check.get_status == "grace" %} - - {% elif check.get_status == "up" %} - - {% elif check.get_status == "down" %} - - {% endif %} +
NEWPAUSEDLATEUPDOWN + {% if check.get_status == "grace" %} + LATE + {% else %} + {{ check.get_status|upper }} + {% endif %} +