From ac8e2e8cd6f3ebe24c883685039ee697d71a3dda Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Thu, 4 Sep 2025 12:55:15 +0200 Subject: [PATCH] Tailwind 3 => 4: ring => ring-3 https://tailwindcss.com/docs/upgrade-guide#renamed-utilities --- bsmain/templates/bsmain/auth_token_list.html | 4 +-- issues/templates/issues/_event_nav.html | 10 +++--- issues/templates/issues/base.html | 18 +++++------ issues/templates/issues/event_404.html | 6 ++-- issues/templates/issues/event_list.html | 10 +++--- issues/templates/issues/history.html | 8 ++--- issues/templates/issues/issue_list.html | 32 +++++++++---------- issues/templates/issues/stacktrace.html | 8 ++--- .../projects/project_alerts_setup.html | 6 ++-- projects/templates/projects/project_edit.html | 6 ++-- projects/templates/projects/project_list.html | 8 ++--- .../projects/project_member_settings.html | 2 +- .../templates/projects/project_members.html | 8 ++--- .../projects/project_members_accept.html | 4 +-- .../projects/project_members_invite.html | 4 +-- .../project_messaging_service_edit.html | 2 +- projects/templates/projects/project_new.html | 2 +- teams/templates/teams/team_edit.html | 2 +- teams/templates/teams/team_list.html | 8 ++--- .../templates/teams/team_member_settings.html | 2 +- teams/templates/teams/team_members.html | 8 ++--- .../templates/teams/team_members_accept.html | 4 +-- .../templates/teams/team_members_invite.html | 4 +-- teams/templates/teams/team_new.html | 2 +- templates/bugsink/csrf_debug.html | 2 +- users/templates/users/preferences.html | 2 +- users/templates/users/user_edit.html | 2 +- users/templates/users/user_list.html | 10 +++--- 28 files changed, 92 insertions(+), 92 deletions(-) diff --git a/bsmain/templates/bsmain/auth_token_list.html b/bsmain/templates/bsmain/auth_token_list.html index 623a723..af55083 100644 --- a/bsmain/templates/bsmain/auth_token_list.html +++ b/bsmain/templates/bsmain/auth_token_list.html @@ -25,7 +25,7 @@
{% csrf_token %} {# margins display slightly different from the {% translate "Add Token" %} +
@@ -51,7 +51,7 @@
- +
diff --git a/issues/templates/issues/_event_nav.html b/issues/templates/issues/_event_nav.html index a36381f..e1766dd 100644 --- a/issues/templates/issues/_event_nav.html +++ b/issues/templates/issues/_event_nav.html @@ -2,11 +2,11 @@ {% load i18n %}
{# nav="last": when doing a new search on an event-page, you want the most recent matching event to show up #} - +
{% if has_prev %} {# no need for 'is_first': if you can go to the left, you can go all the way to the left too #} - + {% else %} @@ -16,7 +16,7 @@ {% endif %} {% if has_prev %} - + {% else %} @@ -26,7 +26,7 @@ {% endif %} {% if has_next %} - + {% else %} @@ -36,7 +36,7 @@ {% endif %} {% if has_next %} - + {% else %} diff --git a/issues/templates/issues/base.html b/issues/templates/issues/base.html index 668f6ee..e4d1704 100644 --- a/issues/templates/issues/base.html +++ b/issues/templates/issues/base.html @@ -16,7 +16,7 @@ {% csrf_token %} {% if issue.is_resolved %}{# i.e. buttons disabled #} {# see issues/tests.py for why this is turned off ATM #} - {# #} + {# #} {% spaceless %}{# needed to avoid whitespace between the looks-like-one-buttons #} {% if issue.project.has_releases %} @@ -34,16 +34,16 @@ {% if issue.project.has_releases %} {# 'by next' is shown even if 'by current' is also shown: just because you haven't seen 'by current' doesn't mean it's actually already solved; and in fact we show this option first precisely because we can always show it #} - +
- + {# note that we can depend on get_latest_release being available, because we're in the 'project.has_releases' branch #}
{% if not issue.occurs_in_last_release %} - + {% else %} {% endif %} @@ -53,7 +53,7 @@ {% else %} - + {% endif %} {% endspaceless %} @@ -61,18 +61,18 @@ {% spaceless %}{# needed to avoid whitespace between the looks-like-one-buttons #} {% if not issue.is_muted and not issue.is_resolved %} - + {% else %} {% endif %}
{% if not issue.is_muted and not issue.is_resolved %} - +
{% for mute_option in mute_options %} - + {% endfor %}
{% else %} @@ -85,7 +85,7 @@
{% if issue.is_muted and not issue.is_resolved %} - + {% else %} {% endif %} diff --git a/issues/templates/issues/event_404.html b/issues/templates/issues/event_404.html index 366861c..6cc6f83 100644 --- a/issues/templates/issues/event_404.html +++ b/issues/templates/issues/event_404.html @@ -16,11 +16,11 @@
{# copy/paste of _event_nav, but not based on any event (we have none), prev/next are meaningless also; first/last only when we have an event_qs to navigate through #}
{# nav="last": when doing a new search on an event-page, you want the most recent matching event to show up #} - +
{% if event_qs_count %} - + @@ -39,7 +39,7 @@
{% if event_qs_count %} - + {% else %} diff --git a/issues/templates/issues/event_list.html b/issues/templates/issues/event_list.html index dca22b9..6ffb91c 100644 --- a/issues/templates/issues/event_list.html +++ b/issues/templates/issues/event_list.html @@ -27,11 +27,11 @@ {# adapted copy/pasta from _event_nav #}
- +
{% if page_obj.has_previous %} {# no need for 'is_first': if you can go to the left, you can go all the way to the left too #} - + {% else %}
@@ -40,7 +40,7 @@ {% endif %} {% if page_obj.has_previous %} - + {% else %} @@ -50,7 +50,7 @@ {% endif %} {% if page_obj.has_next %} - + {% else %} @@ -60,7 +60,7 @@ {% endif %} {% if page_obj.has_next %} - + {% else %} diff --git a/issues/templates/issues/history.html b/issues/templates/issues/history.html index fa99756..2bb3dc7 100644 --- a/issues/templates/issues/history.html +++ b/issues/templates/issues/history.html @@ -32,8 +32,8 @@
{% csrf_token %} - - + +
{# 'body' part of the balloon #} @@ -98,8 +98,8 @@ {% endif %} diff --git a/issues/templates/issues/issue_list.html b/issues/templates/issues/issue_list.html index 415cfb8..f22494d 100644 --- a/issues/templates/issues/issue_list.html +++ b/issues/templates/issues/issue_list.html @@ -20,7 +20,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -64,7 +64,7 @@
{# the below sounds expensive, but this list is cached #} - {% if page_obj.object_list|length > 0 %}{% endif %} + {% if page_obj.object_list|length > 0 %}{% endif %}
@@ -72,7 +72,7 @@ {% if disable_resolve_buttons %} {# see issues/tests.py for why this is turned off ATM #} - {# #} + {# #} {% spaceless %}{# needed to avoid whitespace between the looks-like-one-buttons #} {% if project.has_releases %} @@ -90,23 +90,23 @@ {% if project.has_releases %} {# 'by next' is shown even if 'by current' is also shown: just because you haven't seen 'by current' doesn't mean it's actually already solved; and in fact we show this option first precisely because we can always show it #} - +
- + {# note that we can depend on get_latest_release being available, because we're in the 'project.has_releases' branch #}
{# note that an if-statement ("issue.occurs_in_last_release") is missing here, because we're not on the level of a single issue #} {# handling of that question (but per-issue, and after-click) is done in views.py, _q_for_invalid_for_action() #} - +
{% else %} - + {% endif %} {% endspaceless %} @@ -114,18 +114,18 @@ {% spaceless %}{# needed to avoid whitespace between the looks-like-one-buttons #} {% if not disable_mute_buttons %} - + {% else %} {% endif %}
{% if not disable_mute_buttons %} - +
{% for mute_option in mute_options %} - + {% endfor %}
{% else %} @@ -135,16 +135,16 @@
{% if not disable_unmute_buttons %} - + {% else %} {% endif %}
- +
- +
@@ -153,7 +153,7 @@ {# NOTE: "reopen" is not available in the UI as per the notes in issue_detail #} - {# only for resolved/muted items #} + {# only for resolved/muted items #} @@ -165,7 +165,7 @@
- +
diff --git a/issues/templates/issues/stacktrace.html b/issues/templates/issues/stacktrace.html index 248b4a8..870735c 100644 --- a/issues/templates/issues/stacktrace.html +++ b/issues/templates/issues/stacktrace.html @@ -41,10 +41,10 @@ {% if forloop.counter0 == 0 %}
{# container of 2 divs: one for buttons, one for event-nav; on smaller screens these are 2 rows; on bigger they are side-by-side #}
- - - - + + + +
diff --git a/projects/templates/projects/project_alerts_setup.html b/projects/templates/projects/project_alerts_setup.html index 293690c..01d54cd 100644 --- a/projects/templates/projects/project_alerts_setup.html +++ b/projects/templates/projects/project_alerts_setup.html @@ -25,7 +25,7 @@

{{ project.name }} ยท {% translate "Alerts" %}

- {% translate "Add" %} + {% translate "Add" %}
@@ -65,8 +65,8 @@
- - + +
diff --git a/projects/templates/projects/project_edit.html b/projects/templates/projects/project_edit.html index 7069c68..872a38a 100644 --- a/projects/templates/projects/project_edit.html +++ b/projects/templates/projects/project_edit.html @@ -22,7 +22,7 @@
{% csrf_token %} - +
@@ -48,9 +48,9 @@ {% tailwind_formfield form.dsn %}
- + {% translate "Cancel" %} - +
diff --git a/projects/templates/projects/project_list.html b/projects/templates/projects/project_list.html index 7995aef..bb0b89c 100644 --- a/projects/templates/projects/project_list.html +++ b/projects/templates/projects/project_list.html @@ -18,7 +18,7 @@
{% if can_create %}
- {% translate "New Project" %} + {% translate "New Project" %}
{% endif %}
{# top, RHS (buttons) #} @@ -47,7 +47,7 @@ {% comment %}
- +
{% endcomment %} @@ -155,13 +155,13 @@ {% else %}
- +
{% endif %} {% else %} {% if ownership_filter == "teams" or project.is_joinable or request.user.is_superuser %}{# ownership_filter check: you can always join your own team's projects, so if you're looking at a list of them... #}
- +
{% endif %} {% endif %} diff --git a/projects/templates/projects/project_member_settings.html b/projects/templates/projects/project_member_settings.html index 78f4bca..1da4451 100644 --- a/projects/templates/projects/project_member_settings.html +++ b/projects/templates/projects/project_member_settings.html @@ -38,7 +38,7 @@ {% tailwind_formfield form.role %} {% tailwind_formfield form.send_email_alerts %} - + {% if this_is_you %} {% translate "Cancel" %} {# not quite perfect, because "you" can also click on yourself in the member list #} {% else %} diff --git a/projects/templates/projects/project_members.html b/projects/templates/projects/project_members.html index a940afa..6da0d46 100644 --- a/projects/templates/projects/project_members.html +++ b/projects/templates/projects/project_members.html @@ -25,7 +25,7 @@

{% translate "Project Members" %}

- {% translate "Invite Member" %} + {% translate "Invite Member" %}
@@ -56,12 +56,12 @@
{% if not member.accepted %} - + {% endif %} {% if request.user == member.user %} - + {% else %} {# NOTE: in our setup request_user_is_admin is implied because only admins may view the membership page #} - + {% endif %}
diff --git a/projects/templates/projects/project_members_accept.html b/projects/templates/projects/project_members_accept.html index 5f33613..56ef47c 100644 --- a/projects/templates/projects/project_members_accept.html +++ b/projects/templates/projects/project_members_accept.html @@ -22,8 +22,8 @@ {% blocktranslate with project_name=project.name role=membership.get_role_display %}You have been invited to join the project "{{ project_name }}" in the role of "{{ role }}". Please confirm by clicking the button below.{% endblocktranslate %} - - + + diff --git a/projects/templates/projects/project_members_invite.html b/projects/templates/projects/project_members_invite.html index 05ba48d..38a14c3 100644 --- a/projects/templates/projects/project_members_invite.html +++ b/projects/templates/projects/project_members_invite.html @@ -47,8 +47,8 @@ {% endif %} - - + + {% translate "Cancel" %} diff --git a/projects/templates/projects/project_messaging_service_edit.html b/projects/templates/projects/project_messaging_service_edit.html index bc7a969..def83f6 100644 --- a/projects/templates/projects/project_messaging_service_edit.html +++ b/projects/templates/projects/project_messaging_service_edit.html @@ -60,7 +60,7 @@ {% tailwind_formfield field %} {% endfor %} - + Cancel diff --git a/projects/templates/projects/project_new.html b/projects/templates/projects/project_new.html index 99404d7..dca30bc 100644 --- a/projects/templates/projects/project_new.html +++ b/projects/templates/projects/project_new.html @@ -23,7 +23,7 @@ {% tailwind_formfield form.visibility %} {% tailwind_formfield form.retention_max_event_count %} - + {% translate "Cancel" %} diff --git a/teams/templates/teams/team_edit.html b/teams/templates/teams/team_edit.html index c3d33eb..d7ebf2d 100644 --- a/teams/templates/teams/team_edit.html +++ b/teams/templates/teams/team_edit.html @@ -26,7 +26,7 @@ {% tailwind_formfield form.visibility %}
- + {% translate "Cancel" %}
diff --git a/teams/templates/teams/team_list.html b/teams/templates/teams/team_list.html index 367a0ce..5eddde4 100644 --- a/teams/templates/teams/team_list.html +++ b/teams/templates/teams/team_list.html @@ -18,7 +18,7 @@
{% if can_create %}
- {% translate "New Team" %} + {% translate "New Team" %}
{% endif %}
{# top, RHS (buttons) #} @@ -34,7 +34,7 @@ {% comment %}
- +
{% endcomment %} @@ -105,13 +105,13 @@ {% else %}
- +
{% endif %} {% else %} {% if team.is_joinable or request.user.is_superuser %}
- +
{% endif %} {% endif %} diff --git a/teams/templates/teams/team_member_settings.html b/teams/templates/teams/team_member_settings.html index 4e3130f..49af6f5 100644 --- a/teams/templates/teams/team_member_settings.html +++ b/teams/templates/teams/team_member_settings.html @@ -38,7 +38,7 @@ {% tailwind_formfield form.role %} {% tailwind_formfield form.send_email_alerts %} - + {% if this_is_you %} {% translate "Cancel" %} {# not quite perfect, because "you" can also click on yourself in the member list #} {% else %} diff --git a/teams/templates/teams/team_members.html b/teams/templates/teams/team_members.html index 3369d0b..d98dcb8 100644 --- a/teams/templates/teams/team_members.html +++ b/teams/templates/teams/team_members.html @@ -25,7 +25,7 @@

{% translate "Team Members" %}

- {% translate "Invite Member" %} + {% translate "Invite Member" %}
@@ -56,12 +56,12 @@
{% if not member.accepted %} - + {% endif %} {% if request.user == member.user %} - + {% else %} {# NOTE: in our setup request_user_is_admin is implied because only admins may view the membership page #} - + {% endif %}
diff --git a/teams/templates/teams/team_members_accept.html b/teams/templates/teams/team_members_accept.html index 8fb965f..4aca981 100644 --- a/teams/templates/teams/team_members_accept.html +++ b/teams/templates/teams/team_members_accept.html @@ -21,8 +21,8 @@ You have been invited to join the team "{{ team.name }}" in the role of "{{ membership.get_role_display }}". Please confirm by clicking the button below. - - + + diff --git a/teams/templates/teams/team_members_invite.html b/teams/templates/teams/team_members_invite.html index 29dd910..6e5b0e9 100644 --- a/teams/templates/teams/team_members_invite.html +++ b/teams/templates/teams/team_members_invite.html @@ -49,8 +49,8 @@ {% endif %} - - + + {% translate "Cancel" %} diff --git a/teams/templates/teams/team_new.html b/teams/templates/teams/team_new.html index 2d9122a..ee35322 100644 --- a/teams/templates/teams/team_new.html +++ b/teams/templates/teams/team_new.html @@ -21,7 +21,7 @@ {% tailwind_formfield form.name %} {% tailwind_formfield form.visibility %} - + {% translate "Cancel" %} diff --git a/templates/bugsink/csrf_debug.html b/templates/bugsink/csrf_debug.html index feaaa13..a775ca5 100644 --- a/templates/bugsink/csrf_debug.html +++ b/templates/bugsink/csrf_debug.html @@ -25,7 +25,7 @@

POST Data

{% csrf_token %} - +
{% else %} diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html index d891668..1fdddb5 100644 --- a/users/templates/users/preferences.html +++ b/users/templates/users/preferences.html @@ -31,7 +31,7 @@ {% tailwind_formfield form.theme_preference %} {% tailwind_formfield form.language %} - + diff --git a/users/templates/users/user_edit.html b/users/templates/users/user_edit.html index dd83fbf..be0b0e2 100644 --- a/users/templates/users/user_edit.html +++ b/users/templates/users/user_edit.html @@ -24,7 +24,7 @@ {% tailwind_formfield form.username %} - + {% translate "Cancel" %} diff --git a/users/templates/users/user_list.html b/users/templates/users/user_list.html index bd952a3..75476c2 100644 --- a/users/templates/users/user_list.html +++ b/users/templates/users/user_list.html @@ -21,7 +21,7 @@
{% csrf_token %} - +
@@ -46,7 +46,7 @@ {% comment %} Our current invite-system is tied to either a team or a project; no "global" invites (yet).
- Invite Member + Invite Member
{% endcomment %} @@ -77,10 +77,10 @@
{% if not request.user == user %} {% if user.is_active %} - + {% else %} - - + + {% endif %} {% endif %}