diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index 10d7f4f22..46f36f286 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -38,60 +38,23 @@
{% if email_config_error %} -
- - {% blocktrans trimmed %} - Your outgoing email address, {{ email_sender }}, may be misconfigured. - {% endblocktrans %} - {% trans "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." %} - -
- {% endif %} - - {% if reports %} -
- - {% blocktrans trimmed count counter=reports with display_count=reports|intcomma %} - {{ display_count }} open report - {% plural %} - {{ display_count }} open reports - {% endblocktrans %} - -
- {% endif %} - - {% if pending_domains %} -
- - {% blocktrans trimmed count counter=pending_domains with display_count=pending_domains|intcomma %} - {{ display_count }} domain needs review - {% plural %} - {{ display_count }} domains need review - {% endblocktrans %} - -
- {% endif %} - - {% if not site.allow_registration and site.allow_invite_requests and invite_requests %} -
- - {% blocktrans trimmed count counter=invite_requests with display_count=invite_requests|intcomma %} - {{ display_count }} invite request - {% plural %} - {{ display_count }} invite requests - {% endblocktrans %} - -
+ {% include 'settings/dashboard/warnings/email_config.html' with warning_level="danger" fullwidth=True %} {% endif %} {% if current_version %} -
- - {% blocktrans trimmed with current=current_version available=available_version %} - An update is available! You're running v{{ current }} and the latest release is {{ available }}. - {% endblocktrans %} - -
+ {% include 'settings/dashboard/warnings/update_version.html' with warning_level="warning" fullwidth=True %} + {% endif %} + + {% if reports %} + {% include 'settings/dashboard/warnings/reports.html' with warning_level="warning" %} + {% endif %} + + {% if pending_domains %} + {% include 'settings/dashboard/warnings/domain_review.html' with warning_level="primary" %} + {% endif %} + + {% if not site.allow_registration and site.allow_invite_requests and invite_requests %} + {% include 'settings/dashboard/warnings/invites.html' with warning_level="success" %} {% endif %}
diff --git a/bookwyrm/templates/settings/dashboard/warnings/domain_review.html b/bookwyrm/templates/settings/dashboard/warnings/domain_review.html new file mode 100644 index 000000000..3ae11e2f8 --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/domain_review.html @@ -0,0 +1,17 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} +{% load humanize %} + +{% block warning_link %} +{% url 'settings-link-domain' %} +{% endblock %} + +{% block warning_text %} + +{% blocktrans trimmed count counter=pending_domains with display_count=pending_domains|intcomma %} +{{ display_count }} domain needs review +{% plural %} +{{ display_count }} domains need review +{% endblocktrans %} + +{% endblock %} diff --git a/bookwyrm/templates/settings/dashboard/warnings/email_config.html b/bookwyrm/templates/settings/dashboard/warnings/email_config.html new file mode 100644 index 000000000..7c597705d --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/email_config.html @@ -0,0 +1,15 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} + +{% block warning_link %} +https://docs.joinbookwyrm.com/install-prod.html +{% endblock %} + +{% block warning_text %} + +{% blocktrans trimmed %} +Your outgoing email address, {{ email_sender }}, may be misconfigured. +{% endblocktrans %} +{% trans "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." %} + +{% endblock %} diff --git a/bookwyrm/templates/settings/dashboard/warnings/invites.html b/bookwyrm/templates/settings/dashboard/warnings/invites.html new file mode 100644 index 000000000..436596f91 --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/invites.html @@ -0,0 +1,17 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} +{% load humanize %} + +{% block warning_link %} +{% url 'settings-invite-requests' %} +{% endblock %} + +{% block warning_text %} + +{% blocktrans trimmed count counter=invite_requests with display_count=invite_requests|intcomma %} +{{ display_count }} invite request +{% plural %} +{{ display_count }} invite requests +{% endblocktrans %} + +{% endblock %} diff --git a/bookwyrm/templates/settings/dashboard/warnings/layout.html b/bookwyrm/templates/settings/dashboard/warnings/layout.html new file mode 100644 index 000000000..b1a6f06c2 --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/layout.html @@ -0,0 +1,6 @@ +
+ + {% block warning_text %}{% endblock %} + +
+ diff --git a/bookwyrm/templates/settings/dashboard/warnings/reports.html b/bookwyrm/templates/settings/dashboard/warnings/reports.html new file mode 100644 index 000000000..b55695806 --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/reports.html @@ -0,0 +1,17 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} +{% load humanize %} + +{% block warning_link %} +{% url 'settings-reports' %} +{% endblock %} + +{% block warning_text %} + +{% blocktrans trimmed count counter=reports with display_count=reports|intcomma %} +{{ display_count }} open report +{% plural %} +{{ display_count }} open reports +{% endblocktrans %} + +{% endblock %} diff --git a/bookwyrm/templates/settings/dashboard/warnings/update_version.html b/bookwyrm/templates/settings/dashboard/warnings/update_version.html new file mode 100644 index 000000000..f12e20ffd --- /dev/null +++ b/bookwyrm/templates/settings/dashboard/warnings/update_version.html @@ -0,0 +1,14 @@ +{% extends 'settings/dashboard/warnings/layout.html' %} +{% load i18n %} + +{% block warning_link %} +https://docs.joinbookwyrm.com/updating.html +{% endblock %} + +{% block warning_text %} + +{% blocktrans trimmed with current=current_version available=available_version %} +An update is available! You're running v{{ current }} and the latest release is {{ available }}. +{% endblocktrans %} + +{% endblock %}