diff --git a/claims/templates/claims/base.html b/claims/templates/claims/base.html index 0b39450..af85e33 100644 --- a/claims/templates/claims/base.html +++ b/claims/templates/claims/base.html @@ -92,5 +92,6 @@ {% block content %}{% endblock %} {% block modals %}{% endblock %} + {% block extra_js %}{% endblock %} diff --git a/claims/templates/claims/user_management.html b/claims/templates/claims/user_management.html index 7d93aa8..5202a55 100644 --- a/claims/templates/claims/user_management.html +++ b/claims/templates/claims/user_management.html @@ -108,28 +108,21 @@

ID: {{ user.id }}

-
- {% csrf_token %} - - {{ form.user_id }} -
- - - +
+

{% trans "Behörigheter" %}

+
+ {% trans "Admin/staff" %} + {% trans "Får se utlägg" %} + {% trans "Får besluta utlägg" %} + {% trans "Får redigera utlägg" %} + {% trans "Får markera betalningar" %}
- - +

{% trans "Ta bort konto" %}

{% if delete_form %} @@ -159,3 +152,138 @@ {% endblock %} + +{% block modals %} + {{ block.super }} + {% for row in user_rows %} + {% with user=row.user form=row.permission_form %} + + {% endwith %} + {% endfor %} +{% endblock %} + +{% block extra_js %} + {{ block.super }} + +{% endblock %} diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 6a65e97..e432180 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 440bad8..7c5f2e7 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: claims-system 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-11-11 19:34+0000\n" +"POT-Creation-Date: 2025-11-11 19:43+0000\n" "PO-Revision-Date: 2025-11-08 23:40+0100\n" "Last-Translator: ChatGPT \n" "Language-Team: English\n" @@ -126,23 +126,28 @@ msgstr "That username is already taken." msgid "Lösenorden matchar inte." msgstr "Passwords do not match." -#: claims/forms.py:158 claims/templates/claims/user_management.html:118 +#: claims/forms.py:158 claims/templates/claims/user_management.html:114 +#: claims/templates/claims/user_management.html:184 msgid "Admin/staff" msgstr "Admin/staff" -#: claims/forms.py:159 claims/templates/claims/user_management.html:122 +#: claims/forms.py:159 claims/templates/claims/user_management.html:115 +#: claims/templates/claims/user_management.html:188 msgid "Får se utlägg" msgstr "May view claims" -#: claims/forms.py:160 claims/templates/claims/user_management.html:126 +#: claims/forms.py:160 claims/templates/claims/user_management.html:116 +#: claims/templates/claims/user_management.html:192 msgid "Får besluta utlägg" msgstr "May decide claims" -#: claims/forms.py:161 +#: claims/forms.py:161 claims/templates/claims/user_management.html:117 +#: claims/templates/claims/user_management.html:196 msgid "Får redigera utlägg" msgstr "May edit claims" -#: claims/forms.py:162 +#: claims/forms.py:162 claims/templates/claims/user_management.html:118 +#: claims/templates/claims/user_management.html:200 msgid "Får markera betalningar" msgstr "May mark payments" @@ -438,8 +443,7 @@ msgstr "Double-check the amount and account number before confirming." #: claims/templates/claims/dashboard.html:201 msgid "" "Du saknar behörighet att markera betalningar. Kontakta en administratör." -msgstr "" -"You do not have permission to mark payments. Contact an administrator." +msgstr "You do not have permission to mark payments. Contact an administrator." #: claims/templates/claims/dashboard.html:208 msgid "" @@ -534,6 +538,7 @@ msgid "Redigera utlägg" msgstr "Edit claim" #: claims/templates/claims/dashboard.html:513 +#: claims/templates/claims/user_management.html:174 msgid "Stäng" msgstr "Close" @@ -542,6 +547,7 @@ msgid "Ingen" msgstr "None" #: claims/templates/claims/dashboard.html:563 +#: claims/templates/claims/user_management.html:207 msgid "Avbryt" msgstr "Cancel" @@ -802,10 +808,12 @@ msgid "" msgstr "" "The permissions claims.view_claim, claims.change_claim, claims.edit_claim_details, " -"and claims.mark_claim_paid " -"control access to the dashboard, decision flow, edit dialog, and payment panel." +"slate-800 px-2 py-1 text-xs\">claims.change_claim, claims.edit_claim_details, and claims.mark_claim_paid " +"control access to the dashboard, decision flow, edit dialog, and payment " +"panel." #: claims/templates/claims/user_management.html:77 msgid "" @@ -843,40 +851,48 @@ msgstr "No name" msgid "Ingen e-post" msgstr "No email" -#: claims/templates/claims/user_management.html:130 -msgid "Spara behörigheter" -msgstr "Save permissions" +#: claims/templates/claims/user_management.html:112 +msgid "Behörigheter" +msgstr "Permissions" -#: claims/templates/claims/user_management.html:134 +#: claims/templates/claims/user_management.html:123 +#: claims/templates/claims/user_management.html:168 +msgid "Redigera behörigheter" +msgstr "Edit permissions" + +#: claims/templates/claims/user_management.html:127 msgid "Ta bort konto" msgstr "Remove account" -#: claims/templates/claims/user_management.html:136 +#: claims/templates/claims/user_management.html:129 msgid "Åtgärden går inte att ångra. Användaren förlorar omedelbart åtkomst." msgstr "This action cannot be undone. The user loses access immediately." -#: claims/templates/claims/user_management.html:137 -#, fuzzy, python-format -#| msgid "Ta bort {{ user.username }}?" +#: claims/templates/claims/user_management.html:130 +#, python-format msgid "Ta bort %(user.username)s?" -msgstr "Remove {{ user.username }}?" +msgstr "Delete %(user.username)s?" -#: claims/templates/claims/user_management.html:142 +#: claims/templates/claims/user_management.html:135 msgid "Ta bort användare" msgstr "Delete user" -#: claims/templates/claims/user_management.html:146 +#: claims/templates/claims/user_management.html:139 msgid "Kan inte tas bort (antingen du själv eller superuser)." msgstr "Cannot be removed (either yourself or a superuser)." -#: claims/templates/claims/user_management.html:154 +#: claims/templates/claims/user_management.html:147 msgid "Inga användare upplagda." msgstr "No users yet." -#: claims/templates/claims/user_management.html:155 +#: claims/templates/claims/user_management.html:148 msgid "Skapa det första kontot via formuläret ovan." msgstr "Create the first account using the form above." +#: claims/templates/claims/user_management.html:210 +msgid "Spara behörigheter" +msgstr "Save permissions" + #: claims/validators.py:87 #, python-format msgid "Kvitton får vara max %(size)s MB." diff --git a/locale/sv/LC_MESSAGES/django.mo b/locale/sv/LC_MESSAGES/django.mo index 2889d16..e8b84d3 100644 Binary files a/locale/sv/LC_MESSAGES/django.mo and b/locale/sv/LC_MESSAGES/django.mo differ diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index 080de96..f352be3 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-11-11 19:34+0000\n" +"POT-Creation-Date: 2025-11-11 19:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -132,23 +132,28 @@ msgstr "" msgid "Lösenorden matchar inte." msgstr "" -#: claims/forms.py:158 claims/templates/claims/user_management.html:118 +#: claims/forms.py:158 claims/templates/claims/user_management.html:114 +#: claims/templates/claims/user_management.html:184 msgid "Admin/staff" msgstr "" -#: claims/forms.py:159 claims/templates/claims/user_management.html:122 +#: claims/forms.py:159 claims/templates/claims/user_management.html:115 +#: claims/templates/claims/user_management.html:188 msgid "Får se utlägg" msgstr "" -#: claims/forms.py:160 claims/templates/claims/user_management.html:126 +#: claims/forms.py:160 claims/templates/claims/user_management.html:116 +#: claims/templates/claims/user_management.html:192 msgid "Får besluta utlägg" msgstr "" -#: claims/forms.py:161 +#: claims/forms.py:161 claims/templates/claims/user_management.html:117 +#: claims/templates/claims/user_management.html:196 msgid "Får redigera utlägg" msgstr "" -#: claims/forms.py:162 +#: claims/forms.py:162 claims/templates/claims/user_management.html:118 +#: claims/templates/claims/user_management.html:200 msgid "Får markera betalningar" msgstr "" @@ -531,6 +536,7 @@ msgid "Redigera utlägg" msgstr "" #: claims/templates/claims/dashboard.html:513 +#: claims/templates/claims/user_management.html:174 msgid "Stäng" msgstr "" @@ -539,6 +545,7 @@ msgid "Ingen" msgstr "" #: claims/templates/claims/dashboard.html:563 +#: claims/templates/claims/user_management.html:207 msgid "Avbryt" msgstr "" @@ -814,40 +821,49 @@ msgstr "" #: claims/templates/claims/user_management.html:105 msgid "Ingen e-post" -msgstr "" +msgstr "Ingen e-post" + +#: claims/templates/claims/user_management.html:112 +msgid "Behörigheter" +msgstr "Behörigheter" + +#: claims/templates/claims/user_management.html:123 +#: claims/templates/claims/user_management.html:168 +msgid "Redigera behörigheter" +msgstr "Redigera behörigheter" + +#: claims/templates/claims/user_management.html:127 +msgid "Ta bort konto" +msgstr "Ta bort konto" + +#: claims/templates/claims/user_management.html:129 +msgid "Åtgärden går inte att ångra. Användaren förlorar omedelbart åtkomst." +msgstr "Åtgärden går inte att ångra. Användaren förlorar omedelbart åtkomst." #: claims/templates/claims/user_management.html:130 -msgid "Spara behörigheter" -msgstr "" - -#: claims/templates/claims/user_management.html:134 -msgid "Ta bort konto" -msgstr "" - -#: claims/templates/claims/user_management.html:136 -msgid "Åtgärden går inte att ångra. Användaren förlorar omedelbart åtkomst." -msgstr "" - -#: claims/templates/claims/user_management.html:137 #, python-format msgid "Ta bort %(user.username)s?" -msgstr "" +msgstr "Ta bort %(user.username)s?" -#: claims/templates/claims/user_management.html:142 +#: claims/templates/claims/user_management.html:135 msgid "Ta bort användare" -msgstr "" +msgstr "Ta bort användare" -#: claims/templates/claims/user_management.html:146 +#: claims/templates/claims/user_management.html:139 msgid "Kan inte tas bort (antingen du själv eller superuser)." -msgstr "" +msgstr "Kan inte tas bort (antingen du själv eller superuser)." -#: claims/templates/claims/user_management.html:154 +#: claims/templates/claims/user_management.html:147 msgid "Inga användare upplagda." -msgstr "" +msgstr "Inga användare upplagda." -#: claims/templates/claims/user_management.html:155 +#: claims/templates/claims/user_management.html:148 msgid "Skapa det första kontot via formuläret ovan." -msgstr "" +msgstr "Skapa det första kontot via formuläret ovan." + +#: claims/templates/claims/user_management.html:210 +msgid "Spara behörigheter" +msgstr "Spara behörigheter" #: claims/validators.py:87 #, python-format