From 02cdbb922227c359a5de84aa1caa97a9a3f9abcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Fri, 16 Jul 2021 16:36:32 +0300 Subject: [PATCH] Fix page structure, update copy --- static/css/welcome.css | 15 +++- templates/front/welcome.html | 140 +++++++++++++++++------------------ 2 files changed, 81 insertions(+), 74 deletions(-) diff --git a/static/css/welcome.css b/static/css/welcome.css index 1188eb49..dee2fa56 100644 --- a/static/css/welcome.css +++ b/static/css/welcome.css @@ -83,11 +83,16 @@ margin-bottom: 80px; } -#welcome-integrations h1 { +#welcome-integrations h2 { + font-size: 24px; text-align: center; margin-bottom: 20px; } +#welcome-integrations h2 small { + font-size: 14px; +} + #welcome-integrations .integration { display: block; color: var(--text-color); @@ -109,13 +114,15 @@ height: 48px; } -#welcome-integrations h3 { +#welcome-integrations p { font-size: 18px; - margin-bottom: 0; + margin: 20px 0 0 0; + line-height: 1.1; } -#welcome-integrations h3 small { +#welcome-integrations p small { font-size: 12px; + color: #777777; } .use-cases li { diff --git a/templates/front/welcome.html b/templates/front/welcome.html index 4da4fa27..9f1e1b8f 100644 --- a/templates/front/welcome.html +++ b/templates/front/welcome.html @@ -245,7 +245,7 @@ {% blocktrans trimmed %} Up. - Time since last ping has not exceeded Period. + The time since the last ping has not exceeded Period. {% endblocktrans %} @@ -256,7 +256,7 @@ {% blocktrans trimmed %} Late. - Time since last ping has exceeded Period, + The time since the last ping has exceeded Period, but has not yet exceeded Period + Grace. {% endblocktrans %} @@ -268,8 +268,8 @@ {% blocktrans trimmed %} Down. - Time since last ping has exceeded Period + Grace. - When check goes from "Late" to "Down", {{ site_name }} + The time since the last ping has exceeded Period + Grace. + When a check goes from "Late" to "Down", {{ site_name }} sends you a notification. {% endblocktrans %} @@ -304,7 +304,7 @@

{% blocktrans trimmed %} Grace Time specifies how "late" a ping can - be before you will be alerted. Set it to be a little above + be before you are alerted. You should set it to be a little above the expected duration of your cron job. {% endblocktrans %}

@@ -325,7 +325,7 @@ {% blocktrans trimmed %} You can add a longer, free-form description to each check. Leave notes and pointers for yourself and - for your team. + your team. {% endblocktrans %}

@@ -356,8 +356,8 @@

{% blocktrans trimmed %} - The badges have public, but hard-to-guess URLs. - You can use them in your READMEs, dashboards or status pages. + The badges have public but hard-to-guess URLs. + You can use them in your READMEs, dashboards, or status pages. {% endblocktrans %}

@@ -365,19 +365,19 @@
-

{% trans "Integrations" %}
+

{% trans "Integrations" %}
{% trans "Set up multiple ways to get notified:" %} -

+
-

+

{% trans "Email" %}
  -

+

@@ -385,10 +385,10 @@
-

+

Webhooks
  -

+

{% endif %} @@ -398,18 +398,18 @@ {% if enable_slack_btn %} -

+

Slack
{% trans "Chat" %} -

+

{% else %}
-

+

Slack
{% trans "Chat" %} -

+

{% endif %}
@@ -419,10 +419,10 @@
-

+

Apprise
{% trans "Push Notifications" %} -

+

{% endif %} @@ -431,10 +431,10 @@
-

+

Discord
{% trans "Chat" %} -

+

{% endif %} @@ -443,7 +443,7 @@
-

LINE Notify
Chat

+

LINE Notify
Chat

{% endif %} @@ -452,10 +452,10 @@
-

+

Matrix
{% trans "Chat" %} -

+

{% endif %} @@ -464,10 +464,10 @@
-

+

Mattermost
{% trans "Chat" %} -

+

{% endif %} @@ -476,10 +476,10 @@
-

+

Microsoft Teams
{% trans "Chat" %} -

+

{% endif %} @@ -488,10 +488,10 @@
-

- Opsgenie
+

+ OpsGenie
{% trans "Incident Management" %} -

+

{% endif %} @@ -501,18 +501,18 @@ {% if enable_pd_simple %} -

+

PagerDuty
{% trans "Incident Management" %} -

+

{% else %}
-

+

PagerDuty
{% trans "Incident Management" %} -

+

{% endif %} @@ -522,10 +522,10 @@
-

+

PagerTree
{% trans "Incident Management" %} -

+

{% endif %} @@ -534,10 +534,10 @@
-

+

{% trans "Phone Call" %}
  -

+

{% endif %} @@ -546,10 +546,10 @@
-

+

Prometheus
{% trans "Event Monitoring" %} -

+

{% endif %} @@ -558,10 +558,10 @@
-

+

Pushbullet
{% trans "Push Notifications" %} -

+

{% endif %} @@ -570,10 +570,10 @@
-

+

Pushover
{% trans "Push Notifications" %} -

+

{% endif %} @@ -582,10 +582,10 @@
-

+

{% trans "Shell Commands" %}
  -

+

{% endif %} @@ -594,10 +594,10 @@
-

+

{% trans "Signal" %}
{% trans "Chat" %} -

+

{% endif %} @@ -606,10 +606,10 @@
-

+

{% trans "SMS" %}
  -

+

{% endif %} @@ -618,10 +618,10 @@
Spike.sh icon -

+

Spike.sh
{% trans "Incident Management" %} -

+

{% endif %} @@ -630,10 +630,10 @@
-

+

Telegram
{% trans "Chat" %} -

+

{% endif %} @@ -642,10 +642,10 @@
-

+

Trello
{% trans "Project Management" %} -

+

{% endif %} @@ -654,10 +654,10 @@
-

+

Splunk On-Call
{% trans "Incident Management" %} -

+

{% endif %} @@ -666,10 +666,10 @@
-

+

WhatsApp
{% trans "Chat" %} -

+

{% endif %} @@ -678,10 +678,10 @@
-

+

Zulip
{% trans "Chat" %} -

+

{% endif %} @@ -696,13 +696,13 @@
-

{% trans "Cron Jobs" %}

+

{% trans "Cron Jobs" %}

{% blocktrans trimmed %} {{ 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 + cron job often has no immediate visible consequences and can go unnoticed for a long time. {% endblocktrans %}

@@ -719,13 +719,13 @@
-

{% trans "Processes, Services, Servers" %}

+

{% trans "Processes, Services, Servers" %}

{% blocktrans trimmed %} - {{ 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 + You can use {{ site_name }} for lightweight server + monitoring: ensuring a particular system service or the whole server + is alive and healthy. Write a shell script that checks for a specific condition, and pings {{ site_name }} if successful. Run the shell script regularly. {% endblocktrans %}