From 09e040ec111337059efd64e40c295d10984c2a13 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Mar 2022 08:59:41 -0700 Subject: [PATCH 1/5] Equal height for dashboard notifications --- .../templates/settings/dashboard/dashboard.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index ede2dcde8..27ce0bb9f 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -38,8 +38,8 @@
{% if reports %} -
- +
+ {% blocktrans trimmed count counter=reports with display_count=reports|intcomma %} {{ display_count }} open report {% plural %} @@ -50,8 +50,8 @@ {% endif %} {% if pending_domains %} -
- +
+ {% blocktrans trimmed count counter=pending_domains with display_count=pending_domains|intcomma %} {{ display_count }} domain needs review {% plural %} @@ -62,8 +62,8 @@ {% 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 %} @@ -74,8 +74,8 @@ {% 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 %} From 68e3a71b18354219084fd59f262229f25d9f3551 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Mar 2022 09:01:04 -0700 Subject: [PATCH 2/5] Consistent height for instance stats --- .../templates/settings/dashboard/dashboard.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index 27ce0bb9f..cec3e89ac 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -10,26 +10,26 @@ {% block panel %}
-
-
+
+

{% trans "Total users" %}

{{ users|intcomma }}

-
-
+
+

{% trans "Active this month" %}

{{ active_users|intcomma }}

-
-
+
+

{% trans "Statuses" %}

{{ statuses|intcomma }}

-
-
+
+

{% trans "Works" %}

{{ works|intcomma }}

From 1cfe3b3f941f557adadeb99146e7c7fecf08d5b0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Mar 2022 09:09:25 -0700 Subject: [PATCH 3/5] Re-orders site settings registration toggles Having require email confirm next to allow registration seems better to me --- bookwyrm/templates/settings/site.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html index d55514b55..4fd147834 100644 --- a/bookwyrm/templates/settings/site.html +++ b/bookwyrm/templates/settings/site.html @@ -139,6 +139,13 @@ {% trans "Allow registration" %}
+
+ +

{% trans "(Recommended if registration is open)" %}

+
-
- -

{% trans "(Recommended if registration is open)" %}

-
{{ site_form.registration_closed_text }} @@ -171,7 +171,7 @@
{{ site_form.invite_request_text }} - + {% include 'snippets/form_errors.html' with errors_list=site_form.invite_request_text.errors id="desc_invite_request_text" %}
From 7f6a98e764eedb8e1781b755f1aa05192cc053ca Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Mar 2022 09:11:59 -0700 Subject: [PATCH 4/5] Don't let site settings form get too wide --- bookwyrm/templates/settings/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html index d76c954dc..862de9585 100644 --- a/bookwyrm/templates/settings/layout.html +++ b/bookwyrm/templates/settings/layout.html @@ -93,7 +93,7 @@ {% endif %} -
+
{% block panel %}{% endblock %}
From f0a87e2a2069557cb6a6f1990eadfed557775db6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 19 Mar 2022 09:13:08 -0700 Subject: [PATCH 5/5] Use fullwidth tables in admin views --- bookwyrm/templates/settings/announcements/announcements.html | 2 +- bookwyrm/templates/settings/automod/rules.html | 2 +- bookwyrm/templates/settings/federation/instance_list.html | 2 +- bookwyrm/templates/settings/themes.html | 2 +- bookwyrm/templates/settings/users/user_admin.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/settings/announcements/announcements.html b/bookwyrm/templates/settings/announcements/announcements.html index 6299ba3d9..784fef166 100644 --- a/bookwyrm/templates/settings/announcements/announcements.html +++ b/bookwyrm/templates/settings/announcements/announcements.html @@ -14,7 +14,7 @@ {% block panel %}
- +
{% url 'settings-announcements' as url %} diff --git a/bookwyrm/templates/settings/automod/rules.html b/bookwyrm/templates/settings/automod/rules.html index ef0a49beb..128ff20b7 100644 --- a/bookwyrm/templates/settings/automod/rules.html +++ b/bookwyrm/templates/settings/automod/rules.html @@ -154,7 +154,7 @@
- +
diff --git a/bookwyrm/templates/settings/federation/instance_list.html b/bookwyrm/templates/settings/federation/instance_list.html index 5cbec8761..89c50e5e6 100644 --- a/bookwyrm/templates/settings/federation/instance_list.html +++ b/bookwyrm/templates/settings/federation/instance_list.html @@ -25,7 +25,7 @@ - +
{% url 'settings-federation' as url %}
diff --git a/bookwyrm/templates/settings/themes.html b/bookwyrm/templates/settings/themes.html index 3d4d83dec..afa3f0be4 100644 --- a/bookwyrm/templates/settings/themes.html +++ b/bookwyrm/templates/settings/themes.html @@ -88,7 +88,7 @@

{% trans "Available Themes" %}

- +
{% trans "Theme name" %} diff --git a/bookwyrm/templates/settings/users/user_admin.html b/bookwyrm/templates/settings/users/user_admin.html index e3de77938..fdd9fb7df 100644 --- a/bookwyrm/templates/settings/users/user_admin.html +++ b/bookwyrm/templates/settings/users/user_admin.html @@ -33,7 +33,7 @@
- +
{% url 'settings-users' as url %}