From b3f2bc64a5128ceb91f40b67cfaa5154e43df154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com> Date: Thu, 30 Jun 2022 10:22:46 +0300 Subject: [PATCH] Improve "Show Usage Examples" dialog, "Email" tab --- hc/front/management/commands/pygmentize.py | 1 - static/css/my_checks.css | 3 ++- templates/front/show_usage_modal.html | 10 ++++++---- templates/front/snippets/crontab.html | 3 --- templates/front/snippets/crontab.txt | 2 -- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 templates/front/snippets/crontab.html delete mode 100644 templates/front/snippets/crontab.txt diff --git a/hc/front/management/commands/pygmentize.py b/hc/front/management/commands/pygmentize.py index b0501b2c..1400db5f 100644 --- a/hc/front/management/commands/pygmentize.py +++ b/hc/front/management/commands/pygmentize.py @@ -31,7 +31,6 @@ class Command(BaseCommand): _process("bash_curl", lexers.BashLexer()) _process("bash_wget", lexers.BashLexer()) _process("browser", lexers.JavascriptLexer()) - _process("crontab", lexers.BashLexer()) _process("cs", lexers.CSharpLexer()) _process("node", lexers.JavascriptLexer()) _process("go", lexers.GoLexer()) diff --git a/static/css/my_checks.css b/static/css/my_checks.css index b915d069..5209758f 100644 --- a/static/css/my_checks.css +++ b/static/css/my_checks.css @@ -187,7 +187,8 @@ padding: 0; } -#show-usage-modal pre { +#show-usage-modal pre, +#show-usage-modal #email { margin: 0; padding: 15px; } diff --git a/templates/front/show_usage_modal.html b/templates/front/show_usage_modal.html index 89d58325..f9cf19bd 100644 --- a/templates/front/show_usage_modal.html +++ b/templates/front/show_usage_modal.html @@ -93,10 +93,12 @@ </div> <div class="tab-pane" id="email"> <p> - As an alternative to HTTP/HTTPS requests, - you can "ping" this check by sending an - email message to - <code class="em">{{ check.email }}</code> + Signal success or failure by sending an + email message to <a href="mailto:{{ check.email }}">{{ check.email }}</a>. + </p> + <p> + <a href="{% url 'hc-serve-doc' 'email' %}">Read more</a> + about pinging via email. </p> </div> {% endwith %} diff --git a/templates/front/snippets/crontab.html b/templates/front/snippets/crontab.html deleted file mode 100644 index 2c2e6793..00000000 --- a/templates/front/snippets/crontab.html +++ /dev/null @@ -1,3 +0,0 @@ -<div class="highlight"><pre><span></span><span class="c1"># m h dom mon dow command</span> - <span class="m">8</span> <span class="m">6</span> * * * /home/user/backup.sh <span class="o">&&</span> curl -fsS -m <span class="m">10</span> --retry <span class="m">5</span> -o /dev/null {{ ping_url }} -</pre></div> diff --git a/templates/front/snippets/crontab.txt b/templates/front/snippets/crontab.txt deleted file mode 100644 index f1163e36..00000000 --- a/templates/front/snippets/crontab.txt +++ /dev/null @@ -1,2 +0,0 @@ -# m h dom mon dow command - 8 6 * * * /home/user/backup.sh && curl -fsS -m 10 --retry 5 -o /dev/null PING_URL