diff --git a/hc/front/context_processors.py b/hc/front/context_processors.py new file mode 100644 index 00000000..eca8bd9f --- /dev/null +++ b/hc/front/context_processors.py @@ -0,0 +1,5 @@ +from django.conf import settings + + +def branding(request): + return {"site_name": settings.SITE_NAME, "site_root": settings.SITE_ROOT} diff --git a/hc/settings.py b/hc/settings.py index 7662ea3a..c3d9669b 100644 --- a/hc/settings.py +++ b/hc/settings.py @@ -87,6 +87,7 @@ TEMPLATES = [ "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", + "hc.front.context_processors.branding", "hc.payments.context_processors.payments", ] }, @@ -141,13 +142,10 @@ if os.getenv("DB") == "mysql": } } -TIME_ZONE = "UTC" - -USE_I18N = False - -USE_L10N = False - USE_TZ = True +TIME_ZONE = "UTC" +USE_I18N = True +USE_L10N = True SITE_ROOT = os.getenv("SITE_ROOT", "http://localhost:8000") SITE_NAME = os.getenv("SITE_NAME", "Mychecks") diff --git a/templates/accounts/billing.html b/templates/accounts/billing.html index 51b6800c..570dcd17 100644 --- a/templates/accounts/billing.html +++ b/templates/accounts/billing.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress static hc_extras %} -{% block title %}Account Settings - {% site_name %}{% endblock %} +{% block title %}Account Settings - {{ site_name }}{% endblock %} {% block content %}
diff --git a/templates/accounts/change_email.html b/templates/accounts/change_email.html index 5ac0c4f1..4d7cb427 100644 --- a/templates/accounts/change_email.html +++ b/templates/accounts/change_email.html @@ -16,7 +16,7 @@ Otherwise, you may get locked out of - your {% site_name %} account. + your {{ site_name }} account.

{% if request.user.has_usable_password %} diff --git a/templates/accounts/check_token_submit.html b/templates/accounts/check_token_submit.html index 3631025e..2b1d6056 100644 --- a/templates/accounts/check_token_submit.html +++ b/templates/accounts/check_token_submit.html @@ -3,7 +3,7 @@ - Continue to {% site_name %} + Continue to {{ site_name }} @@ -36,7 +36,7 @@ } -

You are about to log into {% site_name %}.

+

You are about to log into {{ site_name }}.

Please press the button below to continue:


@@ -45,7 +45,7 @@ id="submit-btn" type="submit" class="btn btn-lg btn-primary" - value="Continue to {% site_name %}"> + value="Continue to {{ site_name }}">
diff --git a/templates/accounts/login.html b/templates/accounts/login.html index 45e0051b..5ba24ee5 100644 --- a/templates/accounts/login.html +++ b/templates/accounts/login.html @@ -1,19 +1,19 @@ {% extends "base.html" %} -{% load compress hc_extras static %} +{% load compress static %} -{% block title %}Sign In - {% site_name %}{% endblock %} +{% block title %}Sign In - {{ site_name }}{% endblock %} {% block description %}{% endblock %} {% block head %} - + {% endblock %} {% block content %}
-

Sign In to {% site_name %}

+

Sign In to {{ site_name }}

{% if bad_link %}

The login link you just used is either incorrect or expired.

diff --git a/templates/accounts/notifications.html b/templates/accounts/notifications.html index 83346f0f..e05b0f43 100644 --- a/templates/accounts/notifications.html +++ b/templates/accounts/notifications.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load hc_extras %} -{% block title %}Account Settings - {% site_name %}{% endblock %} +{% block title %}Account Settings - {{ site_name }}{% endblock %} {% block content %}
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html index 186828ed..dc9c8579 100644 --- a/templates/accounts/profile.html +++ b/templates/accounts/profile.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress static hc_extras %} -{% block title %}Account Settings - {% site_name %}{% endblock %} +{% block title %}Account Settings - {{ site_name }}{% endblock %} {% block content %} @@ -49,7 +49,7 @@

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

diff --git a/templates/accounts/set_password.html b/templates/accounts/set_password.html index f0b159f3..6cabd896 100644 --- a/templates/accounts/set_password.html +++ b/templates/accounts/set_password.html @@ -8,7 +8,7 @@

Set a Password

- Please pick a password for your {% site_name %} account. + Please pick a password for your {{ site_name }} account.

diff --git a/templates/accounts/unsubscribed.html b/templates/accounts/unsubscribed.html index 68f8c745..78f4ead1 100644 --- a/templates/accounts/unsubscribed.html +++ b/templates/accounts/unsubscribed.html @@ -7,6 +7,6 @@

Unsubscribed

Your email address has been unsubscribed from - {% site_name %} reports. + {{ site_name }} reports.

{% endblock %} diff --git a/templates/base.html b/templates/base.html index 495e0abd..4593fa62 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ - {% block title %}{% site_name %} - Monitor Cron Jobs. Get Notified When Your Cron Jobs Fail{% endblock %} + {% block title %}{{ site_name }} - Monitor Cron Jobs. Get Notified When Your Cron Jobs Fail{% endblock %} {% block description %} {% endblock %} @@ -10,8 +10,8 @@ {% endblock %} - - + + {% block head %}{% endblock %} @@ -79,7 +79,7 @@ width="59" src="{% static 'img/logo.png'%}" srcset="{% static 'img/logo.png'%} 1x, {% static 'img/logo@2x.png'%} 2x" - alt="{% site_name %}"> + alt="{{ site_name }}"> {% else %} + alt="{{ site_name }}"> {% endif %}
diff --git a/templates/base_bare.html b/templates/base_bare.html index f24da3e4..da8b42a3 100644 --- a/templates/base_bare.html +++ b/templates/base_bare.html @@ -2,7 +2,7 @@ - {% block title %}{% site_name %}{% endblock %} + {% block title %}{{ site_name }}{% endblock %} diff --git a/templates/front/badges.html b/templates/front/badges.html index 6562208d..a82f7c79 100644 --- a/templates/front/badges.html +++ b/templates/front/badges.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress static hc_extras %} -{% block title %}Status Badges - {% site_name %}{% endblock %} +{% block title %}Status Badges - {{ site_name }}{% endblock %} {% block content %}
@@ -9,8 +9,8 @@

Status Badges

- {% site_name %} provides status badges for each of the tags - you have used. Additionally, the "{% site_name %}" + {{ site_name }} provides status badges for each of the tags + you have used. Additionally, the "{{ site_name }}" badge shows the overall status of all checks in a project. The badges have public, but hard-to-guess URLs. You can use them in your READMEs, diff --git a/templates/front/base_docs.html b/templates/front/base_docs.html index 349009ba..72391949 100644 --- a/templates/front/base_docs.html +++ b/templates/front/base_docs.html @@ -7,7 +7,7 @@

    -
  • {% site_name %}
    • +
  • {{ site_name }}
  • Introduction
    • diff --git a/templates/front/channels.html b/templates/front/channels.html index b0e12c38..6c06b408 100644 --- a/templates/front/channels.html +++ b/templates/front/channels.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Integrations - {% site_name %}{% endblock %} +{% block title %}Integrations - {{ site_name }}{% endblock %} {% block content %} @@ -160,7 +160,7 @@

    The project "{{ project }}" does not have any integrations set up yet.

    -

    With no configured integrations, {% site_name %} +

    With no configured integrations, {{ site_name }} will not send any notifications when checks change state.

    diff --git a/templates/front/docs_cron.html b/templates/front/docs_cron.html index 43927a14..843d66b9 100644 --- a/templates/front/docs_cron.html +++ b/templates/front/docs_cron.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load hc_extras %} -{% block title %}Cron Syntax Cheatsheet - {% site_name %}{% endblock %} +{% block title %}Cron Syntax Cheatsheet - {{ site_name }}{% endblock %} {% block description %} @@ -16,7 +16,7 @@

    Cron Syntax Cheatsheet

    - {% site_name %} understands most of the traditional cron syntax features. + {{ site_name }} understands most of the traditional cron syntax features. Under the hood, it uses the croniter package to parse and interpret cron expressions. Below is a showcase of @@ -462,7 +462,7 @@ Cron daemon uses server's local time. If your server's timezone is other than UTC, make sure to set a matching timezone for your check - on {% site_name %} as well. + on {{ site_name }} as well.

    On Ubuntu systems you can check the server's timezone diff --git a/templates/front/docs_single.html b/templates/front/docs_single.html index 2bd71ca5..6080603c 100644 --- a/templates/front/docs_single.html +++ b/templates/front/docs_single.html @@ -1,7 +1,7 @@ {% extends "front/base_docs.html" %} {% load compress static hc_extras %} -{% block title %}{{ first_line|striptags }} - {% site_name %}{% endblock %} +{% block title %}{{ first_line|striptags }} - {{ site_name }}{% endblock %} {% block description %}{% endblock %} {% block keywords %}{% endblock %} diff --git a/templates/front/filtering_rules_modal.html b/templates/front/filtering_rules_modal.html index e3711232..6b51b5c9 100644 --- a/templates/front/filtering_rules_modal.html +++ b/templates/front/filtering_rules_modal.html @@ -29,7 +29,7 @@ Only POST - If set, {% site_name %} will ignore HTTP requests + If set, {{ site_name }} will ignore HTTP requests using any other request method. diff --git a/templates/front/log.html b/templates/front/log.html index aa0e93ef..dc90b3e3 100644 --- a/templates/front/log.html +++ b/templates/front/log.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}My Checks - {% site_name %}{% endblock %} +{% block title %}Ping Log - {{ site_name }}{% endblock %} {% block content %} diff --git a/templates/front/projects.html b/templates/front/projects.html index a820968d..f2ec0416 100644 --- a/templates/front/projects.html +++ b/templates/front/projects.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress static hc_extras %} -{% block title %}{% site_name %}{% endblock %} +{% block title %}{{ site_name }}{% endblock %} {% block content %} diff --git a/templates/front/unsubscribe_success.html b/templates/front/unsubscribe_success.html index 175dffb3..a370d7fe 100644 --- a/templates/front/unsubscribe_success.html +++ b/templates/front/unsubscribe_success.html @@ -7,6 +7,6 @@

    Unsubscribed

    Your email address has been unsubscribed from - {% site_name %} notifications. + {{ site_name }} notifications.

    {% endblock %} diff --git a/templates/front/verify_email_success.html b/templates/front/verify_email_success.html index e566a0e2..bda8e0d1 100644 --- a/templates/front/verify_email_success.html +++ b/templates/front/verify_email_success.html @@ -10,7 +10,7 @@

    Success! You've verified this email address, and it will now receive - {% site_name %} notifications. + {{ site_name }} notifications.

diff --git a/templates/front/welcome.html b/templates/front/welcome.html index c8aa847b..7e904f16 100644 --- a/templates/front/welcome.html +++ b/templates/front/welcome.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load compress hc_extras humanize static %} +{% load compress humanize static %} {% block description %} @@ -7,7 +7,7 @@ {% block head %} - + {% endblock %} {% block containers %} @@ -27,7 +27,7 @@ Make HTTP requests to the Ping URL at regular intervals. When the URL is not pinged on time, - {% site_name %} will send you an alert. + {{ site_name }} will send you an alert. You can monitor any service that can make HTTP requests @@ -37,7 +37,7 @@

For each of your periodic tasks, - {% site_name %} provides an unique URL similar to this one: + {{ site_name }} provides an unique URL similar to this one:

{{ ping_url }} @@ -123,7 +123,7 @@ sending email messages.

- You can instruct {% site_name %} to look for a particular + You can instruct {{ site_name }} to look for a particular keyword in the subject line. This is handy when your backup software sends an email after every run, and uses a different subject line depending on success or failure. @@ -140,7 +140,7 @@

-

{% site_name %} monitors the heartbeat messages sent by your cron jobs, services and APIs. +

{{ site_name }} monitors the heartbeat messages sent by your cron jobs, services and APIs. Get immediate alerts when they don't arrive on schedule.

Sign Up – It's Free @@ -236,7 +236,7 @@ Down. Time since last ping has exceeded Period + Grace. - When check goes from "Late" to "Down", {% site_name %} + When check goes from "Late" to "Down", {{ site_name }} sends you a notification. @@ -302,8 +302,8 @@

Public Status Badges

- {% site_name %} provides status badges for each of the tags - you have used. Additionally, the "{% site_name %}" badge + {{ site_name }} provides status badges for each of the tags + you have used. Additionally, the "{{ site_name }}" badge shows the overall status of all checks in your account.

@@ -511,11 +511,11 @@

-

What Can I Monitor With {% site_name %}?

+

What Can I Monitor With {{ site_name }}?

Cron Jobs

-

{% site_name %} monitoring is a great fit for cron jobs and cron-like systems +

{{ site_name }} monitoring is a great fit for cron jobs and cron-like systems (systemd timers, Jenkins build jobs, Windows Scheduled Tasks, wp-cron, uwsgi cron-like interface, Heroku Scheduler, ...). A failed cron job often has no immediate visible consequences, and can go unnoticed for a long time.

@@ -534,9 +534,9 @@

Processes, Services, Servers

-

{% site_name %} monitoring can be used for lightweight server monitoring: +

{{ site_name }} monitoring can be used for lightweight server monitoring: ensuring a particular system service, or the server as a whole is alive and healthy. - Write a shell script that checks for a specific condition, and pings {% site_name %} + Write a shell script that checks for a specific condition, and pings {{ site_name }} if successful. Run the shell script regularly.

Specific examples:

@@ -557,7 +557,7 @@
-

{% site_name %} is a free and +

{{ site_name }} is a free and open source service. Setting up monitoring for your cron jobs only takes minutes. Start sleeping better at nights!

diff --git a/templates/integrations/add_apprise.html b/templates/integrations/add_apprise.html index 75a91e7e..bff2d862 100644 --- a/templates/integrations/add_apprise.html +++ b/templates/integrations/add_apprise.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Apprise Integration for {% site_name %}{% endblock %} +{% block title %}Apprise Integration for {{ site_name }}{% endblock %} {% block content %}
diff --git a/templates/integrations/add_discord.html b/templates/integrations/add_discord.html index 9aa42de4..29cd5645 100644 --- a/templates/integrations/add_discord.html +++ b/templates/integrations/add_discord.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Discord Integration for {% site_name %}{% endblock %} +{% block title %}Discord Integration for {{ site_name }}{% endblock %} {% block content %} @@ -11,7 +11,7 @@

- With this integration, {% site_name %} will send + With this integration, {{ site_name }} will send a notification to a Discord channel when a check goes up or down. diff --git a/templates/integrations/add_email.html b/templates/integrations/add_email.html index e79f6857..e5ad3ec2 100644 --- a/templates/integrations/add_email.html +++ b/templates/integrations/add_email.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Set Up Email Notifications - {% site_name %}{% endblock %} +{% block title %}Set Up Email Notifications - {{ site_name }}{% endblock %} {% block content %} @@ -13,7 +13,7 @@ {% if use_verification %}

Requires confirmation. - After entering an email address, {% site_name %} will send out a confirmation link. + After entering an email address, {{ site_name }} will send out a confirmation link. Only confirmed addresses receive notifications.

{% endif %} diff --git a/templates/integrations/add_matrix.html b/templates/integrations/add_matrix.html index 536681c0..16e78861 100644 --- a/templates/integrations/add_matrix.html +++ b/templates/integrations/add_matrix.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Matrix Integration for {% site_name %}{% endblock %} +{% block title %}Matrix Integration for {{ site_name }}{% endblock %} {% block content %}
@@ -10,7 +10,7 @@

If your team uses Matrix, - you can set up {% site_name %} to post notifications + you can set up {{ site_name }} to post notifications to an appropriate Matrix room.

@@ -63,7 +63,7 @@

{{ matrix_user_id }} will shortly join your room. After that, you are all set! From now on - {% site_name %} will post notifications + {{ site_name }} will post notifications to your room when checks go down or up.

diff --git a/templates/integrations/add_mattermost.html b/templates/integrations/add_mattermost.html index eff2a486..444c437e 100644 --- a/templates/integrations/add_mattermost.html +++ b/templates/integrations/add_mattermost.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Mattermost Integration for {% site_name %}{% endblock %} +{% block title %}Mattermost Integration for {{ site_name }}{% endblock %} {% block content %} @@ -11,7 +11,7 @@

Mattermost

If your team uses Mattermost, you can set - up {% site_name %} to post status updates directly to an appropriate + up {{ site_name }} to post status updates directly to an appropriate Mattermost channel.

Setup Guide

diff --git a/templates/integrations/add_msteams.html b/templates/integrations/add_msteams.html index 3c814410..d3b6cf65 100644 --- a/templates/integrations/add_msteams.html +++ b/templates/integrations/add_msteams.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Microsoft Teams Integration for {% site_name %}{% endblock %} +{% block title %}Microsoft Teams Integration for {{ site_name }}{% endblock %} {% block content %} @@ -10,7 +10,7 @@

Microsoft Teams

If your team uses Microsoft Teams, - you can set up {% site_name %} to post status updates directly to an appropriate + you can set up {{ site_name }} to post status updates directly to an appropriate Microsoft Teams channel.

Setup Guide

@@ -40,7 +40,7 @@

- Select the channel where you want {% site_name %} to post + Select the channel where you want {{ site_name }} to post notifications.

diff --git a/templates/integrations/add_opsgenie.html b/templates/integrations/add_opsgenie.html index d7657c85..7aaba2f0 100644 --- a/templates/integrations/add_opsgenie.html +++ b/templates/integrations/add_opsgenie.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}OpsGenie Integration for {% site_name %}{% endblock %} +{% block title %}OpsGenie Integration for {{ site_name }}{% endblock %} {% block content %} @@ -11,7 +11,7 @@

OpsGenie provides alerting, on-call scheduling, escalation policies and incident tracking. - You can can integrate it with your {% site_name %} account in few + You can can integrate it with your {{ site_name }} account in few simple steps.

Setup Guide

diff --git a/templates/integrations/add_pagertree.html b/templates/integrations/add_pagertree.html index 1a737a9b..0991adf9 100644 --- a/templates/integrations/add_pagertree.html +++ b/templates/integrations/add_pagertree.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}PagerTree Integration for {% site_name %}{% endblock %} +{% block title %}PagerTree Integration for {{ site_name }}{% endblock %} {% block content %} @@ -10,7 +10,7 @@

PagerTree

If your team uses PagerTree, - you can set up {% site_name %} to create a PagerTree incident when + you can set up {{ site_name }} to create a PagerTree incident when a check goes down, and resolve it when a check goes back up.

Setup Guide

diff --git a/templates/integrations/add_pd.html b/templates/integrations/add_pd.html index ea4b8ba6..46c94fb5 100644 --- a/templates/integrations/add_pd.html +++ b/templates/integrations/add_pd.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}PagerDuty Integration for {% site_name %}{% endblock %} +{% block title %}PagerDuty Integration for {{ site_name }}{% endblock %} {% block content %} @@ -11,7 +11,7 @@

If your team uses PagerDuty, - you can set up {% site_name %} to create a PagerDuty incident + you can set up {{ site_name }} to create a PagerDuty incident when a check goes down, and resolve it when a check goes back up.

diff --git a/templates/integrations/add_pdc.html b/templates/integrations/add_pdc.html index 42271de6..58d6728e 100644 --- a/templates/integrations/add_pdc.html +++ b/templates/integrations/add_pdc.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}PagerDuty Integration for {% site_name %}{% endblock %} +{% block title %}PagerDuty Integration for {{ site_name }}{% endblock %} {% block description %} - + {% endblock %} {% block content %} @@ -15,7 +15,7 @@
{% if request.user.is_authenticated %}

If your team uses PagerDuty, - you can set up {% site_name %} to create a PagerDuty incident when + you can set up {{ site_name }} to create a PagerDuty incident when a check goes down, and resolve it when a check goes back up.

{% if connect_url %} @@ -33,11 +33,11 @@ {% else %}

- {% site_name %} is a free and + {{ site_name }} is a free and open source service for monitoring your cron jobs, background processes and scheduled tasks. Before adding PagerDuty integration, please log into - {% site_name %}:

+ {{ site_name }}:

And that is all! You will then be redirected back to - "Integrations" page on {% site_name %} and see + "Integrations" page on {{ site_name }} and see the new integration!

diff --git a/templates/integrations/add_prometheus.html b/templates/integrations/add_prometheus.html index 502ba991..990f6729 100644 --- a/templates/integrations/add_prometheus.html +++ b/templates/integrations/add_prometheus.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Prometheus Integration for {% site_name %}{% endblock %} +{% block title %}Prometheus Integration for {{ site_name }}{% endblock %} {% block content %} @@ -10,12 +10,12 @@

Prometheus

- {% site_name %} provides a + {{ site_name }} provides a Prometheus-compatible metrics endpoint for each project. The endpoints are secured using each project's read-only API key. - If your team uses Prometheus, you can configure it to scrape {% site_name %} + If your team uses Prometheus, you can configure it to scrape {{ site_name }} and have up-to-date check and tag status values available in Prometheus.

@@ -62,7 +62,7 @@

Reload Prometheus' configuration. You should now start seeing - {% site_name %} data appear in Prometheus. + {{ site_name }} data appear in Prometheus.

diff --git a/templates/integrations/add_pushbullet.html b/templates/integrations/add_pushbullet.html index 98c96884..ee145896 100644 --- a/templates/integrations/add_pushbullet.html +++ b/templates/integrations/add_pushbullet.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Pushbullet Integration for {% site_name %}{% endblock %} +{% block title %}Pushbullet Integration for {{ site_name }}{% endblock %} {% block content %} @@ -11,7 +11,7 @@

- With this integration, {% site_name %} will send + With this integration, {{ site_name }} will send a Pushbullet notification when a check goes up or down. diff --git a/templates/integrations/add_pushover.html b/templates/integrations/add_pushover.html index b7db892b..b376ba66 100644 --- a/templates/integrations/add_pushover.html +++ b/templates/integrations/add_pushover.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Pushover Integration for {% site_name %}{% endblock %} +{% block title %}Pushover Integration for {{ site_name }}{% endblock %} {% block content %} @@ -12,7 +12,7 @@

Pushover delivers real-time notifications on your Android, iPhone, iPad, Desktop, - Android Wear and Apple Watch. You can set up {% site_name %} to + Android Wear and Apple Watch. You can set up {{ site_name }} to receive Pushover notifications in a few simple steps.

diff --git a/templates/integrations/add_pushover_help.html b/templates/integrations/add_pushover_help.html index fa742363..36732bef 100644 --- a/templates/integrations/add_pushover_help.html +++ b/templates/integrations/add_pushover_help.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Pushover Integration for {% site_name %}{% endblock %} +{% block title %}Pushover Integration for {{ site_name }}{% endblock %} {% block description %} - + {% endblock %} {% block content %} @@ -16,16 +16,16 @@

Pushover delivers real-time notifications on your Android, iPhone, iPad, Desktop, - Android Wear and Apple Watch. You can set up {% site_name %} to + Android Wear and Apple Watch. You can set up {{ site_name }} to receive Pushover notifications in a few simple steps.

{% else %}

- {% site_name %} is a free and + {{ site_name }} is a free and open source service for monitoring your cron jobs, background processes and scheduled tasks. Before adding Pushover integration, please log into - {% site_name %}: + {{ site_name }}:

@@ -100,7 +100,7 @@

That is all! You will now be redirected back to - "Integrations" page on {% site_name %} and see + "Integrations" page on {{ site_name }} and see the new integration!

diff --git a/templates/integrations/add_shell.html b/templates/integrations/add_shell.html index 19f8ce06..bf75749d 100644 --- a/templates/integrations/add_shell.html +++ b/templates/integrations/add_shell.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Add Shell Command - {% site_name %}{% endblock %} +{% block title %}Add Shell Command - {{ site_name }}{% endblock %} {% block content %} @@ -77,7 +77,7 @@

You can use the below placeholders in the command. - {% site_name %} will replace the placeholders + {{ site_name }} will replace the placeholders with the correct values.

diff --git a/templates/integrations/add_slack.html b/templates/integrations/add_slack.html index 3fd6f2fb..07c9ce43 100644 --- a/templates/integrations/add_slack.html +++ b/templates/integrations/add_slack.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Slack Integration for {% site_name %}{% endblock %} +{% block title %}Slack Integration for {{ site_name }}{% endblock %} {% block content %}
@@ -9,7 +9,7 @@

Slack

If your team uses Slack, you can set - up {% site_name %} to post status updates directly to an appropriate + up {{ site_name }} to post status updates directly to an appropriate Slack channel.

Setup Guide

diff --git a/templates/integrations/add_slack_btn.html b/templates/integrations/add_slack_btn.html index b189b74c..b64b0807 100644 --- a/templates/integrations/add_slack_btn.html +++ b/templates/integrations/add_slack_btn.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Slack Integration for {% site_name %}{% endblock %} +{% block title %}Slack Integration for {{ site_name }}{% endblock %} {% block description %} - + {% endblock %} {% block content %} @@ -14,7 +14,7 @@
{% if request.user.is_authenticated %}

If your team uses Slack, you can set - up {% site_name %} to post status updates directly to an appropriate + up {{ site_name }} to post status updates directly to an appropriate Slack channel.

{% if authorize_url %} @@ -30,11 +30,11 @@ {% else %}

- {% site_name %} is a free and + {{ site_name }} is a free and open source service for monitoring your cron jobs, background processes and scheduled tasks. Before adding Slack integration, please log into - {% site_name %}:

+ {{ site_name }}:

Click on the "Add to Slack" button, and you should - be on a page that says "{% site_name %} would like access to + be on a page that says "{{ site_name }} would like access to your Slack team". Select the team you want to add the - {% site_name %} integration app to. + {{ site_name }} integration app to.

@@ -92,9 +92,9 @@

- You should now be on a page that says "{% site_name %} would + You should now be on a page that says "{{ site_name }} would like access to TEAM NAME". Select the channel you want to - post {% site_name %} notifications to. + post {{ site_name }} notifications to.

@@ -110,7 +110,7 @@

That is all! You will now be redirected back to - "Integrations" page on {% site_name %} and see + "Integrations" page on {{ site_name }} and see the new integration!

diff --git a/templates/integrations/add_sms.html b/templates/integrations/add_sms.html index 96067fd0..55e9f186 100644 --- a/templates/integrations/add_sms.html +++ b/templates/integrations/add_sms.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Add SMS Integration - {% site_name %}{% endblock %} +{% block title %}Add SMS Integration - {{ site_name }}{% endblock %} {% block content %} diff --git a/templates/integrations/add_spike.html b/templates/integrations/add_spike.html index e4480f27..7f868389 100644 --- a/templates/integrations/add_spike.html +++ b/templates/integrations/add_spike.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Spike.sh Integration for {% site_name %}{% endblock %} +{% block title %}Spike.sh Integration for {{ site_name }}{% endblock %} {% block content %} @@ -10,7 +10,7 @@

Spike.sh

If you are using Spike.sh, - you can set up {% site_name %} to create a Spike.sh incident when a check + you can set up {{ site_name }} to create a Spike.sh incident when a check goes down, and resolve it when a check goes back up.

Setup Guide

diff --git a/templates/integrations/add_telegram.html b/templates/integrations/add_telegram.html index acbd5024..4fcd2f33 100644 --- a/templates/integrations/add_telegram.html +++ b/templates/integrations/add_telegram.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Telegram Integration for {% site_name %}{% endblock %} +{% block title %}Telegram Integration for {{ site_name }}{% endblock %} {% block description %} - + {% endblock %} {% block content %} @@ -16,7 +16,7 @@

When a check goes up or down, - {% site_name %} will send notifications to + {{ site_name }} will send notifications to {% if chat_type == "private" %} a Telegram user {% else %} @@ -52,7 +52,7 @@ {% else %}

If your team uses Telegram, - you can set up {% site_name %} to post status updates directly to an + you can set up {{ site_name }} to post status updates directly to an appropriate Telegram chat or user.

Setup Guide

@@ -98,7 +98,7 @@

Click or tap on the confirmation link, and - {% site_name %} will open in a browser window asking you to + {{ site_name }} will open in a browser window asking you to confirm the new integration.

Select the project you want the Telegram integration added to, click on "Connect Telegram", and it's done!

diff --git a/templates/integrations/add_trello.html b/templates/integrations/add_trello.html index 96fdc96d..3b2d06b5 100644 --- a/templates/integrations/add_trello.html +++ b/templates/integrations/add_trello.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Trello Integration for {% site_name %}{% endblock %} +{% block title %}Trello Integration for {{ site_name }}{% endblock %} {% block content %}
@@ -10,7 +10,7 @@

- With this integration, {% site_name %} will create a + With this integration, {{ site_name }} will create a Trello card each time a check goes down.

diff --git a/templates/integrations/add_victorops.html b/templates/integrations/add_victorops.html index aa4d34ed..dd4d2a35 100644 --- a/templates/integrations/add_victorops.html +++ b/templates/integrations/add_victorops.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}VictorOps Integration for {% site_name %}{% endblock %} +{% block title %}VictorOps Integration for {{ site_name }}{% endblock %} {% block content %} @@ -12,7 +12,7 @@

VictorOps is another incident management system similar to PagerDuty. If you use or plan on using VictorOps, you can can integrate it - with your {% site_name %} account in few simple steps.

+ with your {{ site_name }} account in few simple steps.

Setup Guide

@@ -22,7 +22,7 @@ Log into your VictorOps account, go to Settings > Schedules, and find or create the Team Schedule you - would like to use for {% site_name %} alerts. + would like to use for {{ site_name }} alerts.

diff --git a/templates/integrations/add_whatsapp.html b/templates/integrations/add_whatsapp.html index 4a10a7a4..2d6696ce 100644 --- a/templates/integrations/add_whatsapp.html +++ b/templates/integrations/add_whatsapp.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load humanize static hc_extras %} -{% block title %}Add WhatsApp Integration - {% site_name %}{% endblock %} +{% block title %}Add WhatsApp Integration - {{ site_name }}{% endblock %} {% block content %} diff --git a/templates/integrations/add_zulip.html b/templates/integrations/add_zulip.html index 21df87b3..154c9472 100644 --- a/templates/integrations/add_zulip.html +++ b/templates/integrations/add_zulip.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load compress humanize static hc_extras %} -{% block title %}Zulip Integration for {% site_name %}{% endblock %} +{% block title %}Zulip Integration for {{ site_name }}{% endblock %} {% block content %} @@ -12,7 +12,7 @@ Zulip is an open-source group chat app with an email threading model. If you use or plan on using Zulip, you can can integrate it - with your {% site_name %} account in few simple steps. + with your {{ site_name }} account in few simple steps.

Setup Guide

@@ -45,10 +45,10 @@ for bot's name and email.

- For the profile picture, feel free to use the {% site_name %} logo: + For the profile picture, feel free to use the {{ site_name }} logo:

- {% site_name %} logo + {{ site_name }} logo

After you have filled out the values, @@ -68,7 +68,7 @@

Copy the displayed bot's credentials into the form below. - Also specify the stream or the private user you want {% site_name %} + Also specify the stream or the private user you want {{ site_name }} to post notifications to.

diff --git a/templates/payments/pricing.html b/templates/payments/pricing.html index 068682c7..47cba7a6 100644 --- a/templates/payments/pricing.html +++ b/templates/payments/pricing.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static compress hc_extras %} -{% block title %}Pricing - It's Free! - {% site_name %}{% endblock %} +{% block title %}Pricing - It's Free! - {{ site_name }}{% endblock %} {% block description %} @@ -22,7 +22,7 @@ {% if sub.plan_id %} Your account is currently on the {{ sub.plan_name }} - plan. Thank you for supporting {% site_name %}! + plan. Thank you for supporting {{ site_name }}! {% else %} Your account is currently on the {{ sub.plan_name|default:"Hobbyist" }} plan. @@ -226,7 +226,7 @@ Braintree, a division of PayPal. Your credit card or PayPal credentials are never directly handled by or - stored on {% site_name %} servers. + stored on {{ site_name }} servers.

Braintree is a validated Level 1 PCI DSS Compliant @@ -248,7 +248,7 @@

Both plans are similar. The "Supporter" plan is offered in case "Hobbyist" fits your usage but you wish - to support {% site_name %} financially. + to support {{ site_name }} financially.

@@ -264,7 +264,7 @@

What is the "log entries per check" number?

- For each of your checks, {% site_name %} keeps a + For each of your checks, {{ site_name }} keeps a historic log of the received pings. The log can be useful for auditing past activity of your cron jobs.

@@ -297,7 +297,7 @@
diff --git a/templates/payments/pricing_not_owner.html b/templates/payments/pricing_not_owner.html index 896c8282..65733bbb 100644 --- a/templates/payments/pricing_not_owner.html +++ b/templates/payments/pricing_not_owner.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load hc_extras %} -{% block title %}Pricing - {% site_name %}{% endblock %} +{% block title %}Pricing - {{ site_name }}{% endblock %} {% block content %}