From 1ae07b2028ffd18746218ae1f25d0b0076c76d08 Mon Sep 17 00:00:00 2001 From: James Moore Date: Thu, 22 Sep 2016 14:56:15 -0700 Subject: [PATCH] made changes more concise --- hc/front/templatetags/hc_extras.py | 8 ++++++++ templates/accounts/check_token_submit.html | 6 +++--- templates/accounts/profile.html | 4 ++-- templates/accounts/set_password.html | 2 +- templates/base.html | 2 +- templates/base_bare.html | 2 +- templates/emails/alert-body-html.html | 2 +- templates/emails/alert-body-text.html | 4 ++-- templates/emails/login-body-html.html | 6 +++--- templates/emails/login-body-text.html | 10 +++++----- templates/emails/login-subject.html | 4 ++-- templates/emails/report-body-html.html | 2 +- templates/emails/report-body-text.html | 4 ++-- templates/emails/set-password-body-html.html | 4 ++-- templates/emails/set-password-body-text.html | 4 ++-- templates/emails/set-password-subject.html | 2 +- templates/emails/verify-email-body-html.html | 4 ++-- templates/emails/verify-email-body-text.html | 4 ++-- templates/emails/verify-email-subject.html | 2 +- templates/front/channels.html | 2 +- templates/front/docs.html | 12 ++++++------ templates/front/docs_api.html | 8 ++++---- templates/front/log.html | 2 +- templates/front/my_checks.html | 2 +- templates/front/verify_email_success.html | 2 +- templates/integrations/add_email.html | 4 ++-- templates/integrations/add_hipchat.html | 4 ++-- templates/integrations/add_pd.html | 4 ++-- templates/integrations/add_pushbullet.html | 4 ++-- templates/integrations/add_pushover.html | 4 ++-- templates/integrations/add_slack.html | 10 +++++----- templates/integrations/add_victorops.html | 6 +++--- templates/integrations/add_webhook.html | 4 ++-- templates/integrations/slack_message.json | 4 ++-- 34 files changed, 78 insertions(+), 70 deletions(-) diff --git a/hc/front/templatetags/hc_extras.py b/hc/front/templatetags/hc_extras.py index e5fcc99e..19c9a652 100644 --- a/hc/front/templatetags/hc_extras.py +++ b/hc/front/templatetags/hc_extras.py @@ -39,3 +39,11 @@ def hc_duration(td): @register.simple_tag def settings_value(name): return getattr(settings, name, "") + + +def site_name(name): + return settings.SITE_NAME + + +def site_root(name): + return settings.SITE_ROOT diff --git a/templates/accounts/check_token_submit.html b/templates/accounts/check_token_submit.html index 009a13b7..fc8ae5ef 100644 --- a/templates/accounts/check_token_submit.html +++ b/templates/accounts/check_token_submit.html @@ -3,7 +3,7 @@ - Continue to {% settings_value "SITE_NAME" %} + Continue to {% site_name %} @@ -42,7 +42,7 @@ diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html index 84edfa04..31f2694d 100644 --- a/templates/accounts/profile.html +++ b/templates/accounts/profile.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress staticfiles hc_extras %} -{% block title %}Account Settings - {% settings_value "SITE_NAME" %}{% endblock %} +{% block title %}Account Settings - {% site_name %}{% endblock %} {% block content %} @@ -47,7 +47,7 @@
{% csrf_token %}

Set Password

- Attach a password to your {% settings_value "SITE_NAME" %} account + Attach a password to your {% site_name %} account