Version Bump 4.0.0a5

Fix orphan tokens and remove unused messages from backends

Closes #1391

See merge request allianceauth/allianceauth!1570

.gitignore

@@ -73,3 +73,4 @@ celerybeat-schedule
 .flake8
 .pylintrc
 Makefile
+alliance_auth.sqlite3

.gitlab-ci.yml

@@ -99,19 +99,6 @@ test-3.11-core:
         coverage_format: cobertura
         path: coverage.xml
 
-test-pvpy-core:
-  <<: *only-default
-  image: pypy:3.9-bullseye
-  script:
-    - tox -e pypy-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-  allow_failure: true
-
 test-3.12-core:
   <<: *only-default
   image: python:3.12-rc-bullseye
@@ -123,7 +110,6 @@ test-3.12-core:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
-  allow_failure: true
 
 test-3.8-all:
   <<: *only-default
@@ -174,19 +160,6 @@ test-3.11-all:
         path: coverage.xml
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
 
-test-pvpy-all:
-  <<: *only-default
-  image: pypy:3.9-bullseye
-  script:
-    - tox -e pypy-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-  allow_failure: true
-
 test-3.12-all:
   <<: *only-default
   image: python:3.12-rc-bullseye
@@ -198,7 +171,6 @@ test-3.12-all:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
-  allow_failure: true
 
 build-test:
   stage: test
@@ -223,7 +195,7 @@ test-docs:
   <<: *only-default
   image: python:3.11-bullseye
   script:
-  - tox -e docs
+    - tox -e docs
 
 deploy_production:
   stage: deploy
@@ -259,7 +231,7 @@ build-image:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -t $MINOR_TAG -t $MAJOR_TAG -t $LATEST_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
   rules:
     - if: $CI_COMMIT_TAG
       when: delayed
@@ -279,7 +251,7 @@ build-image-dev:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -300,7 +272,7 @@ build-image-mr:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual

.readthedocs.yml

@@ -7,11 +7,14 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   apt_packages:
     - redis
   tools:
-    python: "3.8"
+    python: "3.11"
+  jobs:
+    post_system_dependencies:
+      - redis-server --daemonize yes
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
@@ -20,7 +23,10 @@ sphinx:
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
-# Optionally set the version of Python and requirements required to build your docs
+# Python requirements required to build your docs
 python:
   install:
-    - requirements: docs/requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host     = https://www.transifex.com
+host     = https://app.transifex.com
 lang_map = zh-Hans: zh_Hans
 
 [o:alliance-auth:p:alliance-auth:r:django-po]

.tx/config_20230406134150.bak

@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = zh-Hans:zh_Hans
-
-[alliance-auth.django-po]
-file_filter = allianceauth/locale/<lang>/LC_MESSAGES/django.po
-minimum_perc = 0
-source_file = allianceauth/locale/en/LC_MESSAGES/django.po
-source_lang = en
-type = PO

.tx/transifex.yml

@@ -0,0 +1,10 @@
+filters:
+  - filter_type: file
+    file_format: PO
+    source_file: allianceauth/locale/en/LC_MESSAGES/django.po
+    source_language: en
+    translation_files_expression: allianceauth/locale/<lang>/LC_MESSAGES/django.po
+
+settings:
+  language_mapping:
+    zh-Hans: zh_Hans

README.md

@@ -17,7 +17,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 - [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
-- [Developer Team](#developer-team)
+- [Developer Team](#development-team)
 - [Contributing](#contributing)
 
 ## Overview

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.0.0a1'
+__version__ = '4.0.0a5'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/authentication/backends.py

@@ -2,7 +2,6 @@ import logging
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User, Permission
-from django.contrib import messages
 
 from .models import UserProfile, CharacterOwnership, OwnershipRecord
 
@@ -41,9 +40,7 @@ class StateBackend(ModelBackend):
                 if ownership.user.profile.main_character:
                     if ownership.user.profile.main_character.character_id == token.character_id:
                         return ownership.user
-                    else:  ## this is an alt, enforce main only.
-                        if request:
-                            messages.error("Unable to authenticate with this Character, Please log in with the main character associated with this account.")
+                    else:  # this is an alt, enforce main only.
                         return None
             else:
                 logger.debug(f'{token.character_name} has changed ownership. Creating new user account.')
@@ -66,9 +63,7 @@ class StateBackend(ModelBackend):
                     user = records[0].user
                     if user.profile.main_character:
                         if user.profile.main_character.character_id != token.character_id:
-                            ## this is an alt, enforce main only due to trust issues in SSO.
-                            if request:
-                                messages.error("Unable to authenticate with this Character, Please log in with the main character associated with this account. Then add this character from the dashboard.")
+                            # this is an alt, enforce main only due to trust issues in SSO.
                             return None
 
                     token.user = user

allianceauth/authentication/middleware.py

@@ -44,6 +44,8 @@ class UserSettingsMiddleware(MiddlewareMixin):
                 logger.exception(e)
 
             # AA v4 Themes
+            # Null = has not been set by the user ever, dont act
+            # DEFAULT_THEME or DEFAULT_THEME_DARK will be used in get_theme()
             try:
                 if request.user.profile.theme is not None:
                     request.session["THEME"] = request.user.profile.theme

allianceauth/authentication/templates/authentication/dashboard.characters.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-12 col-xl-8 align-self-stretch p-2">
+<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
     <div class="card">
         <div class="card-body">
             <div class="d-flex align-items-center">
@@ -8,32 +8,37 @@
                 </h4>
             </div>
             <div class="card-body">
-                <div style="height: 300px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
-                <div class="d-flex">
-                    <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}"><span class="d-md-inline m-2">{% translate 'Add Character' %}</span></a>
-                    <a href="{% url 'authentication:change_main_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Change Main' %}"></span><span class="d-md-inline m-2">{% translate 'Change Main' %}</span></a>
-                </div>
-                <table class="table" style="--bs-table-bg: transparent;">
-                    <thead>
-                        <tr>
-                            <th class="text-center"></th>
-                            <th class="text-center">{% translate "Name" %}</th>
-                            <th class="text-center">{% translate "Corp" %}</th>
-                            <th class="text-center">{% translate "Alliance" %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for char in characters %}
+                <div style="height: 300px; overflow-y:auto;">
+                    <div class="d-flex">
+                        <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}">
+                            <span class="d-md-inline m-2">{% translate 'Add Character' %}</span>
+                        </a>
+                        <a href="{% url 'authentication:change_main_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Change Main' %}">
+                            <span class="d-md-inline m-2">{% translate 'Change Main' %}</span>
+                        </a>
+                    </div>
+                    <table class="table">
+                        <thead>
                             <tr>
-                                <td class="text-center"><img class="ra-avatar rounded-circle" src="{{ char.portrait_url_32 }}">
-                                </td>
-                                <td class="text-center">{{ char.character_name }}</td>
-                                <td class="text-center">{{ char.corporation_name }}</td>
-                                <td class="text-center">{{ char.alliance_name|default_if_none:"" }}</td>
+                                <th class="text-center"></th>
+                                <th class="text-center">{% translate "Name" %}</th>
+                                <th class="text-center">{% translate "Corp" %}</th>
+                                <th class="text-center">{% translate "Alliance" %}</th>
                             </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                            {% for char in characters %}
+                                <tr>
+                                    <td class="text-center">
+                                        <img class="ra-avatar rounded-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
+                                    </td>
+                                    <td class="text-center">{{ char.character_name }}</td>
+                                    <td class="text-center">{{ char.corporation_name }}</td>
+                                    <td class="text-center">{{ char.alliance_name|default_if_none:"" }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>

allianceauth/authentication/templates/authentication/dashboard.groups.html

@@ -1,12 +1,12 @@
 {% load i18n %}
-<div class="col-12 col-xl-4 align-self-stretch p-2">
+<div class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
     <div class="card h-100">
         <div class="card-body">
             <h4 class="card-title text-center">{% translate "Membership" %}</h4>
             <div class="card-body">
-                <div style="height: 300px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
-                    <h6 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h6>
-                    <table class="table" style="--bs-table-bg: transparent;">
+                <div style="height: 300px; overflow-y:auto;">
+                    <h5 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h5>
+                    <table class="table">
                         {% for group in groups %}
                             <tr>
                                 <td class="text-center">{{ group.name }}</td>

allianceauth/authentication/templates/authentication/tokens.html

@@ -1,62 +1,85 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Dashboard" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Token Management" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Token Management" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <h1 class="page-header text-center">{% translate "Token Management" %}</h1>
-    <div class="col-sm-12">
-        <table class="table table-aa" id="table_tokens" style="width:100%">
+    <div>
+        <p class="mb-3">
+            {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
+        </p>
+
+        <table class="table" id="table_tokens" style="width: 100%;">
             <thead>
                 <tr>
                     <th>{% translate "Scopes" %}</th>
                     <th class="text-end">{% translate "Actions" %}</th>
                     <th>{% translate "Character" %}</th>
-
                 </tr>
             </thead>
+
             <tbody>
                 {% for t in tokens %}
                     <tr>
-                        <td styl="white-space:initial;">{% for s in t.scopes.all %}<span class="badge badge-secondar">{{ s.name }}</span> {% endfor %}</td>
-                        <td nowrap class="text-end"><a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fas fa-trash"></i></a> <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a></td>
+                        <td style="white-space:initial;">
+                            {% for s in t.scopes.all %}
+                                <span class="badge bg-secondary">{{ s.name }}</span>
+                            {% endfor %}
+                        </td>
+
+                        <td nowrap class="text-end">
+                            <a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fa-solid fa-trash-can"></i></a>
+                            <a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fa-solid fa-rotate"></i></a>
+                        </td>
+
                         <td>{{ t.character_name }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
         </table>
-        {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
     </div>
 {% endblock content %}
 
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
+
+    <script>
+        $(document).ready(() => {
+            let grp = 2;
+
+            const table = $('#table_tokens').DataTable({
+                'columnDefs': [{orderable: false, targets: [0, 1]}, {
+                    'visible': false,
+                    'targets': grp
+                }],
+                'order': [[grp, 'asc']],
+                'drawCallback': function (settings) {
+                    var api = this.api();
+                    var rows = api.rows({page: 'current'}).nodes();
+                    var last = null;
+                    api.column(grp, {page: 'current'})
+                        .data()
+                        .each((group, i) => {
+                            if (last !== group) {
+                                $(rows).eq(i).before(`<tr class="h5 table-primary"><td colspan="3">${group}</td></tr>`);
+
+                                last = group;
+                            }
+                        });
+                },
+                'stateSave': true
+            });
+        });
+    </script>
 {% endblock extra_javascript %}
 
 {% block extra_css %}
     {% include "bundles/datatables-css-bs5.html" %}
 {% endblock extra_css %}
-
-{% block extra_script %}
-    $(document).ready(function(){
-        let grp = 2;
-        var table = $('#table_tokens').DataTable({
-            "columnDefs": [{ orderable: false, targets: [0,1] },{ "visible": false, "targets": grp }],
-            "order": [[grp, 'asc']],
-            "drawCallback": function (settings) {
-                var api = this.api();
-                var rows = api.rows({ page: 'current' }).nodes();
-                var last = null;
-                api.column(grp, { page: 'current' })
-                    .data()
-                    .each(function (group, i) {
-                        if (last !== group) {
-                            $(rows).eq(i).before('<tr class="info"><td colspan="3">' + group + '</td></tr>');
-                            last = group;
-                        }
-                    });
-            },
-            "stateSave": true,
-        });
-    });
-{% endblock extra_script %}

allianceauth/authentication/templates/public/base.html

@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="">
         <meta name="author" content="">
-        <!-- TODO Bundle all the site specific stuff up into its own template for easy overide -->
+        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
         <meta property="og:title" content="{{ SITE_NAME }}">
         <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
         <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
@@ -16,8 +16,9 @@
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
-        {% include 'bundles/bootstrap-css.html' %}
+        {% include 'bundles/bootstrap-css-bs5.html' %}
         {% include 'bundles/fontawesome.html' %}
+
         {% block extra_include %}
         {% endblock %}
 
@@ -30,25 +31,23 @@
                 background-size: cover;
             }
 
-            .panel-transparent {
-                background: rgba(48, 48, 48, 0.7);
-                color: #ffffff;
+            .card-login {
+                background: rgba(48 48 48 / 0.7);
+                color: rgb(255 255 255);
                 padding-bottom: 21px;
             }
 
-            .panel-body {
-
-            }
-
             #lang-select {
                 width: 40%;
                 margin-left: auto;
                 margin-right: auto;
             }
+
             {% block extra_style %}
             {% endblock %}
         </style>
     </head>
+
     <body>
         <div class="container" style="margin-top:150px;">
             {% block content %}

allianceauth/authentication/templates/public/lang_select.html

@@ -1,9 +1,12 @@
 {% load i18n %}
+
 <div class="dropdown">
     <form action="{% url 'set_language' %}" method="post">
         {% csrf_token %}
+
         <select onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
             {% get_language_info_list for LANGUAGES as languages %}
+
             {% for language in languages %}
                 <option lang="{{ language.code }}" value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
                     {{ language.name_local|capfirst }} ({{ language.code }})

allianceauth/authentication/templates/public/middle_box.html

@@ -3,39 +3,41 @@
 {% load i18n %}
 
 {% block content %}
-    <div class="col-md-4 col-md-offset-4">
-        {% if messages %}
-            {% for message in messages %}
-                <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
-            {% endfor %}
-        {% endif %}
+    <div class="row justify-content-center">
+        <div class="col-md-4">
+            {% if messages %}
+                {% for message in messages %}
+                    <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
+                {% endfor %}
+            {% endif %}
 
-        <div class="panel panel-default panel-transparent">
-            <div class="panel-body">
-                <div class="col-md-12">
-                    {% block middle_box_content %}
-                    {% endblock %}
+            <div class="card card-login border-secondary p-3">
+                <div class="card-body">
+                    <div class="text-center">
+                        {% block middle_box_content %}
+                        {% endblock %}
+                    </div>
                 </div>
+
+                {% include 'public/lang_select.html' %}
+
+                <p class="text-center mt-3">
+                    {% translate "For information on SSO, ESI and security read the CCP Dev Blog" %}<br>
+                    <a class="text-reset" href="https://www.eveonline.com/news/view/introducing-esi" target="_blank" rel="noopener noreferrer">
+                        {% translate "Introducing ESI - A New API For EVE Online" %}
+                    </a>
+                </p>
+
+                <p class="text-center">
+                    <a class="text-reset" href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
+                        {% translate "Manage ESI Applications" %}
+                    </a>
+                </p>
             </div>
-
-            {% include 'public/lang_select.html' %}
-
-            <p class="text-center" style="margin-top: 2rem;">
-                {% translate "For information on SSO, ESI and security read the CCP Dev Blog" %}<br>
-                <a href="https://www.eveonline.com/article/introducing-esi" target="_blank" rel="noopener noreferrer">
-                    {% translate "Introducing ESI - A New API For Eve Online" %}
-                </a>
-            </p>
-
-            <p class="text-center">
-                <a href="https://community.eveonline.com/support/third-party-applications/" target="_blank" rel="noopener noreferrer">
-                    {% translate "Manage ESI Applications" %}
-                </a>
-            </p>
         </div>
     </div>
 {% endblock %}
 
 {% block extra_include %}
-    {% include 'bundles/bootstrap-js.html' %}
+    {% include 'bundles/bootstrap-js-bs5.html' %}
 {% endblock %}

allianceauth/authentication/templates/public/register.html

@@ -6,9 +6,9 @@
 {% block page_title %}{% translate "Registration" %}{% endblock %}
 
 {% block extra_include %}
-    {% include 'bundles/bootstrap-css.html' %}
+    {% include 'bundles/bootstrap-css-bs5.html' %}
     {% include 'bundles/fontawesome.html' %}
-    {% include 'bundles/bootstrap-js.html' %}
+    {% include 'bundles/bootstrap-js-bs5.html' %}
 {% endblock %}
 
 {% block content %}

allianceauth/authentication/templates/registration/activate.html

@@ -1,5 +1,7 @@
 {% extends 'public/middle_box.html' %}
+
 {% load i18n %}
+
 {% block middle_box_content %}
     <div class="alert alert-danger">{% translate 'Invalid or expired activation link.' %}</div>
 {% endblock %}

allianceauth/authentication/views.py

@@ -200,7 +200,13 @@ def sso_login(request, token):
             request.session['registration_uid'] = user.pk
             # Go to Step 2
             return redirect('registration_register')
-    messages.error(request, _('Unable to authenticate as the selected character.'))
+    # Logging in with an alt is not allowed due to security concerns.
+    token.delete()
+    messages.error(
+        request,
+        _('Unable to authenticate as the selected character. '
+        'Please log in with the main character associated with this account.')
+    )
     return redirect(settings.LOGIN_URL)
 
 

allianceauth/bin/allianceauth.py

@@ -12,13 +12,14 @@ class StartProject(BaseStartProject):
         parser.add_argument('--python', help='The path to the python executable.')
         parser.add_argument('--celery', help='The path to the celery executable.')
         parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
+        parser.add_argument('--memmon', help='The path to the memmon executable.')
 
 
 def create_project(parser, options, args):
     # Validate args
     if len(args) < 2:
         parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 3:
+    elif len(args) > 4:
         parser.error("Too many arguments.")
 
     # First find the path to Alliance Auth
@@ -32,6 +33,7 @@ def create_project(parser, options, args):
         'python': shutil.which('python'),
         'gunicorn': shutil.which('gunicorn'),
         'celery': shutil.which('celery'),
+        'memmon': shutil.which('memmon'),
         'extensions': ['py', 'conf', 'json'],
     }
 

allianceauth/context_processors.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from .views import NightModeRedirectView, ThemeRedirectView
+from .views import NightModeRedirectView
 
 
 def auth_settings(request):

allianceauth/corputils/auth_hooks.py

@@ -10,7 +10,7 @@ class CorpStats(MenuItemHook):
         MenuItemHook.__init__(
             self,
             _('Corporation Stats'),
-            'fas fa-share-alt fa-fw',
+            'fa-solid fa-share-nodes',
             'corputils:view',
             navactive=['corputils:']
         )

allianceauth/corputils/templates/corputils/base.html

@@ -1,40 +1,63 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Corporation Member Data" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Corporation Member Data" %}
+{% endblock header_nav_brand %}
+
+{% block header_nav_collapse_left %}
+    <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
+            {% translate "Corporations" %}
+        </a>
+
+        <ul class="dropdown-menu">
+            {% for corpstat in available %}
+                <li>
+                    <a class="dropdown-item" href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">
+                        {{ corpstat.corp.corporation_name }}
+                    </a>
+                </li>
+            {% endfor %}
+
+            {% if perms.corputils.add_corpstats %}
+                {% if available.count >= 1 %}
+                    <li>&nbsp;</li>
+                {% endif %}
+
+                <li>
+                    <a class="dropdown-item" href="{% url 'corputils:add' %}">
+                        {% translate "Add corporation" %}
+                    </a>
+                </li>
+            {% endif %}
+        </ul>
+    </li>
+{% endblock %}
+
+{% block header_nav_collapse_right %}
+    <li class="nav-item">
+        <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
+            <div class="form-group">
+                <input
+                    type="text"
+                    class="form-control"
+                    name="search_string"
+                    placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}"
+                >
+            </div>
+        </form>
+    </li>
+{% endblock %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
-        <div class="col-lg-10 col-lg-offset-1 container">
-            <nav class="navbar navbar-default">
-                <div class="container-fluid">
-                    <ul class="nav navbar-nav">
-                        <li class="dropdown">
-                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
-                            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                                {% for corpstat in available %}
-                                    <li>
-                                        <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        </li>
-                        {% if perms.corputils.add_corpstats %}
-                            <li>
-                                <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
-                            </li>
-                        {% endif %}
-                    </ul>
-                    <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
-                        <div class="form-group">
-                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}">
-                        </div>
-                    </form>
-                </div>
-            </nav>
-            {% block member_data %}
-            {% endblock member_data %}
-        </div>
+    <div>
+        {% block member_data %}
+        {% endblock member_data %}
     </div>
 {% endblock content %}

allianceauth/corputils/templates/corputils/corpstats.html

@@ -1,219 +1,276 @@
 {% extends 'corputils/base.html' %}
+
 {% load i18n %}
 {% load humanize %}
+
 {% block member_data %}
     {% if corpstats %}
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <table class="table">
-                    <tr>
-                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
-                                <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
-                            </td>
-                        {% if corpstats.corp.alliance %}
-                            <td class="text-center col-lg-6">
-                                <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
-                            </td>
-                        {% endif %}
-                    </tr>
-                    <tr>
-                        <td class="text-center"><h4>{{ corpstats.corp.corporation_name }}</h4></td>
-                        {% if corpstats.corp.alliance %}
-                            <td class="text-center"><h4>{{ corpstats.corp.alliance.alliance_name }}</h4></td>
-                        {% endif %}
-                    </tr>
-                </table>
-            </div>
+        <div>
+            <table class="table text-center">
+                <tr>
+                    <td>
+                        <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}" alt="{{ corpstats.corp.corporation_name }}">
+                    </td>
+
+                    {% if corpstats.corp.alliance %}
+                        <td>
+                            <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}" alt="{{ corpstats.corp.alliance.alliance_name }}">
+                        </td>
+                    {% endif %}
+                </tr>
+
+                <tr>
+                    <td><p class="h4">{{ corpstats.corp.corporation_name }}</p></td>
+
+                    {% if corpstats.corp.alliance %}
+                        <td><p class="h4">{{ corpstats.corp.alliance.alliance_name }}</p></td>
+                    {% endif %}
+                </tr>
+            </table>
         </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <ul class="nav nav-pills pull-left">
-                            <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
-                            <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
-                            <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
-                        </ul>
-                        <div class="pull-right hidden-xs">
-                            {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
-                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-                                <span class="glyphicon glyphicon-refresh"></span>
-                            </a>
-                        </div>
-                        <div class="clearfix"></div>
+
+        <div class="card card-default mt-4">
+            <div class="card-header clearfix" role="tablist">
+                <ul class="nav nav-pills text-right float-start">
+                    <li class="nav-item" role="presentation">
+                        <a
+                            class="nav-link active"
+                            id="mains"
+                            data-bs-toggle="tab"
+                            href="#tab-mains"
+                            role="tab"
+                            aria-controls="tab-mains"
+                            aria-selected="true"
+                        >
+                            {% translate 'Mains' %} ({{ total_mains }})
+                        </a>
+                    </li>
+
+                    <li class="nav-item" role="presentation">
+                        <a
+                            class="nav-link"
+                            id="members"
+                            data-bs-toggle="tab"
+                            href="#tab-members"
+                            role="tab"
+                            aria-controls="tab-members"
+                            aria-selected="false"
+                        >
+                            {% translate 'Members' %} ({{ corpstats.member_count }})
+                        </a>
+                    </li>
+
+                    <li class="nav-item">
+                        <a
+                            class="nav-link"
+                            id="unregistered"
+                            data-bs-toggle="tab"
+                            href="#tab-unregistered"
+                            role="tab"
+                            aria-controls="tab-unregistered"
+                            aria-selected="false"
+                        >
+                            {% translate 'Unregistered' %} ({{ unregistered.count }})
+                        </a>
+                    </li>
+                </ul>
+
+                <div class="float-end d-none d-sm-block">
+                    {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}
+
+                    <a
+                        class="btn btn-success btn-sm ms-2"
+                        type="button"
+                        href="{% url 'corputils:update' corpstats.corp.corporation_id %}"
+                        title="{% translate 'Update Now' %}"
+                    >
+                        <i class="fa-solid fa-rotate"></i>
+                    </a>
+                </div>
+            </div>
+
+            <div class="card-body">
+                <div class="tab-content">
+                    <div class="tab-pane fade show active" id="tab-mains" role="tabpanel" aria-labelledby="tab-mains">
+                        {% if mains %}
+                            <div class="table-responsive">
+                                <table class="table table-hover" id="table-mains">
+                                    <thead>
+                                        <tr>
+                                            <th>{% translate "Main character" %}</th>
+                                            <th>{% translate "Registered characters" %}</th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        {% for id, main in mains.items %}
+                                            <tr>
+                                                <td class="text-center" style="vertical-align: middle;">
+                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
+                                                        <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
+                                                        <div class="caption">
+                                                            {{ main.main }}
+                                                        </div>
+                                                    </div>
+                                                </td>
+
+                                                <td>
+                                                    <table class="table table-hover">
+                                                        {% for alt in main.alts|dictsort:"character_name" %}
+                                                            {% if forloop.first %}
+                                                                <tr>
+                                                                    <th></th>
+                                                                    <th>{% translate "Character" %}</th>
+                                                                    <th>{% translate "Corporation" %}</th>
+                                                                    <th>{% translate "Alliance" %}</th>
+                                                                    <th></th>
+                                                                </tr>
+                                                            {% endif %}
+
+                                                            <tr>
+                                                                <td style="width: 5%;">
+                                                                    <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
+                                                                        <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
+                                                                    </div>
+                                                                </td>
+                                                                <td style="width: 30%;">{{ alt.character_name }}</td>
+                                                                <td style="width: 30%;">{{ alt.corporation_name }}</td>
+                                                                <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
+                                                                <td style="width: 5%;">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
+                                                                        {% translate "Killboard" %}
+                                                                    </a>
+                                                                </td>
+                                                            </tr>
+                                                        {% endfor %}
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        {% endif %}
                     </div>
-                    <div class="panel-body">
-                        <div class="tab-content">
-                            <div class="tab-pane fade in active" id="mains">
-                                {% if mains %}
-                                    <div class="table-responsive">
-                                        <table class="table table-hover" id="table-mains">
-                                            <thead>
-                                                <tr>
-                                                    <th style="height:1em;"><!-- Must have text or height to prevent clipping --></th>
-                                                    <th></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                {% for id, main in mains.items %}
-                                                    <tr>
-                                                        <td class="text-center" style="vertical-align:middle">
-                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                                <img src="{{ main.main.portrait_url_64 }}" class="img-circle" alt="{{ main.main }}">
-                                                                <div class="caption text-center">
-                                                                    {{ main.main }}
-                                                                </div>
-                                                            </div>
-                                                        </td>
-                                                        <td>
-                                                            <table class="table table-hover">
-                                                                {% for alt in main.alts %}
-                                                                    {% if forloop.first %}
-                                                                        <tr>
-                                                                            <th></th>
-                                                                            <th class="text-center">{% translate "Character" %}</th>
-                                                                            <th class="text-center">{% translate "Corporation" %}</th>
-                                                                            <th class="text-center">{% translate "Alliance" %}</th>
-                                                                            <th class="text-center"></th>
-                                                                        </tr>
-                                                                    {% endif %}
-                                                                    <tr>
-                                                                        <td class="text-center" style="width:5%">
-                                                                            <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
-                                                                                <img src="{{ alt.portrait_url_32 }}" class="img-circle" alt="{{ alt.character_name }}">
-                                                                            </div>
-                                                                        </td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.character_name }}</td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.corporation_name }}</td>
-                                                                        <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
-                                                                        <td class="text-center" style="width:5%">
-                                                                            <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge badge-danger" target="_blank">
-                                                                                {% translate "Killboard" %}
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                {% endfor %}
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                {% endfor %}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                {% endif %}
+
+                    <div class="tab-pane fade" id="tab-members" role="tabpanel" aria-labelledby="tab-members">
+                        {% if members %}
+                            <div class="table-responsive">
+                                <table class="table table-hover" id="table-members">
+                                    <thead>
+                                        <tr>
+                                            <th></th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th></th>
+                                            <th>{% translate "Main Character" %}</th>
+                                            <th>{% translate "Main Corporation" %}</th>
+                                            <th>{% translate "Main Alliance" %}</th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        {% for member in members %}
+                                            <tr>
+                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
+                                                <td>{{ member }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                </td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.alliance_name|default_if_none:""  }}</td>
+                                            </tr>
+                                        {% endfor %}
+
+                                        {% for member in unregistered %}
+                                            <tr class="table-danger">
+                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                <td>{{ member.character_name }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                </td>
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
                             </div>
-                            <div class="tab-pane fade" id="members">
-                                {% if members %}
-                                    <div class="table-responsive">
-                                        <table class="table table-hover" id="table-members">
-                                            <thead>
-                                                <tr>
-                                                    <th></th>
-                                                    <th class="text-center">{% translate "Character" %}</th>
-                                                    <th class="text-center"></th>
-                                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                                    <th class="text-center">{% translate "Main Corporation" %}</th>
-                                                    <th class="text-center">{% translate "Main Alliance" %}</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                {% for member in members %}
-                                                    <tr>
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
-                                                        <td class="text-center">{{ member }}</td>
-                                                        <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a>
-                                                        </td>
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
-                                                        <td class="text-center">{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
-                                                    </tr>
-                                                {% endfor %}
-                                                {% for member in unregistered %}
-                                                    <tr class="danger">
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
-                                                        <td class="text-center">{{ member.character_name }}</td>
-                                                        <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a>
-                                                        </td>
-                                                        <td class="text-center"></td>
-                                                        <td class="text-center"></td>
-                                                        <td class="text-center"></td>
-                                                    </tr>
-                                                {% endfor %}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                {% endif %}
+                        {% endif %}
+                    </div>
+
+                    <div class="tab-pane fade" id="tab-unregistered" role="tabpanel" aria-labelledby="tab-unregistered">
+                        {% if unregistered %}
+                            <div class="table-responsive">
+                                <table class="table table-hover" id="table-unregistered">
+                                    <thead>
+                                        <tr>
+                                            <th></th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th></th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        {% for member in unregistered %}
+                                            <tr class="table-danger">
+                                                <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
+                                                <td>{{ member.character_name }}</td>
+                                                <td>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
+                                                        {% translate "Killboard" %}
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
                             </div>
-                            <div class="tab-pane fade" id="unregistered">
-                                {% if unregistered %}
-                                    <div class="table-responsive">
-                                        <table class="table table-hover" id="table-unregistered">
-                                            <thead>
-                                                <tr>
-                                                    <th></th>
-                                                    <th class="text-center">{% translate "Character" %}</th>
-                                                    <th class="text-center"></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                {% for member in unregistered %}
-                                                    <tr class="danger">
-                                                        <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
-                                                        <td class="text-center">{{ member.character_name }}</td>
-                                                        <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge badge-danger" target="_blank">
-                                                                {% translate "Killboard" %}
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                {% endfor %}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                {% endif %}
-                            </div>
-                        </div>
+                        {% endif %}
                     </div>
                 </div>
             </div>
         </div>
     {% endif %}
 {% endblock %}
-{% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-{% endblock %}
-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-{% block extra_script %}
-    $(document).ready(function(){
-        $('#table-mains').DataTable({
-            "columnDefs": [
-                { "sortable": false, "targets": [1] },
-            ],
-            "stateSave": true,
-            "stateDuration": 0
-        });
-        $('#table-members').DataTable({
-            "columnDefs": [
-                { "searchable": false, "targets": [0, 2] },
-                { "sortable": false, "targets": [0, 2] },
-            ],
-            "order": [[ 1, "asc" ]],
-            "stateSave": true,
-            "stateDuration": 0
-        });
-        $('#table-unregistered').DataTable({
-            "columnDefs": [
-                { "searchable": false, "targets": [0, 2] },
-                { "sortable": false, "targets": [0, 2] },
-            ],
-            "order": [[ 1, "asc" ]],
-            "stateSave": true,
-            "stateDuration": 0
-        });
 
-    });
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js-bs5.html' %}
+
+    <script>
+        $(document).ready(() => {
+            $('#table-mains').DataTable({
+                "columnDefs": [
+                    { "sortable": false, "targets": [1] },
+                ],
+                "stateSave": true,
+                "stateDuration": 0
+            });
+
+            $('#table-members').DataTable({
+                "columnDefs": [
+                    { "searchable": false, "targets": [0, 2] },
+                    { "sortable": false, "targets": [0, 2] },
+                ],
+                "order": [[ 1, "asc" ]],
+                "stateSave": true,
+                "stateDuration": 0
+            });
+
+            $('#table-unregistered').DataTable({
+                "columnDefs": [
+                    { "searchable": false, "targets": [0, 2] },
+                    { "sortable": false, "targets": [0, 2] },
+                ],
+                "order": [[ 1, "asc" ]],
+                "stateSave": true,
+                "stateDuration": 0
+            });
+        });
+    </script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}

allianceauth/corputils/templates/corputils/search.html

@@ -1,33 +1,36 @@
 {% extends "corputils/base.html" %}
+
 {% load i18n %}
+
 {% block member_data %}
-    <div class="panel panel-default">
-        <div class="panel-heading clearfix">
-            <div class="panel-title pull-left">{% translate "Search Results" %}</div>
+    <div class="card card-default">
+        <div class="card-header clearfix">
+            <div class="card-title">{% translate "Search Results" %}</div>
         </div>
-        <div class="panel-body">
+
+        <div class="card-body mt-2">
             <table class="table table-hover" id="table-search">
                 <thead>
                     <tr>
-                        <th class="text-center"></th>
-                        <th class="text-center">{% translate "Character" %}</th>
-                        <th class="text-center">{% translate "Corporation" %}</th>
-                        <th class="text-center">{% translate "zKillboard" %}</th>
-                        <th class="text-center">{% translate "Main Character" %}</th>
-                        <th class="text-center">{% translate "Main Corporation" %}</th>
-                        <th class="text-center">{% translate "Main Alliance" %}</th>
+                        <th></th>
+                        <th>{% translate "Character" %}</th>
+                        <th>{% translate "Corporation" %}</th>
+                        <th>{% translate "zKillboard" %}</th>
+                        <th>{% translate "Main Character" %}</th>
+                        <th>{% translate "Main Corporation" %}</th>
+                        <th>{% translate "Main Alliance" %}</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for result in results %}
                         <tr {% if not result.1.registered %}class="danger"{% endif %}>
-                            <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
-                            <td class="text-center">{{ result.1.character_name }}</td>
-                            <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge badge-danger" target="_blank">{% translate "Killboard" %}</a></td>
-                            <td class="text-center">{{ result.1.main_character.character_name }}</td>
-                            <td class="text-center">{{ result.1.main_character.corporation_name }}</td>
-                            <td class="text-center">{{ result.1.main_character.alliance_name }}</td>
+                            <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
+                            <td>{{ result.1.character_name }}</td>
+                            <td >{{ result.0.corp.corporation_name }}</td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td>{{ result.1.main_character.character_name }}</td>
+                            <td>{{ result.1.main_character.corporation_name }}</td>
+                            <td>{{ result.1.main_character.alliance_name }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
@@ -35,17 +38,20 @@
         </div>
     </div>
 {% endblock %}
+
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-{% endblock %}
-{% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-{% endblock %}
-{% block extra_script %}
-    $(document).ready(function(){
-        $('#table-search').DataTable({
-            "stateSave": true,
-            "stateDuration": 0
+    {% include 'bundles/datatables-js-bs5.html' %}
+
+    <script>
+        $(document).ready(() => {
+            $('#table-search').DataTable({
+                "stateSave": true,
+                "stateDuration": 0
+            });
         });
-    });
+    </script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}

allianceauth/eveonline/templatetags/examples.html

@@ -14,15 +14,13 @@ Needs to be called with a context containing three objects:
 {% block page_title %}Evelinks Examples{% endblock page_title %}
 
 {% block content %}
+    <div>
+        {% include "framework/header/page-header.html" with title="Evelinks templatetags examples" %}
 
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">Evelinks templatetags examples</h1>
         <div class="col-lg-12 container">
-
             <h2>profile URLs</h2>
 
             <div class="rows">
-
                 <div class="col-md-4">
                     <h3>evewho</h3>
                     <p><a href="{{ my_character|evewho_character_url }}">character from character object</a></p>
@@ -57,7 +55,6 @@ Needs to be called with a context containing three objects:
             <h2>image URLs</h2>
 
             <div class="rows">
-
                 <div class="col-md-4">
                     <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128 }}"></p>
                     <p>character from character object: <img src="{{ my_character|character_portrait_url:128 }}"></p>
@@ -77,5 +74,4 @@ Needs to be called with a context containing three objects:
             </div>
         </div>
     </div>
-
 {% endblock content %}

allianceauth/fleetactivitytracking/auth_hooks.py

@@ -7,7 +7,7 @@ from allianceauth.services.hooks import UrlHook
 
 @hooks.register('menu_item_hook')
 def register_menu():
-    return MenuItemHook(_('Fleet Activity Tracking'), 'fas fa-users fa-fw', 'fatlink:view',
+    return MenuItemHook(_('Fleet Activity Tracking'), 'fa-solid fa-users', 'fatlink:view',
                         navactive=['fatlink:'])
 
 

allianceauth/fleetactivitytracking/forms.py

@@ -4,4 +4,4 @@ from django.utils.translation import gettext_lazy as _
 
 class FatlinkForm(forms.Form):
     fleet = forms.CharField(label=_("Fleet Name"), max_length=50)
-    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('minutes'))
+    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('Duration of the fat-link in minutes'))

allianceauth/fleetactivitytracking/migrations/0007_sentinel_user.py

@@ -0,0 +1,26 @@
+"""
+Migration to AA Framework API method
+"""
+
+from django.conf import settings
+from django.db import migrations, models
+
+import allianceauth.framework.api.user
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("fleetactivitytracking", "0006_auto_20180803_0430"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="fatlink",
+            name="creator",
+            field=models.ForeignKey(
+                on_delete=models.SET(allianceauth.framework.api.user.get_sentinel_user),
+                to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]

allianceauth/fleetactivitytracking/models.py

@@ -3,10 +3,7 @@ from django.db import models
 from django.utils import timezone
 
 from allianceauth.eveonline.models import EveCharacter
-
-
-def get_sentinel_user():
-    return User.objects.get_or_create(username='deleted')[0]
+from allianceauth.framework.api.user import get_sentinel_user
 
 
 class Fatlink(models.Model):

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html

@@ -1,23 +1,43 @@
 {% extends 'allianceauth/base-bs5.html' %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Fleet Participation" %}
 {% endblock %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
-        <div class="col-lg-12 container" id="example">
+    <div>
+        {% translate "Character not found!" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div class="col-lg-12 container">
             <div class="row">
                 <div class="col-lg-12">
-                    <div class="panel panel-default">
-                        <div class="panel-heading">{{ character_name }}</div>
-                        <div class="panel-body">
+                    <div class="card card-default">
+                        <div class="card-header">
+                            <div class="card-title mb-0">
+                                {{ character_name }}
+                            </div>
+                        </div>
+
+                        <div class="card-body">
                             <div class="col-lg-2 col-sm-2">
                                 <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}" alt="{{ character_name }}">
                             </div>
+
                             <div class="col-lg-10 col-sm-2">
-                                <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
-                                {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
+                                <div class="alert alert-danger" role="alert">
+                                    {% translate "Character not registered!" %}
+                                </div>
+
+                                {% translate "This character is not associated with an auth account." %}
+                                <a href="{% url 'authentication:add_character' %}">{% translate "Add it here" %}</a>
+                                {% translate "before attempting to click fleet attendance links." %}
                             </div>
                         </div>
                     </div>

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html

@@ -0,0 +1,53 @@
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load django_bootstrap5 %}
+{% load i18n %}
+
+{% block page_title %}
+    {% translate "Create Fatlink" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
+{% block content %}
+    <div>
+        {% translate "Create Fatlink" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div>
+            {% if badrequest %}
+                <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
+            {% endif %}
+
+            {% for message in errormessages %}
+                <div class="alert alert-danger" role="alert">{{ message }}</div>
+            {% endfor %}
+
+            <div class="card card-primary border-0">
+                <div class="card-header">
+                    <div class="card-title mb-0">
+                        {% translate "Fatlink details" %}
+                    </div>
+                </div>
+
+                <div class="card-body">
+                    <div class="row justify-content-center">
+                        <div class="col-md-6">
+                            <form role="form" action="" method="POST">
+                                {% csrf_token %}
+                                {% bootstrap_form form %}
+
+                                <div class="form-group mt-3 clearfix">
+                                    {% translate "Create fatlink" as button_text %}
+                                    {% bootstrap_button button_class="btn btn-primary" content=button_text name="submit_fat" id="submit_fat" %}
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html

@@ -1,31 +0,0 @@
-{% extends "allianceauth/base-bs5.html" %}
-{% load bootstrap %}
-{% load i18n %}
-{% block page_title %}
-    {% translate "Create Fatlink" %}
-{% endblock page_title %}
-{% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Create Fleet Operation" %}</h1>
-        <div class="container-fluid">
-            {% if badrequest %}
-                <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
-            {% endif %}
-            {% for message in errormessages %}<div class="alert alert-danger" role="alert">{{ message }}</div>{% endfor %}
-            <div class="col-md-4 offset-md-4">
-                <div class="row">
-                    <form class="form-signin" role="form" action="" method="POST">
-                        {% csrf_token %}
-                        {{ form|bootstrap }}
-                        <br/>
-                        <button class="btn btn-lg btn-primary btn-block"
-                                type="submit"
-                                name="submit_fat">
-                            {% translate "Create fatlink" %}
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html

@@ -1,21 +1,35 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
-{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
+
+{% block page_title %}
+    {% translate "Fatlink view" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Edit fatlink" %} "{{ fatlink }}"
-            <div class="text-end">
-                <form>
-                    <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
-                        {% translate "Delete fat" %}
-                    </button>
-                </form>
-            </div>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "Edit fatlink" %} "{{ fatlink }}"
         </h1>
-        <div class="panel panel-default">
-            <div class="panel-heading">{% translate "Registered characters" %}</div>
-            <div class="panel-body">
+
+        <div class="text-end mb-3">
+            <form>
+                <button type="submit" onclick="return confirm('{% translate "Are you sure?" %}')" class="btn btn-danger" name="deletefat" value="True">
+                    {% translate "Delete fat" %}
+                </button>
+            </form>
+        </div>
+
+        <div class="card card-default">
+            <div class="card-header">
+                <div class="card-title mb-0">{% translate "Registered characters" %}</div>
+            </div>
+
+            <div class="card-body">
                 <table class="table table-responsive table-hover">
                     <tr>
                         <th class="text-center">{% translate "User" %}</th>
@@ -25,21 +39,23 @@
                         <th class="text-center">{% translate "Eve Time" %}</th>
                         <th></th>
                     </tr>
+
                     {% for fat in registered_fats %}
                         <tr>
                             <td class="text-center">{{ fat.user }}</td>
                             <td class="text-center">{{ fat.character.character_name }}</td>
-                            {%  if fat.station != "No Station" %}
-                                <td class="text-center">{% blocktranslate %}Docked in {% endblocktranslate %}{{ fat.system }}</td>
-                            {% else %}
-                                <td class="text-center">{{ fat.system }}</td>
-                            {% endif %}
+                            <td class="text-center">
+                                {% if fat.station != "No Station" %}
+                                    {% translate "Docked in" %}
+                                {% endif %}
+                                {{ fat.system }}
+                            </td>
                             <td class="text-center">{{ fat.shiptype }}</td>
                             <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
                             <td class="text-center">
                                 <form>
                                     <button type="submit" class="btn btn-warning" name="removechar" value="{{ fat.character.character_id }}">
-                                        <span class="glyphicon glyphicon-remove"></span>
+                                        <i class="fa-solid fa-trash-can fa-fw"></i>
                                     </button>
                                 </form>
                             </td>

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html

@@ -1,71 +1,104 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Personal fatlink statistics" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-            {% if char_id %}
-            <div class="text-end">
-                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">{% translate "Next month" %}</a>
-            </div>
-            {% endif %}
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
         </h1>
-        <h2>
-            {% blocktranslate count links=n_fats trimmed %}
-                {{ user }} has collected one link this month.
-            {% plural %}
-                {{ user }} has collected {{ links }} links this month.
-            {% endblocktranslate %}
-        </h2>
-        <table class="table table-responsive">
-            <tr>
-                <th class="col-md-2 text-center">{% translate "Ship" %}</th>
-                <th class="col-md-2 text-center">{% translate "Times used" %}</th>
-            </tr>
-            {% for ship, n_fats in shipStats %}
-            <tr>
-                <td class="text-center">{{ ship }}</td>
-                <td class="text-center">{{ n_fats }}</td>
-            </tr>
-            {% endfor %}
-        </table>
-        {%  if created_fats %}
-        <h2>
-            {% blocktranslate count links=n_created_fats trimmed  %}
-                {{ user }} has created one link this month.
-            {% plural %}
-                {{ user }} has created {{ links }} links this month.
-            {% endblocktranslate %}
-        </h2>
-        {% if created_fats %}
-        <table class="table">
-            <tr>
-                <th class="text-center">{% translate "Fleet" %}</th>
-                <th class="text-center">{% translate "Creator" %}</th>
-                <th class="text-center">{% translate "Eve Time" %}</th>
-                <th class="text-center">{% translate "Duration" %}</th>
-                <th class="text-center">{% translate "Edit" %}</th>
-            </tr>
-            {% for link in created_fats %}
-            <tr>
-                <td class="text-center"><a href="{% url 'fatlink:click' link.hash %}" class="badge badge-primary">{{ link.fleet }}</a></td>
-                <td class="text-center">{{ link.creator.username }}</td>
-                <td class="text-center">{{ link.fatdatetime }}</td>
-                <td class="text-center">{{ link.duration }}</td>
-                <td class="text-center">
-                    <a href="{%  url 'fatlink:modify' link.hash %}">
-                        <button type="button" class="btn btn-info"><span
-                                class="glyphicon glyphicon-edit"></span></button>
-                    </a>
-                </td>
-            </tr>
-            {%  endfor %}
 
-        </table>
+        {% if char_id %}
+            <div class="text-end mb-3">
+                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
+                    {% translate "Previous month" %}
+                </a>
+                <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">
+                    {% translate "Next month" %}
+                </a>
+            </div>
         {% endif %}
+
+        <div class="card card-default mb-3">
+            <div class="card-header">
+                <div class="card-title mb-0">
+                    {% blocktranslate count links=n_fats trimmed %}
+                        {{ user }} has collected one link this month.
+                    {% plural %}
+                        {{ user }} has collected {{ links }} links this month.
+                    {% endblocktranslate %}
+                </div>
+            </div>
+
+            <div class="card-body">
+                <table class="table table-responsive">
+                    <tr>
+                        <th class="col-md-2 text-center">{% translate "Ship" %}</th>
+                        <th class="col-md-2 text-center">{% translate "Times used" %}</th>
+                    </tr>
+
+                    {% for ship, n_fats in shipStats %}
+                        <tr>
+                            <td class="text-center">{{ ship }}</td>
+                            <td class="text-center">{{ n_fats }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+
+        {% if created_fats %}
+            <div class="card card-default">
+                <div class="card-header">
+                    <div class="card-title mb-0">
+                        {% blocktranslate count links=n_created_fats trimmed %}
+                            {{ user }} has created one link this month.
+                        {% plural %}
+                            {{ user }} has created {{ links }} links this month.
+                        {% endblocktranslate %}
+                    </div>
+                </div>
+
+                <div class="card-body">
+                    <table class="table">
+                        <tr>
+                            <th class="text-center">{% translate "Fleet" %}</th>
+                            <th class="text-center">{% translate "Creator" %}</th>
+                            <th class="text-center">{% translate "Eve Time" %}</th>
+                            <th class="text-center">{% translate "Duration" %}</th>
+                            <th class="text-center">{% translate "Edit" %}</th>
+                        </tr>
+
+                        {% for link in created_fats %}
+                            <tr>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">
+                                        {{ link.fleet }}
+                                    </a>
+                                </td>
+                                <td class="text-center">{{ link.creator.username }}</td>
+                                <td class="text-center">{{ link.fatdatetime }}</td>
+                                <td class="text-center">{{ link.duration }}</td>
+                                <td class="text-center">
+                                    <a href="{% url 'fatlink:modify' link.hash %}">
+                                        <button type="button" class="btn btn-info">
+                                            <i class="fa-solid fa-pen-to-square fa-fw"></i>
+                                        </button>
+                                    </a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            </div>
         {% endif %}
     </div>
 {% endblock content %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html

@@ -1,25 +1,36 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Personal fatlink statistics" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">
+    <div>
+        <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
-            <div class="text-end">
-                <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
-                {% if next_year %}
-                    <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
-                {% endif %}
-            </div>
         </h1>
+
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
+
+            {% if next_year %}
+                <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
+            {% endif %}
+        </div>
+
         <div class="col-lg-2 offset-lg-5">
             <table class="table table-responsive">
                 <tr>
                     <th scope="col" class="col-md-2 text-center">{% translate "Month" %}</th>
                     <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
                 </tr>
+
                 {% for monthnr, month, n_fats in monthlystats %}
                     <tr>
                         <td class="text-center">

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html

@@ -1,50 +1,63 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Fatlink Corp Statistics" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">
+    <div>
+        <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-            <div class="text-end">
-                <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                {% if next_month %}
-                    <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
-                {% endif %}
-            </div>
         </h1>
-        {% if fatStats %}
-        <div class="table-responsive">
-            <table class="table table-striped">
-                <tr>
-                    <th scope="col" class="col-md-1"></th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Main Character" %}</th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Characters" %}</th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
-                    <th scope="col" class="col-md-2 text-center">
-                        {% translate "Average fats" %}
-                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
-                    </th>
-                </tr>
-                {% for memberStat in fatStats %}
-                    <tr>
-                        <td>
-                            <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
-                        </td>
-                        <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
-                        <td class="text-center">{{ memberStat.n_chars }}</td>
-                        <td class="text-center">{{ memberStat.n_fats }}</td>
-                        <td class="text-center">{{ memberStat.avg_fat }}</td>
-                    </tr>
-                {% endfor %}
-            </table>
+
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+
+            {% if next_month %}
+                <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
+            {% endif %}
         </div>
+
+        {% if fatStats %}
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <tr>
+                        <th scope="col" class="col-md-1"></th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Main Character" %}</th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Characters" %}</th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
+                        <th scope="col" class="col-md-2 text-center">
+                            {% translate "Average fats" %}
+                            <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
+                        </th>
+                    </tr>
+                    {% for memberStat in fatStats %}
+                        <tr>
+                            <td>
+                                <img src="{{ memberStat.mainchar.portrait_url_32 }}" class="ra-avatar img-responsive" alt="{{ memberStat.mainchar.character_name }}">
+                            </td>
+                            <td class="text-center">{{ memberStat.mainchar.character_name }}</td>
+                            <td class="text-center">{{ memberStat.n_chars }}</td>
+                            <td class="text-center">{{ memberStat.n_fats }}</td>
+                            <td class="text-center">{{ memberStat.avg_fat }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
         {% endif %}
     </div>
 {% endblock content %}
-{% block extra_script %}
-    $(document).ready(function () {
-        $("[rel=tooltip]").tooltip();
-    });
-{% endblock extra_script %}
+
+{% block extra_javascript %}
+    <script>
+        $(document).ready(() => {
+            $("[rel=tooltip]").tooltip();
+        });
+    </script>
+{% endblock extra_javascript %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html

@@ -1,54 +1,67 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Fatlink Statistics" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">
+    <div>
+        <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-            <div class="text-end">
-                <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-                {% if next_month %}
-                    <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" wclass="btn btn-info">{% translate "Next month" %}</a>
-                {% endif %}
-            </div>
         </h1>
-        {% if fatStats %}
-        <div class="table-responsive">
-            <table class="table table-striped">
-                <tr>
-                    <th scope="col" class="col-md-1"></th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Ticker" %}</th>
-                    <th scope="col" class="col-md-5 text-center">{% translate "Corp" %}</th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Members" %}</th>
-                    <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
-                    <th scope="col" class="col-md-2 text-center">
-                        {% translate "Average fats" %}
-                        <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
-                    </th>
-                </tr>
-                {% for corpStat in fatStats %}
-                    <tr>
-                        <td>
-                            <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}"/>
-                        </td>
-                        <td class="text-center">
-                            <a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a>
-                        </td>
-                        <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
-                        <td class="text-center">{{ corpStat.corp.member_count }}</td>
-                        <td class="text-center">{{ corpStat.n_fats }}</td>
-                        <td class="text-center">{{ corpStat.avg_fat }}</td>
-                    </tr>
-                {% endfor %}
-            </table>
+
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+
+            {% if next_month %}
+                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
+            {% endif %}
         </div>
+
+        {% if fatStats %}
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <tr>
+                        <th scope="col" class="col-md-1"></th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Ticker" %}</th>
+                        <th scope="col" class="col-md-5 text-center">{% translate "Corp" %}</th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Members" %}</th>
+                        <th scope="col" class="col-md-2 text-center">{% translate "Fats" %}</th>
+                        <th scope="col" class="col-md-2 text-center">
+                            {% translate "Average fats" %}
+                            <i class="fa-solid fa-question" rel="tooltip" title="Fats / Characters"></i>
+                        </th>
+                    </tr>
+                    {% for corpStat in fatStats %}
+                        <tr>
+                            <td>
+                                <img src="{{ corpStat.corp.logo_url_32 }}" class="ra-avatar img-responsive" alt="{{ corpStat.corp.corporation_name }}">
+                            </td>
+                            <td class="text-center">
+                                <a href="{% url 'fatlink:statistics_corp' corpStat.corp.corporation_id %}">[{{ corpStat.corp.corporation_ticker }}]</a>
+                            </td>
+                            <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
+                            <td class="text-center">{{ corpStat.corp.member_count }}</td>
+                            <td class="text-center">{{ corpStat.n_fats }}</td>
+                            <td class="text-center">{{ corpStat.avg_fat }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
         {% endif %}
     </div>
 {% endblock content %}
-{% block extra_script %}
-    $(document).ready(function () {
-        $("[rel=tooltip]").tooltip();
-    });
-{% endblock extra_script %}
+
+{% block extra_javascript %}
+    <script>
+        $(document).ready(() => {
+            $("[rel=tooltip]").tooltip();
+        });
+    </script>
+{% endblock extra_javascript %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html

@@ -1,11 +1,20 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Fatlink view" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Fleet Activity Tracking" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Participation data" %}</h1>
+    <div>
+        {% translate "Participation data" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
         <div class="table-responsive">
             <table class="table table-striped">
                 <tr>
@@ -15,11 +24,15 @@
                         </h4>
                     </th>
                     <th class="col-md-2 align-self-end">
-                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info"><i class="fa-solid fa-circle-info fa-fw"></i>{% translate "Personal statistics" %}</a>
+                        <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info">
+                            <i class="fa-solid fa-circle-info fa-fw"></i>
+                            {% translate "Personal statistics" %}
+                        </a>
                     </th>
                 </tr>
             </table>
         </div>
+
         {% if fats %}
             <div class="table-responsive">
                 <table class="table table-striped">
@@ -30,6 +43,7 @@
                         <th scope="col" class="text-center">{% translate "Ship" %}</th>
                         <th scope="col" class="text-center">{% translate "Eve Time" %}</th>
                     </tr>
+
                     {% for fat in fats %}
                         <tr>
                             <td class="text-center">{{ fat.fatlink.fleet }}</td>
@@ -48,6 +62,7 @@
         {% else %}
             <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
         {% endif %}
+
         {% if perms.auth.fleetactivitytracking %}
             <div class="table-responsive">
                 <table class="table table-striped">
@@ -66,6 +81,7 @@
                     </tr>
                 </table>
             </div>
+
             {% if fatlinks %}
                 <div class="table-responsive">
                     <table class="table table-striped">
@@ -77,10 +93,11 @@
                             <th scope="col" class="text-center">{% translate "Duration" %}</th>
                             <th scope="col" class="text-center">{% translate "Edit" %}</th>
                         </tr>
+
                         {% for link in fatlinks %}
                             <tr>
                                 <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge badge-primary">{{ link.fleet }}</a>
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
                                 </td>
                                 <td class="text-center">{{ link.creator.username }}</td>
                                 <td class="text-center">{{ link.fleet }}</td>

allianceauth/fleetactivitytracking/views.py

@@ -352,11 +352,11 @@ def create_fatlink_view(request):
                     for errorname, message in e.message_dict.items():
                         messages.append(message[0].decode())
                     context = {'form': form, 'errormessages': messages}
-                    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
+                    return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context)
             else:
                 form = FatlinkForm()
                 context = {'form': form, 'badrequest': True}
-                return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
+                return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context)
             return redirect('fatlink:view')
 
     else:
@@ -365,7 +365,7 @@ def create_fatlink_view(request):
 
     context = {'form': form}
 
-    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context)
 
 
 @login_required
@@ -377,12 +377,12 @@ def modify_fatlink_view(request, fat_hash=None):
     if request.GET.get('removechar', None):
         character_id = request.GET.get('removechar')
         character = EveCharacter.objects.get(character_id=character_id)
-        logger.debug(f"Removing character {character.character_name} from fleetactivitytracking  {fatlink}")
+        logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}")
 
         Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
 
     if request.GET.get('deletefat', None):
-        logger.debug("Removing fleetactivitytracking  %s" % fatlink)
+        logger.debug("Removing fleetactivitytracking %s" % fatlink)
         fatlink.delete()
         return redirect('fatlink:view')
 

allianceauth/framework/__init__.py

@@ -0,0 +1,3 @@
+"""
+Alliance Auth Framework
+"""

allianceauth/framework/api/user.py

@@ -0,0 +1,64 @@
+"""
+Alliance Auth User API
+"""
+
+from typing import Optional
+
+from django.contrib.auth.models import User
+
+from allianceauth.eveonline.models import EveCharacter
+
+
+def get_sentinel_user() -> User:
+    """
+    Get the sentinel user or create one
+
+    :return:
+    """
+
+    return User.objects.get_or_create(username="deleted")[0]
+
+def get_main_character_from_user(user: User) -> Optional[EveCharacter]:
+    """
+    Get the main character from a user
+
+    :param user:
+    :type user:
+    :return:
+    :rtype:
+    """
+
+    if user is None:
+        return None
+
+    try:
+        main_character = user.profile.main_character
+    except AttributeError:
+        return None
+
+    return main_character
+
+
+def get_main_character_name_from_user(user: User) -> str:
+    """
+    Get the main character name from a user
+
+    :param user:
+    :type user:
+    :return:
+    :rtype:
+    """
+
+    if user is None:
+        sentinel_user = get_sentinel_user()
+
+        return sentinel_user.username
+
+    main_character = get_main_character_from_user(user=user)
+
+    try:
+        username = main_character.character_name
+    except AttributeError:
+        return str(user)
+
+    return username

allianceauth/framework/apps.py

@@ -0,0 +1,14 @@
+"""
+Framework App Config
+"""
+
+from django.apps import AppConfig
+
+
+class FrameworkConfig(AppConfig):
+    """
+    Framework App Config
+    """
+
+    name = "allianceauth.framework"
+    label = "framework"

allianceauth/framework/static/allianceauth/framework/css/auth-framework.css

@@ -0,0 +1,101 @@
+/**
+ * Alliance Auth CSS Framework
+ *
+ * This provides some CSS classes together with a couple of Bootstrap fixes
+ * to be used throughout Alliance Auth and its Community Apps
+ */
+
+/* Bootstrap fixes
+------------------------------------------------------------------------------------- */
+@media all {
+    .table {
+        --bs-table-bg: transparent;
+    }
+}
+
+/* Cursor classes
+------------------------------------------------------------------------------------- */
+@media all {
+    .cursor-auto {
+        cursor: auto;
+    }
+
+    .cursor-default {
+        cursor: default;
+    }
+
+    .cursor-pointer {
+        cursor: pointer;
+    }
+
+    .cursor-wait {
+        cursor: wait;
+    }
+
+    .cursor-text {
+        cursor: text;
+    }
+
+    .cursor-move {
+        cursor: move;
+    }
+
+    .cursor-help {
+        cursor: help;
+    }
+
+    .cursor-not-allowed {
+        cursor: not-allowed;
+    }
+
+    .cursor-inherit {
+        cursor: inherit;
+    }
+
+    .cursor-zoom-in {
+        cursor: zoom-in;
+    }
+
+    .cursor-zoom-out {
+        cursor: zoom-out;
+    }
+}
+
+/* Callouts
+ *
+ * Not quite alerts, but custom and helpful notes for folks.
+ * Requires a base and modifier class.
+------------------------------------------------------------------------------------- */
+@media all {
+    /* Common styles for all types */
+    .aa-callout {
+        border: 1px solid var(--bs-border-color);
+        border-left-width: 0.25rem;
+        border-radius: 0.25rem;
+        margin-bottom: 1.25rem;
+        margin-top: 1.25rem;
+        padding: 1.25rem;
+    }
+
+    /* Last item bottom margin should be 0 */
+    .aa-callout :last-child {
+        margin-bottom: 0;
+    }
+
+    /* Variations */
+    .aa-callout.aa-callout-danger {
+        border-left-color: var(--bs-danger);
+    }
+
+    .aa-callout.aa-callout-info {
+        border-left-color: var(--bs-info);
+    }
+
+    .aa-callout.aa-callout-success {
+        border-left-color: var(--bs-success);
+    }
+
+    .aa-callout.aa-callout-warning {
+        border-left-color: var(--bs-warning);
+    }
+}

allianceauth/framework/templates/framework/header/page-header.html

@@ -0,0 +1,13 @@
+{#Usage:#}
+{#    {% include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}
+
+{% if title %}
+    <h1 class="page-header text-center mb-3">
+        {{ title }}
+
+        {% if subtitle %}
+            <br>
+            <small>{{ subtitle }}</small>
+        {% endif %}
+    </h1>
+{% endif %}

allianceauth/framework/tests/__init__.py

@@ -0,0 +1,3 @@
+"""
+Initializing our tests
+"""

allianceauth/framework/tests/test_api_user.py

@@ -0,0 +1,179 @@
+"""
+Test sentinel user
+"""
+
+import re
+
+# Django
+from django.contrib.auth.models import User
+from django.test import TestCase
+
+# Alliance Auth
+from allianceauth.framework.api.user import (
+    get_sentinel_user,
+    get_main_character_from_user,
+    get_main_character_name_from_user
+)
+from allianceauth.tests.auth_utils import AuthUtils
+
+
+class TestSentinelUser(TestCase):
+    """
+    Tests for the sentinel user
+    """
+
+    def test_should_create_user_when_it_does_not_exist(self) -> None:
+        """
+        Test should create a sentinel user when it doesn't exist
+
+        :return:
+        :rtype:
+        """
+
+        # when
+        user = get_sentinel_user()
+
+        # then
+        self.assertEqual(first=user.username, second="deleted")
+
+    def test_should_return_user_when_it_does(self) -> None:
+        """
+        Test should return sentinel user when it exists
+
+        :return:
+        :rtype:
+        """
+
+        # given
+        User.objects.create_user(username="deleted")
+
+        # when
+        user = get_sentinel_user()
+
+        # then
+        self.assertEqual(first=user.username, second="deleted")
+
+
+class TestGetMainForUser(TestCase):
+    """
+    Tests for get_main_character_from_user
+    """
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        """
+        Set up groups and users
+        """
+
+        super().setUpClass()
+
+        cls.character_name = "William T. Riker"
+        cls.character_name_2 = "Christopher Pike"
+
+        cls.username = re.sub(pattern=r"[^\w\d@\.\+-]", repl="_", string=cls.character_name)
+        cls.username_2 = re.sub(
+            pattern=r"[^\w\d@\.\+-]", repl="_", string=cls.character_name_2
+        )
+
+        cls.user = AuthUtils.create_user(username=cls.username)
+        cls.user_without_main = AuthUtils.create_user(
+            username=cls.username_2, disconnect_signals=True
+        )
+
+        cls.character = AuthUtils.add_main_character_2(
+            user=cls.user, name=cls.character_name, character_id=1001
+        )
+
+
+    def test_get_main_character_from_user_should_return_character_name(self):
+        """
+        Test should return the main character name for a regular user
+
+        :return:
+        :rtype:
+        """
+
+        character = get_main_character_from_user(user=self.user)
+
+        self.assertEqual(first=character, second=self.character)
+
+
+    def test_get_main_character_from_user_should_return_none_for_no_main_character(self):
+        """
+        Test should return None for User without a main character
+
+        :return:
+        :rtype:
+        """
+
+        character = get_main_character_from_user(user=self.user_without_main)
+
+        self.assertIsNone(obj=character)
+
+
+    def test_get_main_character_from_user_should_none(self):
+        """
+        Test should return None when user is None
+
+        :return:
+        :rtype:
+        """
+
+        user = None
+
+        character = get_main_character_from_user(user=user)
+
+        self.assertIsNone(obj=character)
+
+
+    def test_get_main_character_name_from_user_should_return_character_name(self):
+        """
+        Test should return the main character name for a regular user
+
+        :return:
+        :rtype:
+        """
+
+        character_name = get_main_character_name_from_user(user=self.user)
+
+        self.assertEqual(first=character_name, second=self.character_name)
+
+    def test_get_main_character_name_from_user_should_return_user_name(self):
+        """
+        Test should return just the username for a user without a main character
+
+        :return:
+        :rtype:
+        """
+
+        character_name = get_main_character_name_from_user(user=self.user_without_main)
+
+        self.assertEqual(first=character_name, second=self.username_2)
+
+    def test_get_main_character_name_from_user_should_return_sentinel_user(self):
+        """
+        Test should return "deleted" as username (Sentinel User)
+
+        :return:
+        :rtype:
+        """
+
+        user = get_sentinel_user()
+
+        character_name = get_main_character_name_from_user(user=user)
+
+        self.assertEqual(first=character_name, second="deleted")
+
+    def test_get_main_character_name_from_user_should_return_sentinel_user_for_none(self):
+        """
+        Test should return "deleted" (Sentinel User) if user is None
+
+        :return:
+        :rtype:
+        """
+
+        user = None
+
+        character_name = get_main_character_name_from_user(user=user)
+
+        self.assertEqual(first=character_name, second="deleted")

allianceauth/groupmanagement/auth_hooks.py

@@ -16,7 +16,7 @@ class GroupManagementMenuItem(MenuItemHook):
         MenuItemHook.__init__(
             self,
             text=_("Group Management"),
-            classes="fas fa-users-cog fa-fw",
+            classes="fa-solid fa-users-gear",
             url_name="groupmanagement:management",
             order=50,
             navactive=[
@@ -36,7 +36,7 @@ class GroupManagementMenuItem(MenuItemHook):
 
 """
             <li class="d-flex m-2 p-2 pt-0 pb-0 mt-0 mb-0">
-                <i class="fas fa-users fa-fw align-self-center me-2"></i>
+                <i class="fa-solid fa-users fa-fw align-self-center me-2"></i>
                 <a class="nav-link flex-fill align-self-center {% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
                     {% translate "Groups" %}
                 </a>
@@ -49,7 +49,7 @@ class GroupsMenuItem(MenuItemHook):
         MenuItemHook.__init__(
             self,
             text=_("Groups"),
-            classes="fas fa-user fa-fw",
+            classes="fa-solid fa-user",
             url_name="groupmanagement:groups",
             order=25,
             navactive=[

allianceauth/groupmanagement/forms.py

@@ -1,6 +1,10 @@
+import functools
+
 from django import forms
-from django.contrib.auth.models import Group
+from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.contrib.auth.models import Group, User
 from django.core.exceptions import ValidationError
+from django.db.models.functions import Lower
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -8,6 +12,39 @@ from .models import ReservedGroupName
 
 
 class GroupAdminForm(forms.ModelForm):
+    users = forms.ModelMultipleChoiceField(
+        queryset=User.objects.order_by(Lower('username')),
+        required=False,
+        widget=FilteredSelectMultiple(verbose_name=_("Users"), is_stacked=False),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.pk:
+            self.fields["users"].initial = self.instance.user_set.all()
+
+    def save(self, commit=True):
+        group: Group = super().save(commit=False)
+
+        if commit:
+            group.save()
+
+        users = self.cleaned_data["users"]
+        if group.pk:
+            self._save_m2m_and_users(group, users)
+        else:
+            self.save_m2m = functools.partial(
+                self._save_m2m_and_users, group=group, users=users
+            )
+
+        return group
+
+    def _save_m2m_and_users(self, group, users):
+        """Save m2m relations incl. users."""
+        group.user_set.set(users)
+        self._save_m2m()
+
     def clean_name(self):
         my_name = self.cleaned_data['name']
         if ReservedGroupName.objects.filter(name__iexact=my_name).exists():

allianceauth/groupmanagement/migrations/0004_authgroup.py

@@ -74,11 +74,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='AuthGroup',
             fields=[
-                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,  to='auth.Group')),
+                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')),
                 ('internal', models.BooleanField(default=True, help_text='Internal group, users cannot see, join or request to join this group.<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides Hidden and Open options when selected.</b>')),
                 ('hidden', models.BooleanField(default=True, help_text='Group is hidden from users but can still join with the correct link.')),
                 ('open', models.BooleanField(default=False, help_text='Group is open and users will be automatically added upon request. <br>If the group is not open users will need their request manually approved.')),
-                ('description', models.CharField(max_length=512, blank=True,  help_text='Description of the group shown to users.', )),
+                ('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )),
 
                 ('group_leaders', models.ManyToManyField(related_name='leads_groups', to=settings.AUTH_USER_MODEL, blank=True, help_text='Group leaders can process group requests for this group specifically. Use the auth.group_management permission to allow a user to manage all groups.',)),
             ],

allianceauth/groupmanagement/models.py

@@ -1,8 +1,7 @@
 from typing import Set
 
 from django.conf import settings
-from django.contrib.auth.models import Group
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
 from django.db import models
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -14,7 +13,7 @@ from allianceauth.notifications import notify
 class GroupRequest(models.Model):
     """Request from a user for joining or leaving a group."""
 
-    leave_request = models.BooleanField(default=0)
+    leave_request = models.BooleanField(default=False)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
 
@@ -49,7 +48,7 @@ class RequestLog(models.Model):
     request_type = models.BooleanField(null=True)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
     request_info = models.CharField(max_length=254)
-    action = models.BooleanField(default=0)
+    action = models.BooleanField(default=False)
     request_actor = models.ForeignKey(User, on_delete=models.CASCADE)
     date = models.DateTimeField(auto_now_add=True)
 

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -1,15 +1,21 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 {% load navactive %}
 
-{% block page_title %}{{ group }} {% translate "Audit Log" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Audit Log" %} - {{ group.name }}{% endblock header_nav_brand %}
+{% block page_title %}
+    {{ group }} {% translate "Audit Log" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Audit Log" %} - {{ group.name }}
+{% endblock header_nav_brand %}
 
 {% block header_nav_collapse_left %}
-<li class="nav-item ">
-    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
-</li>
+    <li class="nav-item">
+        <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+    </li>
 {% endblock %}
 
 {% block content %}
@@ -17,13 +23,15 @@
         <div class="table-responsive">
             <table class="table table-striped" id="log-entries">
                 <thead>
-                    <th scope="col">{% translate "Date/Time" %}</th>
-                    <th scope="col">{% translate "Requestor" %}</th>
-                    <th scope="col">{% translate "Character" %}</th>
-                    <th scope="col">{% translate "Corporation" %}</th>
-                    <th scope="col">{% translate "Type" %}</th>
-                    <th scope="col">{% translate "Action" %}</th>
-                    <th scope="col">{% translate "Actor" %}</th>
+                    <tr>
+                        <th scope="col">{% translate "Date/Time" %}</th>
+                        <th scope="col">{% translate "Requestor" %}</th>
+                        <th scope="col">{% translate "Character" %}</th>
+                        <th scope="col">{% translate "Corporation" %}</th>
+                        <th scope="col">{% translate "Type" %}</th>
+                        <th scope="col">{% translate "Action" %}</th>
+                        <th scope="col">{% translate "Actor" %}</th>
+                    </tr>
                 </thead>
 
                 <tbody>
@@ -63,61 +71,61 @@
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
     {% include 'bundles/moment-js.html' with locale=True %}
-    {% include 'bundles/filterdropdown-js.html' %}
+{#    {% include 'bundles/filterdropdown-js.html' %}#}
+
+    <script>
+        $.fn.dataTable.moment = (format, locale) => {
+            const types = $.fn.dataTable.ext.type;
+
+            // Add type detection
+            types.detect.unshift((d) => {
+                return moment(d, format, locale, true).isValid() ?
+                    'moment-'+format :
+                    null;
+            });
+
+            // Add sorting method - use an integer for the sorting
+            types.order[ 'moment-'+format+'-pre' ] = (d) => {
+                return moment(d, format, locale, true).unix();
+            };
+        };
+
+        $(document).ready(() => {
+            $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
+
+            $('#log-entries').DataTable({
+                order: [[0, 'desc'], [1, 'asc']],
+                filterDropDown:
+                    {
+                        columns: [
+                            {
+                                idx: 1
+                            },
+                            {
+                                idx: 2
+                            },
+                            {
+                                idx: 3
+                            },
+                            {
+                                idx: 4
+                            },
+                            {
+                                idx: 5
+                            },
+                            {
+                                idx: 6
+                            }
+                        ],
+                        bootstrap: true
+                    },
+                "stateSave": true,
+                "stateDuration": 0
+            });
+        });
+    </script>
 {% endblock %}
 
 {% block extra_css %}
     {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
-
-{% block extra_script %}
-    $.fn.dataTable.moment = function(format, locale) {
-        let types = $.fn.dataTable.ext.type;
-
-        // Add type detection
-        types.detect.unshift(function(d) {
-            return moment(d, format, locale, true).isValid() ?
-                'moment-'+format :
-                null;
-        });
-
-        // Add sorting method - use an integer for the sorting
-        types.order[ 'moment-'+format+'-pre' ] = function(d) {
-            return moment(d, format, locale, true).unix();
-        };
-    };
-
-    $(document).ready(function(){
-        $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
-
-        $('#log-entries').DataTable({
-            order: [[0, 'desc'], [1, 'asc']],
-            filterDropDown:
-            {
-                columns: [
-                    {
-                        idx: 1
-                    },
-                    {
-                        idx: 2
-                    },
-                    {
-                        idx: 3
-                    },
-                    {
-                        idx: 4
-                    },
-                    {
-                        idx: 5
-                    },
-                    {
-                        idx: 6
-                    }
-                ],
-                bootstrap: true
-            },
-            "stateSave": true,
-            "stateDuration": 0
-        });
-    });
-{% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html

@@ -1,22 +1,28 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 {% load evelinks %}
 {% load navactive %}
 
-{% block page_title %}{% translate "Group Members" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Group Members" %} - {{ group.name }}{% endblock header_nav_brand %}
+{% block page_title %}
+    {% translate "Group Members" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Group Members" %} - {{ group.name }}
+{% endblock header_nav_brand %}
 
 {% block header_nav_collapse_left %}
-<li class="nav-item ">
-    <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
-</li>
+    <li class="nav-item">
+        <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Back" %}</a>
+    </li>
 {% endblock %}
 
 {% block content %}
     {% if group.user_set %}
         <div class="table-responsive">
-            <table class="table table-aa" id="tab_group_members">
+            <table class="table" id="tab_group_members">
                 <thead>
                     <tr>
                         <th>{% translate "Character" %}</th>
@@ -29,7 +35,8 @@
                     {% for member in members %}
                         <tr>
                             <td>
-                                <img src="{{ member.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
+                                <img src="{{ member.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ member.main_char.character_name }}">
+
                                 {% if member.main_char %}
                                     <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
                                         {{ member.main_char.character_name }}
@@ -39,7 +46,7 @@
                                 {% endif %}
 
                                 {% if member.is_leader %}
-                                    <i class="fa-solid fa-star"> title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
+                                    <sup><i class="fa-solid fa-star" title="{% translate "Group leader" %}"></i></sup>
                                 {% endif %}
                             </td>
 
@@ -53,6 +60,7 @@
                                     {% translate "(unknown)" %}
                                 {% endif %}
                             </td>
+
                             <td class="text-end">
                                 <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
                                     <i class="fa-solid fa-xmark"></i>
@@ -77,24 +85,24 @@
 
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
+
+    <script>
+        $(document).ready(() => {
+            $('#tab_group_members').DataTable({
+                order: [[0, "asc"]],
+                columnDefs: [
+                    {
+                        "sortable": false,
+                        "targets": [2]
+                    },
+                ],
+                "stateSave": true,
+                "stateDuration": 0
+            });
+        });
+    </script>
 {% endblock %}
 
 {% block extra_css %}
     {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
-
-{% block extra_script %}
-    $(document).ready(function(){
-        $('#tab_group_members').DataTable({
-            order: [[0, "asc"]],
-            columnDefs: [
-                {
-                    "sortable": false,
-                    "targets": [2]
-                },
-            ],
-            "stateSave": true,
-            "stateDuration": 0
-        });
-    });
-{% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html

@@ -9,7 +9,7 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block header_nav_collapse_left %}
-<li class="nav-item ">
+<li class="nav-item">
     <a class="nav-link {% navactive request 'groupmanagement:management' %}" href="{% url 'groupmanagement:management' %}">{% translate "Join/Leave Requests" %}</a>
 </li>
 {% endblock header_nav_collapse_left %}
@@ -17,7 +17,7 @@
 {% block content %}
     {% if groups %}
         <div class="table-responsive">
-            <table class="table table-aa">
+            <table class="table">
                 <thead>
                     <tr>
                         <th>{% translate "Name" %}</th>
@@ -54,15 +54,15 @@
 
                             <td class="text-end">
                                 <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
-                                    <i class="far fa-eye"></i>
+                                    <i class="fa-regular fa-eye"></i>
                                 </a>
 
                                 <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
-                                    <i class="far fa-list-alt"></i>
+                                    <i class="fa-regular fa-rectangle-list"></i>
                                 </a>
 
                                 <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
-                                    <i class="far fa-clipboard"></i>
+                                    <i class="fa-regular fa-clipboard"></i>
                                 </a>
                             </td>
                         </tr>

allianceauth/groupmanagement/templates/groupmanagement/groups.html

@@ -1,21 +1,28 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Available Groups" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Available Groups" %}{% endblock header_nav_brand %}
+{% block page_title %}
+    {% translate "Available Groups" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Available Groups" %}
+{% endblock header_nav_brand %}
 
 {% if manager_perms %}
-{% block header_nav_collapse_left %}
-<li class="nav-item">
-    <a class="nav-link" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}
-        {% if req_count %}
-            <span class="badge bg-secondary">{{ req_count }}</span>
-        {% endif %}
-    </a>
-</li>
-{% endblock %}
+    {% block header_nav_collapse_left %}
+        <li class="nav-item">
+            <a class="nav-link" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}
+                {% if req_count %}
+                    <span class="badge bg-secondary">{{ req_count }}</span>
+                {% endif %}
+            </a>
+        </li>
+    {% endblock %}
 {% endif %}
+
 {% block content %}
     {% if groups %}
         <table class="table" id="groupsTable" >
@@ -23,7 +30,7 @@
                 <tr>
                     <th>{% translate "Name" %}</th>
                     <th>{% translate "Description" %}</th>
-                    <th>{% translate "Leaders" %}<span class="m-1 fw-lighter badge bg-primary">User</span><span class="m-1 fw-lighter badge bg-secondary ">Group</span></th>
+                    <th>{% translate "Leaders" %}<span class="m-1 fw-lighter badge bg-primary">{% translate "User" %}</span><span class="m-1 fw-lighter badge bg-secondary ">{% translate "Group" %}</span></th>
                     <th></th>
                 </tr>
             </thead>
@@ -72,25 +79,23 @@
                 {% endfor %}
             </tbody>
         </table>
-
     {% else %}
         <div class="alert alert-warning text-center">
             {% translate "No groups available." %}
         </div>
     {% endif %}
 {% endblock content %}
+
 {% block extra_javascript %}
     {% include 'bundles/datatables-js-bs5.html' %}
+
+    <script>
+        $(document).ready(() => {
+            $('#groupsTable').DataTable();
+        });
+    </script>
 {% endblock %}
 
 {% block extra_css %}
     {% include 'bundles/datatables-css-bs5.html' %}
 {% endblock %}
-
-{% block extra_script %}
-
-    $(document).ready(function () {
-        $('#groupsTable').DataTable();
-    });
-
-{% endblock extra_script %}

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -1,107 +1,55 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 {% load evelinks %}
 {% load navactive %}
 
-{% block page_title %}{% translate "Groups Management" %}{% endblock page_title %}
-{% block header_nav_brand %}{% translate "Groups Management" %}{% endblock header_nav_brand %}
+{% block page_title %}
+    {% translate "Groups Management" %}
+{% endblock page_title %}
 
-{% block extra_css %}
-{% endblock extra_css %}
+{% block header_nav_brand %}
+    {% translate "Groups Management" %}
+{% endblock header_nav_brand %}
 
 {% block header_nav_collapse_left %}
-<li class="active">
-    <a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="addd" aria-selected="true">
-        {% translate "Join Requests" %}
+    <li class="active">
+        <a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="add" aria-selected="true">
+            {% translate "Join Requests" %}
 
-        {% if acceptrequests %}
-            <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
-        {% endif %}
-    </a>
-</li>
-
-{%  if not auto_leave %}
-    <li>
-        <a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
-            {% translate "Leave Requests" %}
-
-            {% if leaverequests %}
-                <span class="badge bg-secondary">{{ leaverequests|length }}</span>
+            {% if acceptrequests %}
+                <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
             {% endif %}
         </a>
     </li>
-{% endif %}
-<li class="nav-item ">
-    <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
-</li>
 
-{% endblock %}
+    {% if not show_leave_tab %}
+        <li>
+            <a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
+                {% translate "Leave Requests" %}
+
+                {% if leaverequests %}
+                    <span class="badge bg-secondary">{{ leaverequests|length }}</span>
+                {% endif %}
+            </a>
+        </li>
+    {% endif %}
+
+    <li class="nav-item ">
+        <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">
+            {% translate "Group Membership" %}
+        </a>
+    </li>
+{% endblock header_nav_collapse_left %}
 
 
 {% block content %}
-<div class="tab-content">
-    <div id="add" class="tab-pane active">
-        {% if acceptrequests %}
-            <div class="table-responsive">
-                <table class="table table-aa">
-                    <thead>
-                        <tr>
-                            <th>{% translate "Character" %}</th>
-                            <th>{% translate "Organization" %}</th>
-                            <th>{% translate "Group" %}</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-
-                    <tbody class="align-middle">
-                        {% for acceptrequest in acceptrequests %}
-                            <tr>
-                                <td>
-                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
-                                    {% if acceptrequest.main_char %}
-                                        <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                            {{ acceptrequest.main_char.character_name }}
-                                        </a>
-                                    {% else %}
-                                        {{ acceptrequest.user.username }}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {% if acceptrequest.main_char %}
-                                        <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                            {{ acceptrequest.main_char.corporation_name }}
-                                        </a><br>
-                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                    {% else %}
-                                        {% translate "(unknown)" %}
-                                    {% endif %}
-                                </td>
-                                <td>{{ acceptrequest.group.name }}</td>
-                                <td class="text-end">
-                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                        {% translate "Accept" %}
-                                    </a>
-
-                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                        {% translate "Reject" %}
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        {% else %}
-            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
-        {% endif %}
-    </div>
-
-    {%  if not auto_leave %}
-        <div id="leave" class="tab-pane">
-            {% if leaverequests %}
+    <div class="tab-content">
+        <div id="add" class="tab-pane active">
+            {% if acceptrequests %}
                 <div class="table-responsive">
-                    <table class="table table-aa">
+                    <table class="table">
                         <thead>
                             <tr>
                                 <th>{% translate "Character" %}</th>
@@ -112,36 +60,37 @@
                         </thead>
 
                         <tbody class="align-middle">
-                            {% for leaverequest in leaverequests %}
+                            {% for acceptrequest in acceptrequests %}
                                 <tr>
                                     <td>
-                                        <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;">
-                                        {% if leaverequest.main_char %}
-                                            <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                                {{ leaverequest.main_char.character_name }}
+                                        <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ acceptrequest.main_char.character_name }}">
+
+                                        {% if acceptrequest.main_char %}
+                                            <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                                {{ acceptrequest.main_char.character_name }}
                                             </a>
                                         {% else %}
-                                            {{ leaverequest.user.username }}
+                                            {{ acceptrequest.user.username }}
                                         {% endif %}
                                     </td>
+
                                     <td>
-                                        {% if leaverequest.main_char %}
-                                            <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                {{ leaverequest.main_char.corporation_name }}
-                                            </a><br>
-                                            {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                        {% if acceptrequest.main_char %}
+                                            <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                {{ acceptrequest.main_char.corporation_name }}
+                                            </a>
+                                            <br>
+                                            {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
                                         {% else %}
                                             {% translate "(unknown)" %}
                                         {% endif %}
                                     </td>
-                                    <td>{{ leaverequest.group.name }}</td>
-                                    <td class="text-end">
-                                        <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                            {% translate "Accept" %}
-                                        </a>
 
-                                        <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                            {% translate "Reject" %}
+                                    <td>{{ acceptrequest.group.name }}</td>
+
+                                    <td class="text-end">
+                                        <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                            {% translate "Accept" %}
                                         </a>
                                     </td>
                                 </tr>
@@ -150,9 +99,73 @@
                     </table>
                 </div>
             {% else %}
-                <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
+                <div class="aa-callout aa-callout-warning text-center">
+                    {% translate "No group add requests." %}
+                </div>
             {% endif %}
         </div>
-    {% endif %}
-</div>
+
+        {% if not show_leave_tab %}
+            <div id="leave" class="tab-pane">
+                {% if leaverequests %}
+                    <div class="table-responsive">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>{% translate "Character" %}</th>
+                                    <th>{% translate "Organization" %}</th>
+                                    <th>{% translate "Group" %}</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+
+                            <tbody class="align-middle">
+                                {% for leaverequest in leaverequests %}
+                                    <tr>
+                                        <td>
+                                            <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="rounded-circle" style="margin-right: 1rem;" alt="{{ leaverequest.main_char.character_name }}">
+
+                                            {% if leaverequest.main_char %}
+                                                <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                    {{ leaverequest.main_char.character_name }}
+                                                </a>
+                                            {% else %}
+                                                {{ leaverequest.user.username }}
+                                            {% endif %}
+                                        </td>
+
+                                        <td>
+                                            {% if leaverequest.main_char %}
+                                                <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                    {{ leaverequest.main_char.corporation_name }}
+                                                </a>
+                                                <br>
+                                                {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                            {% else %}
+                                                {% translate "(unknown)" %}
+                                            {% endif %}
+                                        </td>
+
+                                        <td>{{ leaverequest.group.name }}</td>
+
+                                        <td class="text-end">
+                                            <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                                {% translate "Accept" %}
+                                            </a>
+
+                                            <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                                {% translate "Reject" %}
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                {% else %}
+                    <div class="aa-callout aa-callout-warning text-center">{% translate "No group leave requests." %}</div>
+                {% endif %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock content %}

allianceauth/groupmanagement/tests/test_admin.py

@@ -6,22 +6,22 @@ from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User
-from django.test import TestCase, RequestFactory, Client, override_settings
+from django.test import Client, RequestFactory, TestCase, override_settings
 
 from allianceauth.authentication.models import CharacterOwnership, State
 from allianceauth.eveonline.models import (
-    EveCharacter, EveCorporationInfo, EveAllianceInfo
+    EveAllianceInfo, EveCharacter, EveCorporationInfo,
 )
 from allianceauth.tests.auth_utils import AuthUtils
 
-from . import get_admin_change_view_url
-from ..admin import HasLeaderFilter, GroupAdmin, Group
+from ..admin import Group, GroupAdmin, HasLeaderFilter
 from ..models import ReservedGroupName
-
+from . import get_admin_change_view_url
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
     from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+
     from ..admin import IsAutoGroupFilter
 else:
     _has_auto_groups = False
@@ -621,21 +621,16 @@ class TestGroupAdmin2(TestCase):
         response = self.client.post(
             f"/admin/groupmanagement/group/{group.pk}/change/",
             data={
-                "name": f"{group.name}",
-                "authgroup-TOTAL_FORMS": "1",
-                "authgroup-INITIAL_FORMS": "1",
-                "authgroup-MIN_NUM_FORMS": "0",
-                "authgroup-MAX_NUM_FORMS": "1",
-                "authgroup-0-description": "",
-                "authgroup-0-states": f"{member_state.pk}",
+                "name": group.name,
+                "users": [user_member.pk, user_guest.pk],
+                "authgroup-TOTAL_FORMS": 1,
+                "authgroup-INITIAL_FORMS": 1,
+                "authgroup-MIN_NUM_FORMS": 0,
+                "authgroup-MAX_NUM_FORMS": 1,
+                "authgroup-0-states": member_state.pk,
                 "authgroup-0-internal": "on",
                 "authgroup-0-hidden": "on",
-                "authgroup-0-group": f"{group.pk}",
-                "authgroup-__prefix__-description": "",
-                "authgroup-__prefix__-internal": "on",
-                "authgroup-__prefix__-hidden": "on",
-                "authgroup-__prefix__-group": f"{group.pk}",
-                "_save": "Save"
+                "authgroup-0-group": group.pk,
             }
         )
         # then
@@ -644,6 +639,85 @@ class TestGroupAdmin2(TestCase):
         self.assertIn(group, user_member.groups.all())
         self.assertNotIn(group, user_guest.groups.all())
 
+    def test_should_add_user_to_existing_group(self):
+        # given
+        user_bruce = AuthUtils.create_user("Bruce Wayne")
+        user_lex = AuthUtils.create_user("Lex Luthor")
+        group = Group.objects.create(name="dummy")
+        user_bruce.groups.add(group)
+        self.client.force_login(self.superuser)
+        # when
+        response = self.client.post(
+            f"/admin/groupmanagement/group/{group.pk}/change/",
+            data={
+                "name": group.name,
+                "users": [user_bruce.pk, user_lex.pk],
+                "authgroup-TOTAL_FORMS": 1,
+                "authgroup-INITIAL_FORMS": 1,
+                "authgroup-MIN_NUM_FORMS": 0,
+                "authgroup-MAX_NUM_FORMS": 1,
+                "authgroup-0-internal": "on",
+                "authgroup-0-hidden": "on",
+                "authgroup-0-group": group.pk,
+            }
+        )
+        # then
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/admin/groupmanagement/group/")
+        self.assertIn(group, user_bruce.groups.all())
+        self.assertIn(group, user_lex.groups.all())
+
+    def test_should_remove_user_from_existing_group(self):
+        # given
+        user_bruce = AuthUtils.create_user("Bruce Wayne")
+        user_lex = AuthUtils.create_user("Lex Luthor")
+        group = Group.objects.create(name="dummy")
+        user_bruce.groups.add(group)
+        user_lex.groups.add(group)
+        self.client.force_login(self.superuser)
+        # when
+        response = self.client.post(
+            f"/admin/groupmanagement/group/{group.pk}/change/",
+            data={
+                "name": group.name,
+                "users": user_bruce.pk,
+                "authgroup-TOTAL_FORMS": 1,
+                "authgroup-INITIAL_FORMS": 1,
+                "authgroup-MIN_NUM_FORMS": 0,
+                "authgroup-MAX_NUM_FORMS": 1,
+                "authgroup-0-internal": "on",
+                "authgroup-0-hidden": "on",
+                "authgroup-0-group": group.pk,
+            }
+        )
+        # then
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/admin/groupmanagement/group/")
+        self.assertIn(group, user_bruce.groups.all())
+        self.assertNotIn(group, user_lex.groups.all())
+
+    def test_should_include_user_when_creating_group(self):
+        # given
+        user_bruce = AuthUtils.create_user("Bruce Wayne")
+        self.client.force_login(self.superuser)
+        # when
+        response = self.client.post(
+            "/admin/groupmanagement/group/add/",
+            data={
+                "name": "new group",
+                "users": user_bruce.pk,
+                "authgroup-TOTAL_FORMS": 1,
+                "authgroup-INITIAL_FORMS": 0,
+                "authgroup-MIN_NUM_FORMS": 0,
+                "authgroup-MAX_NUM_FORMS": 1,
+            }
+        )
+        # then
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/admin/groupmanagement/group/")
+        group = Group.objects.get(name="new group")
+        self.assertIn(group, user_bruce.groups.all())
+
 
 class TestReservedGroupNameAdmin(TestCase):
     @classmethod

allianceauth/groupmanagement/tests/test_views.py

@@ -1,6 +1,7 @@
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
 
+from allianceauth.groupmanagement.models import Group, GroupRequest
 from allianceauth.tests.auth_utils import AuthUtils
 
 from .. import views
@@ -16,6 +17,7 @@ class TestViews(TestCase):
         self.factory = RequestFactory()
         self.user = AuthUtils.create_user('Peter Parker')
         self.user_with_manage_permission = AuthUtils.create_user('Bruce Wayne')
+        self.group = Group.objects.create(name="Example group")
 
         # set permissions
         AuthUtils.add_permission_to_user_by_name(
@@ -64,7 +66,7 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertIn('<div id="leave" class="tab-pane">', content)
 
     @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
@@ -81,5 +83,21 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertNotIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertNotIn('<div id="leave" class="tab-pane">', content)
+
+    @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
+    def test_should_not_hide_leave_requests_tab_when_there_are_open_requests(self):
+        # given
+        request = self.factory.get(reverse('groupmanagement:management'))
+        request.user = self.user_with_manage_permission
+        GroupRequest.objects.create(user=self.user, group=self.group, leave_request=True)
+
+        # when
+        response = views.group_management(request)
+
+        # then
+        content = response_content_to_str(response)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('<a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
+        self.assertIn('<div id="leave" class="tab-pane">', content)

allianceauth/groupmanagement/views.py

@@ -2,13 +2,12 @@ import logging
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.decorators import user_passes_test
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import Group
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db.models import Count
 from django.http import Http404
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import gettext_lazy as _
 
 from allianceauth.notifications import notify
@@ -16,7 +15,6 @@ from allianceauth.notifications import notify
 from .managers import GroupManager
 from .models import GroupRequest, RequestLog
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -45,10 +43,15 @@ def group_management(request):
     logger.debug("Providing user {} with {} acceptrequests and {} leaverequests.".format(
         request.user, len(acceptrequests), len(leaverequests)))
 
+    show_leave_tab = (
+        getattr(settings, 'GROUPMANAGEMENT_AUTO_LEAVE', False)
+        and not GroupRequest.objects.filter(leave_request=True).exists()
+    )
+
     render_items = {
         'acceptrequests': acceptrequests,
         'leaverequests': leaverequests,
-        'auto_leave': getattr(settings, 'GROUPMANAGEMENT_AUTO_LEAVE', False),
+        'show_leave_tab': show_leave_tab,
     }
 
     return render(request, 'groupmanagement/index.html', context=render_items)

allianceauth/hooks.py

@@ -134,5 +134,5 @@ class DashboardItemHook:
             logger.debug(f"Rendering {self.view_function} to dashboard")
             return self.view_function(request)
         except Exception as e:
-            logger.exception("Rendering {self.view_function} Failed!")
+            logger.exception(f"Rendering {self.view_function} failed!")
             return ""

allianceauth/hrapplications/admin.py

@@ -13,7 +13,7 @@ class ChoiceInline(admin.TabularInline):
 @admin.register(ApplicationQuestion)
 class QuestionAdmin(admin.ModelAdmin):
     fieldsets = [
-            (None,      {'fields': ['title', 'help_text', 'multi_select']}),
+            (None, {'fields': ['title', 'help_text', 'multi_select']}),
             ]
     inlines = [ChoiceInline]
 

allianceauth/hrapplications/auth_hooks.py

@@ -13,7 +13,7 @@ class ApplicationsMenu(MenuItemHook):
         MenuItemHook.__init__(
             self,
             _('Applications'),
-            'far fa-file fa-fw',
+            'fa-regular fa-file',
             'hrapplications:index',
             navactive=['hrapplications:'])
 

allianceauth/hrapplications/templates/hrapplications/corpchoice.html

@@ -1,22 +1,37 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Choose a Corp" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "HR Application Management" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Choose a Corp" %}</h1>
+    <div>
+        {% translate "Choose a Corp" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
         {% if choices %}
-            <div class="panel panel-primary">
-                <div class="panel-heading">{% translate "Available Corps" %}</div>
-                <table class="table table-responsive">
-                    {% for choice in choices %}
-                        <tr>
-                            <td class="text-center">
-                                <a href="{% url 'hrapplications:create_view' choice.0 %}" class="btn btn-primary" title="Apply">{{ choice.1 }}</a>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
+            <div class="card card-primary">
+                <div class="card-header">
+                    <div class="card-title mb-0">{% translate "Available Corps" %}</div>
+                </div>
+
+                <div class="card-body">
+                    <table class="table table-responsive">
+                        {% for choice in choices %}
+                            <tr>
+                                <td class="text-center">
+                                    <a href="{% url 'hrapplications:create_view' choice.0 %}" class="btn btn-primary" title="Apply">{{ choice.1 }}</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
             </div>
         {% else %}
             <div class="alert alert-danger">{% translate "No corps are accepting applications at this time." %}</div>

allianceauth/hrapplications/templates/hrapplications/create.html

@@ -1,35 +1,66 @@
 {% extends "allianceauth/base-bs5.html" %}
+{% load django_bootstrap5 %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Apply To" %} {{ corp.corporation_name }}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "HR Application Management" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
-<div class="col-lg-12">
-    <h1 class="page-header text-center">{% translate "Apply To" %} {{ corp.corporation_name }}</h1>
-    <div class="container-fluid">
-        <div class="col-md-4 col-md-offset-4">
-            <div class="row">
-                <form class="form-signin">
-                    {% csrf_token %}
-                    {% for question in questions %}
-                        <div class="form-group">
-                            <label class="control-label" for="id_{{ question.pk }}">{{ question.title }}</label>
-                            <div class=" ">
-                            {% if question.help_text %}
-                                <div class="text-center">{{ question.help_text }}</div>
-                            {% endif %}
-                            {% for choice in question.choices.all %}
-                                <input type={% if question.multi_select == False %}"radio"{% else %}"checkbox"{% endif %} name="{{ question.pk }}" id="id_{{ question.pk }}_choice_{{ forloop.counter }}" value="{{ choice.choice_text }}">
-                                <label for="id_{{ question.pk }}_choice_{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
-                            {% empty %}
-                                <textarea class="form-control" cols="30" id="id_{{ question.pk }}" name="{{ question.pk }}" rows="4"></textarea>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "Apply To" %} {{ corp.corporation_name }}
+        </h1>
+
+        <div class="card">
+            <div class="card-header">
+                <div class="card-title mb-0">
+                    {% translate "Application form" %}
+                </div>
+            </div>
+
+            <div class="card-body">
+                <div class="row justify-content-center">
+                    <div class="col-md-8">
+                        <form method="post">
+                            {% csrf_token %}
+
+                            {% for question in questions %}
+                                <div class="card mb-3 form-group border-0">
+                                    <div class="card-header">
+                                        <div class="card-title mb-0">{{ question.title }}</div>
+                                    </div>
+
+                                    <div class="card-body">
+                                        {% if question.help_text %}
+                                            <p class="text-muted">
+                                                {{ question.help_text }}
+                                            </p>
+                                        {% endif %}
+
+                                        {% for choice in question.choices.all %}
+                                            <input type="{% if question.multi_select == False %}radio{% else %}checkbox{% endif %}" name="{{ question.pk }}" id="id_{{ question.pk }}_choice_{{ forloop.counter }}" value="{{ choice.choice_text }}">
+                                            <label for="id_{{ question.pk }}_choice_{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
+                                        {% empty %}
+                                            <textarea class="form-control" cols="30" id="id_{{ question.pk }}" name="{{ question.pk }}" rows="10"></textarea>
+                                        {% endfor %}
+                                    </div>
+                                </div>
                             {% endfor %}
-                        </div>
+
+                            <div class="form-group clearfix">
+                                {% translate "Submit" as button_text %}
+                                {% bootstrap_button button_class="btn btn-primary" content=button_text name="submitApplicationForm" id="submitApplicationForm" %}
+                            </div>
+                        </form>
                     </div>
-                    {% endfor %}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit" formmethod="post">{% translate "Submit" %}</button>
-                </form>
+                </div>
             </div>
         </div>
     </div>
-</div>
 {% endblock %}

allianceauth/hrapplications/templates/hrapplications/management.html

@@ -1,193 +1,215 @@
-{% extends "allianceauth/base.html" %}
-{% load bootstrap %}
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% block page_title %}
+    {% translate "HR Application Management" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "HR Application Management" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Personal Applications" %}
-            <div class="text-end">
-                {% if create %}
-                    <a href="{% url 'hrapplications:create_view' %}">
-                        <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
-                    </a>
-                {% else %}
-                    <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
-                {% endif %}
-            </div>
-        </h1>
-        {% if personal_apps %}
-            <div class="panel panel-default">
-                <table class="table table-condensed">
-                    <tr>
-                        <th class="text-center">{% translate "Username" %}</th>
-                        <th class="text-center">{% translate "Corporation" %}
-                        <th class="text-center">{% translate "Status" %}</th>
-                        <th class="text-center">{% translate "Actions" %}</th>
-                    </tr>
-                    {% for personal_app in personal_apps %}
-                        <tr>
-                            <td class="text-center">{{ personal_app.user.username }}</td>
-                            <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
-                            <td class="text-center">
-                                {% if personal_app.approved == None %}
-                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
-                                {% elif  personal_app.approved == True %}
-                                    <div class="badge badge-success">{% translate "Approved" %}</div>
-                                {% else %}
-                                    <div class="badge badge-danger">{% translate "Rejected" %}</div>
-                                {% endif %}
-                            </td>
-                            <td class="text-center">
-                                <a href="{% url 'hrapplications:personal_view' personal_app.id %}" class="btn btn-primary">
-                                    <span class="glyphicon glyphicon-eye-open"></span>
-                                </a>
+    <div>
+        {% translate "Personal Applications" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
-                                {% if personal_app.approved == None %}
-                                    <a href="{% url 'hrapplications:personal_removal' personal_app.id %}" class="btn btn-danger">
-                                        <span class="glyphicon glyphicon-remove"></span>
-                                    </a>
-                                {% endif %}
-                            </td>
+        <div class="text-end mb-3">
+            {% if create %}
+                <a href="{% url 'hrapplications:create_view' %}">
+                    <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
+                </a>
+            {% else %}
+                <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
+            {% endif %}
+        </div>
+
+        {% if personal_apps %}
+            <div class="card card-default mb-3">
+                <div class="card-body">
+                    <table class="table table-condensed">
+                        <tr>
+                            <th class="text-center">{% translate "Username" %}</th>
+                            <th class="text-center">{% translate "Corporation" %}
+                            <th class="text-center">{% translate "Status" %}</th>
+                            <th class="text-center">{% translate "Actions" %}</th>
                         </tr>
-                    {% endfor %}
-                </table>
+
+                        {% for personal_app in personal_apps %}
+                            <tr>
+                                <td class="text-center">{{ personal_app.user.username }}</td>
+                                <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
+                                <td class="text-center">
+                                    {% if personal_app.approved == None %}
+                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                    {% elif personal_app.approved == True %}
+                                        <div class="badge bg-success">{% translate "Approved" %}</div>
+                                    {% else %}
+                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                    {% endif %}
+                                </td>
+                                <td class="text-center">
+                                    <a href="{% url 'hrapplications:personal_view' personal_app.id %}" class="btn btn-primary">
+                                        <i class="fa-solid fa-eye"></i>
+                                    </a>
+
+                                    {% if personal_app.approved == None %}
+                                        <a href="{% url 'hrapplications:personal_removal' personal_app.id %}" class="btn btn-danger">
+                                            <i class="fa-solid fa-trash-can"></i>
+                                        </a>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
             </div>
         {% endif %}
+
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center">{% translate "Application Management" %}
-                <div class="text-end">
-                    <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        {% translate "Search Applications" %}
-                    </button>
-                </div>
-            </h1>
-            <ul class="nav nav-tabs">
-                <li class="active"><a data-toggle="tab" href="#pending">{% translate "Pending" %}</a></li>
-                <li><a data-toggle="tab" href="#reviewed">{% translate "Reviewed" %}</a></li>
-            </ul>
-            <div class="tab-content">
-                <div id="pending" class="tab-pane fade in active panel panel-default">
-                    <div class="panel-body">
-                        {% if applications %}
-                            <table class="table">
-                                <tr>
-                                    <th class="text-center">{% translate "Date" %}</th>
-                                    <th class="text-center">{% translate "Username" %}</th>
-                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                    <th class="text-center">{% translate "Corporation" %}</th>
-                                    <th class="text-center">{% translate "Status" %}</th>
-                                    <th class="text-center">{% translate "Actions" %}</th>
-                                </tr>
-                                {% for app in applications %}
+            {% translate "Application Management" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}
+
+            <div class="text-end mb-3">
+                <!-- Button trigger modal -->
+                <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-hr-search">
+                    {% translate "Search Applications" %}
+                </button>
+            </div>
+
+            <div class="card card-default">
+                <div class="card-body clearfix">
+                    <ul class="nav nav-tabs" id="application-list" role="tablist">
+                        <li class="nav-item" role="presentation">
+                            <a
+                                class="nav-link active"
+                                id="pending"
+                                data-bs-toggle="tab"
+                                href="#tab-pending"
+                                role="tab"
+                                aria-controls="tab-pending"
+                                aria-selected="true"
+                            >
+                                {% translate "Pending" %}
+                            </a>
+                        </li>
+
+                        <li class="nav-item" role="presentation">
+                            <a
+                                class="nav-link"
+                                id="reviewed"
+                                data-bs-toggle="tab"
+                                href="#tab-reviewed"
+                                role="tab"
+                                aria-controls="tab-reviewed"
+                                aria-selected="false"
+                            >
+                                {% translate "Reviewed" %}
+                            </a>
+                        </li>
+                    </ul>
+
+                    <div class="tab-content" id="application-list-content">
+                        <div id="tab-pending" class="tab-pane fade show active" role="tabpanel" aria-labelledby="tab-pending">
+                            {% if applications %}
+                                <table class="table">
                                     <tr>
-                                        <td class="text-center">{{ app.created }}</td>
-                                        <td class="text-center">{{ app.user.username }}</td>
-                                        <td class="text-center">{{ app.main_character }}</td>
-                                        <td class="text-center">{{ app.form.corp.corporation_name }}</td>
-                                        <td class="text-center">
-                                            {% if app.approved == None %}
-                                                {% if app.reviewer_str %}
-                                                    <div class="badge badge-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
-                                                {% else %}
-                                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
-                                                {% endif %}
-                                            {% elif  app.approved == True %}
-                                                <div class="badge badge-success">{% translate "Approved" %}</div>
-                                            {% else %}
-                                                <div class="badge badge-danger">{% translate "Rejected" %}</div>
-                                            {% endif %}
-                                        </td>
-                                        <td class="text-center">
-                                            <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
-                                                <span class="glyphicon glyphicon-eye-open"></span>
-                                            </a>
-                                        </td>
+                                        <th class="text-center">{% translate "Date" %}</th>
+                                        <th class="text-center">{% translate "Username" %}</th>
+                                        <th class="text-center">{% translate "Main Character" %}</th>
+                                        <th class="text-center">{% translate "Corporation" %}</th>
+                                        <th class="text-center">{% translate "Status" %}</th>
+                                        <th class="text-center">{% translate "Actions" %}</th>
                                     </tr>
-                                {% endfor %}
-                            </table>
-                        {% else %}
-                            <div class="alert alert-warning text-center">{% translate "No pending applications." %}</div>
-                        {% endif %}
-                    </div>
-                </div>
-                <div id="reviewed" class="tab-pane fade panel panel-default">
-                    <div class="panel-body">
-                        {% if finished_applications %}
-                            <table class="table">
-                                <tr>
-                                    <th class="text-center">{% translate "Date" %}</th>
-                                    <th class="text-center">{% translate "Username" %}</th>
-                                    <th class="text-center">{% translate "Main Character" %}</th>
-                                    <th class="text-center">{% translate "Corporation" %}</th>
-                                    <th class="text-center">{% translate "Status" %}</th>
-                                    <th class="text-center">{% translate "Actions" %}</th>
-                                </tr>
-                                {% for app in finished_applications %}
-                                    <tr>
-                                        <td class="text-center">{{ app.created }}</td>
-                                        <td class="text-center">{{ app.user.username }}</td>
-                                        <td class="text-center">{{ app.main_character }}</td>
-                                        <td class="text-center">{{ app.form.corp.corporation_name }}</td>
-                                        <td class="text-center">
-                                            {% if app.approved == None %}
-                                                {% if app.reviewer_str %}
-                                                    <div class="badge badge-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+
+                                    {% for app in applications %}
+                                        <tr>
+                                            <td class="text-center">{{ app.created }}</td>
+                                            <td class="text-center">{{ app.user.username }}</td>
+                                            <td class="text-center">{{ app.main_character }}</td>
+                                            <td class="text-center">{{ app.form.corp.corporation_name }}</td>
+                                            <td class="text-center">
+                                                {% if app.approved == None %}
+                                                    {% if app.reviewer_str %}
+                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    {% else %}
+                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                    {% endif %}
+                                                {% elif app.approved == True %}
+                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                                 {% else %}
-                                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
+                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                                 {% endif %}
-                                            {% elif  app.approved == True %}
-                                                <div class="badge badge-success">{% translate "Approved" %}</div>
-                                            {% else %}
-                                                <div class="badge badge-danger">{% translate "Rejected" %}</div>
-                                            {% endif %}
-                                        </td>
-                                        <td class="text-center">
-                                            <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
-                                                <span class="glyphicon glyphicon-eye-open"></span>
-                                            </a>
-                                            {% if perms.hrapplications.delete_application %}
-                                                <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">
-                                                    <span class="glyphicon glyphicon-remove"></span>
+                                            </td>
+                                            <td class="text-center">
+                                                <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
+                                                    <i class="fa-solid fa-eye"></i>
                                                 </a>
-                                            {% endif %}
-                                        </td>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </table>
+                            {% else %}
+                                <div class="alert alert-warning text-center">{% translate "No pending applications." %}</div>
+                            {% endif %}
+                        </div>
+
+                        <div id="tab-reviewed" class="tab-pane fade" role="tabpanel" aria-labelledby="tab-reviewed">
+                            {% if finished_applications %}
+                                <table class="table">
+                                    <tr>
+                                        <th class="text-center">{% translate "Date" %}</th>
+                                        <th class="text-center">{% translate "Username" %}</th>
+                                        <th class="text-center">{% translate "Main Character" %}</th>
+                                        <th class="text-center">{% translate "Corporation" %}</th>
+                                        <th class="text-center">{% translate "Status" %}</th>
+                                        <th class="text-center">{% translate "Actions" %}</th>
                                     </tr>
-                                {% endfor %}
-                            </table>
-                        {% else %}
-                            <div class="alert alert-warning text-center">{% translate "No reviewed applications." %}</div>
-                        {% endif %}
+
+                                    {% for app in finished_applications %}
+                                        <tr>
+                                            <td class="text-center">{{ app.created }}</td>
+                                            <td class="text-center">{{ app.user.username }}</td>
+                                            <td class="text-center">{{ app.main_character }}</td>
+                                            <td class="text-center">{{ app.form.corp.corporation_name }}</td>
+                                            <td class="text-center">
+                                                {% if app.approved == None %}
+                                                    {% if app.reviewer_str %}
+                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    {% else %}
+                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                    {% endif %}
+                                                {% elif app.approved == True %}
+                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                {% else %}
+                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                {% endif %}
+                                            </td>
+                                            <td class="text-center">
+                                                <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
+                                                    <i class="fa-solid fa-eye"></i>
+                                                </a>
+
+                                                {% if perms.hrapplications.delete_application %}
+                                                    <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">
+                                                        <i class="fa-solid fa-trash-can"></i>
+                                                    </a>
+                                                {% endif %}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </table>
+                            {% else %}
+                                <div class="alert alert-warning text-center">{% translate "No reviewed applications." %}</div>
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
             </div>
         {% endif %}
     </div>
 
-    {% if perms.auth.human_resources %}
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
-                        <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-signin" role="form" action="{% url 'hrapplications:search' %}" method="POST">
-                            {% csrf_token %}
-                            {{ search_form|bootstrap }}
-                            <br>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
+    {% include "hrapplications/partials/modals/search.html" %}
 {% endblock content %}

allianceauth/hrapplications/templates/hrapplications/partials/modals/search.html

@@ -0,0 +1,32 @@
+{% load django_bootstrap5 %}
+{% load i18n %}
+
+{% if perms.auth.human_resources %}
+    <!-- Modal -->
+    <div class="modal fade" id="modal-hr-search" tabindex="-1" aria-labelledby="modalHrSearch" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <div class="modal-title fs-5" id="modalHrSearchLabel">
+                        {% translate "Application Search" %}
+                    </div>
+
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% translate 'Close' %}"></button>
+                </div>
+
+                <div class="modal-body">
+                    <form class="form-signin" role="form" action="{% url 'hrapplications:search' %}" method="POST">
+                        {% csrf_token %}
+
+                        {% bootstrap_form search_form %}
+
+                        <div class="form-group mt-3 clearfix">
+                            {% translate "Search" as button_text %}
+                            {% bootstrap_button button_class="btn btn-primary" content=button_text name="search" id="search" %}
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endif %}

allianceauth/hrapplications/templates/hrapplications/searchview.html

@@ -1,49 +1,58 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% block page_title %}
+    {% translate "HR Application Management" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "HR Application Management" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div>
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center">{% translate "Application Search Results" %}
-                <div class="text-end">
-                    <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        {% translate "Search Applications" %}
-                    </button>
-                </div>
-            </h1>
-            <div class="container-fluid">
-                <table class="table table-bordered">
+            {% translate "Application Search Results" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}
+
+            <div class="text-end mb-3">
+                <!-- Button trigger modal -->
+                <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-hr-search">
+                    {% translate "Search Applications" %}
+                </button>
+            </div>
+
+            <div>
+                <table class="table">
                     <tr>
-                        <th class="text-center">{% translate "Application ID" %}</th>
-                        <th class="text-center">{% translate "Username" %}</th>
-                        <th class="text-center">{% translate "Main Character" %}</th>
-                        <th class="text-center">{% translate "Corporation" %}</th>
+                        <th>{% translate "Application ID" %}</th>
+                        <th>{% translate "Username" %}</th>
+                        <th>{% translate "Main Character" %}</th>
+                        <th>{% translate "Corporation" %}</th>
                         <th class="text-center">{% translate "Status" %}</th>
-                        <th class="text-center">{% translate "Actions" %}</th>
+                        <th class="text-end">{% translate "Actions" %}</th>
                     </tr>
+
                     {% for app in applications %}
                         <tr>
-                            <td class="text-center">{{ app.id }}</td>
-                            <td class="text-center">{{ app.user }}</td>
-                            <td class="text-center">{{ app.main_character }}</td>
-                            <td class="text-center">{{ app.form.corp }}</td>
+                            <td>{{ app.id }}</td>
+                            <td>{{ app.user }}</td>
+                            <td >{{ app.main_character }}</td>
+                            <td>{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="badge badge-warning">{% translate "Pending" %}</div>
-                                {% elif  app.approved == True %}
-                                    <div class="badge badge-success">{% translate "Approved" %}</div>
+                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                {% elif app.approved == True %}
+                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="badge badge-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
-                            <td class="text-center">
+                            <td class="text-end">
                                 <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
-                                    <span class="glyphicon glyphicon-eye-open"></span>
+                                    <i class="fa-solid fa-eye"></i>
                                 </a>
                             </td>
                         </tr>
@@ -53,27 +62,5 @@
         {% endif %}
     </div>
 
-    {% if perms.auth.human_resources %}
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
-                        <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-signin" role="form" action="{% url 'hrapplications:search' %}" method="POST">
-                            {% csrf_token %}
-                            {{ search_form|bootstrap }}
-                            <br>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
+    {% include "hrapplications/partials/modals/search.html" %}
 {% endblock content %}

allianceauth/hrapplications/templates/hrapplications/view.html

@@ -1,149 +1,179 @@
-{% extends "allianceauth/base.html" %}
-{% load bootstrap %}
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block page_title %}{% translate "View Application" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% block page_title %}
+    {% translate "View Application" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "HR Application Management" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "View Application" %}</h1>
-        <div class="container-fluid">
-            <div class="col-md-6 col-md-offset-3">
-                <div class="row">
-                    {% if app.approved %}
-                        <div class="alert alert-success text-center">{% translate "Approved" %}</div>
-                    {% elif app.approved == False %}
-                        <div class="alert alert-danger text-center">{% translate "Denied" %}</div>
-                    {% else %}
-                        <div class="alert alert-warning text-center">{% translate "Pending" %}</div>
-                    {% endif %}
-                    {% if app.reviewer_str %}
-                        <div class="alert alert-info text-center">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
-                    {% endif %}
-                </div>
-                <div class="row">
-                    <div class="panel panel-info">
-                        <div class="panel-heading">{% translate "Applicant" %}</div>
-                        <table class="table">
-                            <tr>
-                                <th class="text-center">{% translate "User" %}</th>
-                                <th class="text-center">{% translate "Main Character" %}</th>
-                            </tr>
-                            <tr>
-                                <td class="text-center">{{ app.user }}</td>
-                                <td class="text-center">{{ app.main_character }}</td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="panel panel-info">
-                        <div class="panel-heading">{% translate "Characters" %}</div>
-                        <table class="table">
-                            <tr>
-                                <th class="text-center"></th>
-                                <th class="text-center">{% translate "Name" %}</th>
-                                <th class="text-center">{% translate "Corp" %}</th>
-                                <th class="text-center">{% translate "Alliance" %}</th>
-                            </tr>
-                            {% for char in app.characters %}
-                                <tr>
-                                    <td class="text-center">
-                                        <img class="ra-avatar img-responsive img-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
-                                    </td>
-                                    <td class="text-center">{{ char.character_name }}</td>
-                                    <td class="text-center">{{ char.corporation_name }}</td>
-                                    <td class="text-center">{{ char.alliance_name }}</td>
-                                </tr>
-                            {% endfor %}
-                        </table>
-                    </div>
-                </div>
-                <div class="row">
-                    {% for response in responses %}
-                        <div class="panel panel-default">
-                            <div class="panel-heading">{{ response.question.title }}</div>
-                            <div class="alert">{{ response.answer|linebreaksbr }}</div>
-                        </div>
-                    {% endfor %}
-                </div>
-                {% if buttons %}
-                    {% if perms.auth.human_resources %}
-                        <div class="row">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">{% translate "Actions" %}</div>
-                                <div class="panel-body text-center">
-                                    {% if app.approved == None %}
-                                        {% if app.reviewer == user %}
-                                            {% if perms.hrapplications.approve_application %}
-                                                <a href="{% url 'hrapplications:approve' app.id %}" class="btn btn-success">{% translate "Approve" %}</a>
-                                            {% endif %}
-                                            {% if perms.hrapplications.reject_application %}
-                                                <a href="{% url 'hrapplications:reject' app.id %}" class="btn btn-danger">{% translate "Reject" %}</a>
-                                            {% endif %}
-                                            {% if perms.hrapplications.delete_application %}
-                                                <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">{% translate "Delete" %}</a>
-                                            {% endif %}
-                                        {% elif not app.reviewer %}
-                                            <a href="{% url 'hrapplications:mark_in_progress' app.id %}" class="btn btn-warning">{% translate "Mark in Progress" %}</a>
-                                        {% endif %}
-                                    {% endif %}
-                                    {% if perms.hrapplications.add_applicationcomment %}
-                                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">{% translate "Comment" %}</button>
-                                    {% endif %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-                            <div class="panel panel-default">
-                                <div class="panel-heading" role="tab" id="headingThree">
-                                    <h4 class="panel-title">
-                                        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-                                            {% translate 'Comments' %} ({{ comments.count }})
-                                        </a>
-                                    </h4>
-                                </div>
-                                <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-                                    <div class="panel-body">
-                                        {% for comment in comments %}
-                                            <div class="panel panel-default">
-                                                <div class="panel-heading" role="tab" id="">
-                                                    <div class="panel-title">
-                                                        <div class="pull-right">{{ comment.created }}</div>
-                                                        <div class="pull-left">{% if comment.user.profile.main_character %}{{ comment.user.profile.main_character }}{% else %}{{ comment.user }}{% endif %}</div>
-                                                        <div class="clearfix"></div>
-                                                    </div>
-                                                </div>
-                                                <div class="panel-body">{{ comment.text|linebreaks }}</div>
-                                            </div>
-                                        {% endfor %}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    {% endif %}
-                {% endif %}
+    <div>
+        {% translate "View Application" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div>
+            {% if app.approved %}
+                <div class="alert alert-success text-center">{% translate "Approved" %}</div>
+            {% elif app.approved == False %}
+                <div class="alert alert-danger text-center">{% translate "Denied" %}</div>
+            {% else %}
+                <div class="alert alert-warning text-center">{% translate "Pending" %}</div>
+            {% endif %}
+
+            {% if app.reviewer_str %}
+                <div class="alert alert-info text-center">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+            {% endif %}
+        </div>
+
+        <div class="card mb-3">
+            <div class="card-header bg-info">
+                <div class="card-title mb-0">{% translate "Applicant" %}</div>
+            </div>
+
+            <div class="card-body">
+                <table class="table">
+                    <tr>
+                        <th class="text-center">{% translate "User" %}</th>
+                        <th class="text-center">{% translate "Main Character" %}</th>
+                    </tr>
+                    <tr>
+                        <td class="text-center">{{ app.user }}</td>
+                        <td class="text-center">{{ app.main_character }}</td>
+                    </tr>
+                </table>
             </div>
         </div>
+
+        <div class="card mb-3">
+            <div class="card-header bg-info">
+                <div class="card-title mb-0">{% translate "Characters" %}</div>
+            </div>
+
+            <div class="card-body">
+                <table class="table">
+                    <tr>
+                        <th></th>
+                        <th>{% translate "Name" %}</th>
+                        <th>{% translate "Corporation" %}</th>
+                        <th>{% translate "Alliance" %}</th>
+                    </tr>
+
+                    {% for char in app.characters %}
+                        <tr>
+                            <td>
+                                <img class="ra-avatar img-responsive rounded-circle" src="{{ char.portrait_url_32 }}" alt="{{ char.character_name }}">
+                            </td>
+                            <td>{{ char.character_name }}</td>
+                            <td>{{ char.corporation_name }}</td>
+                            <td>{{ char.alliance_name }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+
+        {% for response in responses %}
+            <div class="card mb-3">
+                <div class="card-header">
+                    <div class="card-title mb-0">{{ response.question.title }}</div>
+                </div>
+
+                <div class="card-body">{{ response.answer|linebreaksbr }}</div>
+            </div>
+        {% endfor %}
+
+        {% if buttons %}
+            {% if perms.auth.human_resources %}
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <div class="card-title mb-0">{% translate "Actions" %}</div>
+                    </div>
+
+                    <div class="card-body text-center">
+                        {% if app.approved == None %}
+                            {% if app.reviewer == user %}
+                                {% if perms.hrapplications.approve_application %}
+                                    <a href="{% url 'hrapplications:approve' app.id %}" class="btn btn-success">{% translate "Approve" %}</a>
+                                {% endif %}
+                                {% if perms.hrapplications.reject_application %}
+                                    <a href="{% url 'hrapplications:reject' app.id %}" class="btn btn-warning">{% translate "Reject" %}</a>
+                                {% endif %}
+                                {% if perms.hrapplications.delete_application %}
+                                    <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">{% translate "Delete" %}</a>
+                                {% endif %}
+                            {% elif not app.reviewer %}
+                                <a href="{% url 'hrapplications:mark_in_progress' app.id %}" class="btn btn-warning">{% translate "Mark in Progress" %}</a>
+                            {% endif %}
+                        {% endif %}
+
+                        {% if perms.hrapplications.add_applicationcomment %}
+                            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modal-hr-comment">{% translate "Comment" %}</button>
+                        {% endif %}
+                    </div>
+                </div>
+
+                <div class="card-group" id="accordion" role="tablist" aria-multiselectable="true">
+                    <div class="card card-default">
+                        <div class="card-header">
+                            <div class="card-title mb-0">
+                                {% translate 'Comments' %} ({{ comments.count }})
+                            </div>
+                        </div>
+
+                        <div class="card-body">
+                            {% if comments %}
+                                {% for comment in comments %}
+                                    <div class="card card-default">
+                                        <div class="card-header" role="tab" id="">
+                                            <div class="card-title mb-0 clearfix">
+                                                <div class="float-md-end">{{ comment.created }}</div>
+                                                <div class="float-md-start">{% if comment.user.profile.main_character %}{{ comment.user.profile.main_character }}{% else %}{{ comment.user }}{% endif %}</div>
+                                            </div>
+                                        </div>
+                                        <div class="card-body">{{ comment.text|linebreaks }}</div>
+                                    </div>
+                                {% endfor %}
+                            {% else %}
+                                <div class="alert alert-info">
+                                    {% translate "No comments" %}
+                                </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+        {% endif %}
     </div>
+
     {% if perms.hrapplications.add_applicationcomment %}
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal fade" id="modal-hr-comment" tabindex="-1" aria-labelledby="modalHrComment" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
-                            <span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span>
-                        </button>
-                        <h4 class="modal-title" id="myModalLabel">{% translate "Add Comment" %}</h4>
+                        <div class="modal-title fs-5" id="modalHrCommentLabel">
+                            {% translate "Add Comment" %}
+                        </div>
+
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% translate 'Close' %}"></button>
                     </div>
+
                     <div class="modal-body">
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
-                            {{ comment_form|bootstrap }}
-                            <br>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Add Comment" %}</button>
+
+                            {% bootstrap_form comment_form %}
+
+                            <div class="form-group mt-3 clearfix">
+                                {% translate "Add comment" as button_text %}
+                                {% bootstrap_button button_class="btn btn-primary" content=button_text name="addComment" id="addComment" %}
+                            </div>
                         </form>
                     </div>
-                    <div class="modal-footer"></div>
                 </div>
             </div>
         </div>

allianceauth/locale/de/LC_MESSAGES/django.po

@@ -4,9 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Erik Kalkoken <erik.kalkoken@gmail.com>, 2020
-# Joel Falknau <ozirascal@gmail.com>, 2021
-# Peter Pfeufer, 2022
+# Erik Kalkoken <erik.kalkoken@gmail.com>, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2023
+# Peter Pfeufer, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Peter Pfeufer, 2022\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: Peter Pfeufer, 2023\n"
 "Language-Team: German (https://app.transifex.com/alliance-auth/teams/107430/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,8 @@ msgstr "Google Analytics V4"
 #: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
-"Für diese Aktion wird ein Hauptcharacter benötigt. Bitte füge einen hinzu."
+"Zur Ausführung dieser Aktion ist ein Hauptcharakter erforderlich. Füge unten"
+" einen hinzu."
 
 #: allianceauth/authentication/forms.py:12
 msgid "Email"
@@ -131,7 +132,7 @@ msgstr "Hauptcharakter ändern"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:125
 msgid "Group Memberships"
-msgstr "Gruppen"
+msgstr "Gruppenmitgliedschaften"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:145
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:21
@@ -206,7 +207,7 @@ msgstr ""
 #: allianceauth/authentication/views.py:83
 #, python-format
 msgid "Changed main character to %(char)s"
-msgstr "Haupcharakter geändert zu %(char)s"
+msgstr "Haupcharakter zu %(char)s geändert"
 
 #: allianceauth/authentication/views.py:92
 #, python-format
@@ -233,13 +234,12 @@ msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
-"Bestätigungsmail gesendet. Bitte folge dem Link in der E-Mail zur "
-"Bestätigung."
+"Bestätigungs-E-Mail gesendet. Bitte folge dem Link, um Deine E-Mail-Adresse "
+"zu bestätigen."
 
 #: allianceauth/authentication/views.py:257
 msgid "Confirmed your email address. Please login to continue."
-msgstr ""
-"Deine E-Mail Adresse wurde bestätigt. Bitte log Dich ein um fortzufahren."
+msgstr "Deine E-Mail Adresse wurde bestätigt. Bitte einloggen zum Fortfahren."
 
 #: allianceauth/authentication/views.py:262
 msgid "Registration of new accounts is not allowed at this time."
@@ -274,7 +274,7 @@ msgstr "Hauptcharaktere"
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:22
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:14
 msgid "Members"
-msgstr "Mitgliederzahl"
+msgstr "Mitglieder"
 
 #: allianceauth/corputils/templates/corputils/corpstats.html:35
 msgid "Unregistered"
@@ -282,7 +282,7 @@ msgstr "Nicht registriert"
 
 #: allianceauth/corputils/templates/corputils/corpstats.html:38
 msgid "Last update:"
-msgstr "Letzes Update:"
+msgstr "Letzte Aktualisierung:"
 
 #: allianceauth/corputils/templates/corputils/corpstats.html:74
 #: allianceauth/corputils/templates/corputils/corpstats.html:112
@@ -382,11 +382,11 @@ msgstr "Charakter nicht registriert!"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html:19
 msgid "This character is not associated with an auth account."
-msgstr "Dieser Charakter ist mit keinen Auth Konto verbunden."
+msgstr "Dieser Charakter ist keinem Auth Konto zugeordnet."
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html:19
 msgid "Add it here"
-msgstr "Füge es hier hinzu"
+msgstr "Füge ihn hier hinzu"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html:19
 msgid "before attempting to click fleet attendance links."
@@ -394,7 +394,7 @@ msgstr "bevor Du versuchst auf FAT-Links zu klicken."
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html:5
 msgid "Create Fatlink"
-msgstr "Erstelle FAT-Link"
+msgstr "FAT-Link erstellen"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html:9
 #: allianceauth/optimer/templates/optimer/add.html:13
@@ -409,20 +409,20 @@ msgstr "Fehlerhafte Anfrage!"
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html:24
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:63
 msgid "Create fatlink"
-msgstr "Erstelle FAT-Link"
+msgstr "FAT-Link erstellen"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:3
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:4
 msgid "Fatlink view"
-msgstr "FAT-Link sehen"
+msgstr "FAT-Link ansehen"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:7
 msgid "Edit fatlink"
-msgstr "Editiere FAT-Link"
+msgstr "FAT-Link bearbeiten"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:11
 msgid "Delete fat"
-msgstr "Lösche FAT"
+msgstr "FAT löschen"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:17
 msgid "Registered characters"
@@ -497,7 +497,7 @@ msgstr[1] "%(user)s hat diesen Monat %(links)s FAT-Links eingesammelt."
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html:26
 msgid "Times used"
-msgstr "male genutzt"
+msgstr "Wie oft genutzt"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html:37
 #, python-format
@@ -570,7 +570,7 @@ msgstr "FAT-Link Statistik"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:20
 msgid "Ticker"
-msgstr "Ticker: "
+msgstr "Ticker"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:8
 msgid "Participation data"
@@ -594,7 +594,7 @@ msgstr "Letzter FAT-Link"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:58
 msgid "View statistics"
-msgstr "Statistik"
+msgstr "Statistiken ansehen"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:95
 msgid "No created fatlinks on record."
@@ -713,8 +713,8 @@ msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr ""
-"Hier gelistete Ränge können dieser Gruppe beitreten, vorausgesetzt sie haben"
-" die entsprechenden Berechtigungen.<br>"
+"Die hier aufgeführten Status können dieser Gruppe beitreten, sofern sie über"
+" die entsprechenden Berechtigungen verfügen.<br>"
 
 #: allianceauth/groupmanagement/models.py:171
 msgid ""
@@ -814,7 +814,7 @@ msgstr "Gruppenmitglieder"
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:113
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:21
 msgid "Organization"
-msgstr "Organization"
+msgstr "Organisation"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:49
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:75
@@ -933,18 +933,18 @@ msgstr "Gruppenverwaltung"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:24
 msgid "Join Requests"
-msgstr "Beitrittsgesuche"
+msgstr "Beitrittsanfragen"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:35
 msgid "Leave Requests"
-msgstr "Austrittsgesuche"
+msgstr "Austrittsanfragen"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:57
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:114
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:18
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
-msgstr "Gruppen"
+msgstr "Gruppe"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:88
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:145
@@ -968,7 +968,7 @@ msgstr "Keine Gruppenaustrittsanfragen"
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:8
 #: allianceauth/templates/allianceauth/top-menu.html:8
 msgid "Toggle navigation"
-msgstr "Toggle Navigation"
+msgstr "Navigation umschalten"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:19
 msgid "Group Requests"
@@ -994,7 +994,7 @@ msgstr "Gruppe existiert nicht"
 #: allianceauth/groupmanagement/views.py:195
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
-msgstr "Beitrittsgesuch von %(mainchar)s zur Gruppe %(group)s zugestimmt."
+msgstr "Beitrittsanfrage von %(mainchar)s zur Gruppe %(group)s akzeptiert."
 
 #: allianceauth/groupmanagement/views.py:201
 #: allianceauth/groupmanagement/views.py:232
@@ -1003,18 +1003,18 @@ msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr ""
-"Bei der Bearbeitung des Beitrittsgesuchs von %(mainchar)s zur Gruppe "
+"Bei der Bearbeitung des Beitrittsanfrage von %(mainchar)s zur Gruppe "
 "%(group)s ist ein unbehandelter Fehler aufgetreten."
 
 #: allianceauth/groupmanagement/views.py:226
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
-msgstr "Beitrittsgesuch von %(mainchar)s zur Gruppe %(group)s abgelehnt."
+msgstr "Beitrittsanfrage von %(mainchar)s zur Gruppe %(group)s abgelehnt."
 
 #: allianceauth/groupmanagement/views.py:261
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
-msgstr "Austrittsgesuch von %(mainchar)s für Gruppe %(group)s akzeptiert."
+msgstr "Austrittsanfrage von %(mainchar)s für Gruppe %(group)s akzeptiert."
 
 #: allianceauth/groupmanagement/views.py:266
 #: allianceauth/groupmanagement/views.py:298
@@ -1023,13 +1023,13 @@ msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr ""
-"Bei der Bearbeitung des Austrittsgesuchs von %(mainchar)s für Gruppe "
+"Bei der Bearbeitung des Austrittsanfrage von %(mainchar)s für Gruppe "
 "%(group)s ist ein unbehandelter Fehler aufgetreten."
 
 #: allianceauth/groupmanagement/views.py:292
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
-msgstr "Austrittsgesuch von %(mainchar)s für Gruppe %(group)s abgelehnt."
+msgstr "Austrittsanfrage von %(mainchar)s für Gruppe %(group)s abgelehnt."
 
 #: allianceauth/groupmanagement/views.py:336
 #: allianceauth/groupmanagement/views.py:346
@@ -1042,7 +1042,7 @@ msgstr "Du bist bereits Mitglied dieser Gruppe."
 
 #: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
-msgstr "Du hast Dich bereits für diese Gruppe beworben."
+msgstr "Du hast bereits für diese Gruppe angefragt."
 
 #: allianceauth/groupmanagement/views.py:367
 #, python-format
@@ -1059,12 +1059,12 @@ msgstr "Du bist kein Mitglied dieser Gruppe"
 
 #: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
-msgstr "Du hast bereits ein ausstehendes Austrittsgesuch für diese Gruppe."
+msgstr "Du hast bereits eine ausstehendes Austrittsanfrage für diese Gruppe."
 
 #: allianceauth/groupmanagement/views.py:409
 #, python-format
 msgid "Applied to leave group %(group)s."
-msgstr "Austrittsgesuch für Gruppe %(group)s gesendet."
+msgstr "Austrittsanfrage für Gruppe %(group)s gesendet."
 
 #: allianceauth/hrapplications/auth_hooks.py:14
 msgid "Applications"
@@ -1086,11 +1086,11 @@ msgstr "Wähle eine Corporation"
 
 #: allianceauth/hrapplications/templates/hrapplications/corpchoice.html:10
 msgid "Available Corps"
-msgstr "Zur Auswahl stehende Corporations"
+msgstr "Verfügbare Corporationen"
 
 #: allianceauth/hrapplications/templates/hrapplications/corpchoice.html:22
 msgid "No corps are accepting applications at this time."
-msgstr "Zur Zeit nimmt keine Corp Bewerbungen entgegen."
+msgstr "Zur Zeit nimmt keine Corp Bewerbungen an."
 
 #: allianceauth/hrapplications/templates/hrapplications/create.html:4
 #: allianceauth/hrapplications/templates/hrapplications/create.html:7
@@ -1186,7 +1186,7 @@ msgstr "Keine angesehenen Bewerbungen"
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:62
 #: allianceauth/hrapplications/templates/hrapplications/view.html:134
 msgid "Close"
-msgstr "Geschlossen"
+msgstr "Schließen"
 
 #: allianceauth/hrapplications/templates/hrapplications/management.html:177
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:63
@@ -1200,7 +1200,7 @@ msgstr "Suche"
 
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:11
 msgid "Application Search Results"
-msgstr "Bewerbungen Suchergebnisse"
+msgstr "Ergebnisse der Bewerbungssuche"
 
 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:22
 msgid "Application ID"
@@ -1342,12 +1342,12 @@ msgstr "Operationsart"
 #: allianceauth/optimer/form.py:17
 #: allianceauth/srp/templates/srp/management.html:38
 msgid "Fleet Commander"
-msgstr "Flottenkommandeur"
+msgstr "Flottenkommandant"
 
 #: allianceauth/optimer/form.py:22 allianceauth/srp/form.py:14
 #: allianceauth/srp/templates/srp/data.html:91
 msgid "Additional Info"
-msgstr "Zusätzliche Info"
+msgstr "Zusätzliche Informationen"
 
 #: allianceauth/optimer/form.py:23
 msgid "(Optional) Describe the operation with a couple of short words."
@@ -1360,7 +1360,7 @@ msgstr "Operation erstellen"
 
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:12
 msgid "Form Up System"
-msgstr "Form Up System"
+msgstr "Startsystem"
 
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:14
 #: allianceauth/timerboard/templates/timerboard/view.html:36
@@ -1384,20 +1384,20 @@ msgstr "Flottenoperationen Zeiten"
 #: allianceauth/optimer/templates/optimer/management.html:20
 #: allianceauth/timerboard/templates/timerboard/view.html:22
 msgid "Current Eve Time:"
-msgstr "Momentane Eve Zeit"
+msgstr "Aktuelle Eve Zeit"
 
 #: allianceauth/optimer/templates/optimer/management.html:26
 msgid "Next Fleet Operations"
-msgstr "Anstehende Flottenoperationen"
+msgstr "Anstehende Flotten"
 
 #: allianceauth/optimer/templates/optimer/management.html:30
 #: allianceauth/timerboard/templates/timerboard/view.html:362
 msgid "No upcoming timers."
-msgstr "Keine kommenden Timer."
+msgstr "Keine bevorstehenden Timer."
 
 #: allianceauth/optimer/templates/optimer/management.html:33
 msgid "Past Fleet Operations"
-msgstr "Vergangene Flottenoperationen"
+msgstr "Vergangene Flotten"
 
 #: allianceauth/optimer/templates/optimer/management.html:37
 #: allianceauth/timerboard/templates/timerboard/view.html:535
@@ -1408,7 +1408,7 @@ msgstr "Keine vergangenen Timer."
 #: allianceauth/optimer/templates/optimer/update.html:15
 #: allianceauth/optimer/templates/optimer/update.html:27
 msgid "Update Fleet Operation"
-msgstr "Aktualisiere Flottenoperationen"
+msgstr "Aktualisiere Flottenoperation"
 
 #: allianceauth/optimer/templates/optimer/update.html:21
 msgid "Fleet Operation Does Not Exist"
@@ -1432,7 +1432,7 @@ msgstr "Änderungen für Operation timer %(opname)s gespeichert."
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:4
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:8
 msgid "Permissions Audit"
-msgstr "Berechtigungsübersicht"
+msgstr "Berechtigungsprüfung"
 
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20
 msgid "User / Character"
@@ -1494,11 +1494,11 @@ msgstr "Dienste"
 
 #: allianceauth/services/forms.py:6
 msgid "Name of Fleet:"
-msgstr "SRP Flotte erstellen:"
+msgstr "Name der Flotte:"
 
 #: allianceauth/services/forms.py:7
 msgid "Fleet Commander:"
-msgstr "Flottenkommandeur:"
+msgstr "Flottenkommandant:"
 
 #: allianceauth/services/forms.py:8
 msgid "Fleet Comms:"
@@ -1514,11 +1514,11 @@ msgstr "Schiffspriorität:"
 
 #: allianceauth/services/forms.py:11
 msgid "Formup Location:"
-msgstr "Formup Location:"
+msgstr "Startsystem:"
 
 #: allianceauth/services/forms.py:12
 msgid "Formup Time:"
-msgstr "Formup Zeit:"
+msgstr "Startzeit:"
 
 #: allianceauth/services/forms.py:13
 msgid "Expected Duration:"
@@ -1530,7 +1530,7 @@ msgstr "Grund:"
 
 #: allianceauth/services/forms.py:15
 msgid "Reimbursable?*"
-msgstr "Erstattungsfähig?"
+msgstr "Erstattungsfähig?*"
 
 #: allianceauth/services/forms.py:15 allianceauth/services/forms.py:16
 msgid "Yes"
@@ -1542,7 +1542,7 @@ msgstr "Nein"
 
 #: allianceauth/services/forms.py:16
 msgid "Important?*"
-msgstr "Wichtig?"
+msgstr "Wichtig?*"
 
 #: allianceauth/services/forms.py:21 allianceauth/services/forms.py:31
 msgid "Password"
@@ -1550,7 +1550,7 @@ msgstr "Passwort"
 
 #: allianceauth/services/forms.py:26 allianceauth/services/forms.py:36
 msgid "Password must be at least 8 characters long."
-msgstr "Passwort muss mindestens 8 Zeichen lang sein"
+msgstr "Das Passwort muss mindestens 8 Zeichen lang sein"
 
 #: allianceauth/services/modules/discord/models.py:187
 msgid "Discord Account Disabled"
@@ -1591,7 +1591,7 @@ msgstr "Discord Konto deaktiviert."
 #: allianceauth/services/modules/discord/views.py:36
 #: allianceauth/services/modules/discord/views.py:59
 msgid "An error occurred while processing your Discord account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines Discord Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines Discord Kontos."
 
 #: allianceauth/services/modules/discord/views.py:102
 msgid "Your Discord account has been successfully activated."
@@ -1607,7 +1607,7 @@ msgstr ""
 
 #: allianceauth/services/modules/discourse/views.py:29
 msgid "You are not authorized to access Discourse."
-msgstr "Du bist nicht autorisiert auf Discorse zuzugreifen."
+msgstr "Du bist nicht autorisiert auf Discourse zuzugreifen."
 
 #: allianceauth/services/modules/discourse/views.py:34
 msgid "You must have a main character set to access Discourse."
@@ -1619,14 +1619,14 @@ msgid ""
 "No SSO payload or signature. Please contact support if this problem "
 "persists."
 msgstr ""
-"Keine SSO-Nutzdaten oder Signaturen. Bitte wenden Sie sich an den Support, "
-"wenn das Problem weiterhin besteht."
+"Keine SSO-Nutzdaten oder Signaturen. Bitte wende Dich an den Support, wenn "
+"das Problem weiterhin besteht."
 
 #: allianceauth/services/modules/discourse/views.py:54
 #: allianceauth/services/modules/discourse/views.py:62
 msgid "Invalid payload. Please contact support if this problem persists."
 msgstr ""
-"Ungültige Nutzdaten. Bitte wenden Sie sich an den Support, wenn das Problem "
+"Ungültige Nutzdaten. Bitte wenden Dich an den Support, wenn das Problem "
 "weiterhin besteht."
 
 #: allianceauth/services/modules/ips4/views.py:31
@@ -1638,7 +1638,7 @@ msgstr "IP4Suite Konto aktiviert."
 #: allianceauth/services/modules/ips4/views.py:81
 #: allianceauth/services/modules/ips4/views.py:101
 msgid "An error occurred while processing your IPSuite4 account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines IPSuite4 Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines IPSuite4 Kontos."
 
 #: allianceauth/services/modules/ips4/views.py:52
 msgid "Reset IPSuite4 password."
@@ -1660,7 +1660,7 @@ msgstr "Jabber"
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:5
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:10
 msgid "Jabber Broadcast"
-msgstr "Jabber Übertragung"
+msgstr "Jabber Ankündigung"
 
 #: allianceauth/services/modules/openfire/auth_hooks.py:94
 msgid "Fleet Broadcast Formatter"
@@ -1672,11 +1672,11 @@ msgstr "Nachricht"
 
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:16
 msgid "Broadcast Sent!!"
-msgstr "Übertragung gesendet!!"
+msgstr "Ankündigung gesendet!!"
 
 #: allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html:22
 msgid "Broadcast"
-msgstr "Übertragungen"
+msgstr "Ankündigung"
 
 #: allianceauth/services/modules/openfire/views.py:35
 msgid "Activated jabber account."
@@ -1687,7 +1687,7 @@ msgstr "Jabber Konto aktiviert."
 #: allianceauth/services/modules/openfire/views.py:76
 #: allianceauth/services/modules/openfire/views.py:147
 msgid "An error occurred while processing your jabber account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines Jabber Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines Jabber Kontos."
 
 #: allianceauth/services/modules/openfire/views.py:69
 msgid "Reset jabber password."
@@ -1696,7 +1696,7 @@ msgstr "Jabber Passwort zurücksetzen."
 #: allianceauth/services/modules/openfire/views.py:115
 #, python-format
 msgid "Sent jabber broadcast to %s"
-msgstr "Sende Jabber Durchsage an %s"
+msgstr "Sende Jabber Ankündigung an %s"
 
 #: allianceauth/services/modules/openfire/views.py:144
 msgid "Set jabber password."
@@ -1711,7 +1711,7 @@ msgstr "Forum Konto aktiviert."
 #: allianceauth/services/modules/phpbb3/views.py:78
 #: allianceauth/services/modules/phpbb3/views.py:101
 msgid "An error occurred while processing your forum account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines Forum Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines Forum Kontos."
 
 #: allianceauth/services/modules/phpbb3/views.py:53
 msgid "Deactivated forum account."
@@ -1734,7 +1734,7 @@ msgstr "SMF Konto aktiviert."
 #: allianceauth/services/modules/smf/views.py:102
 #: allianceauth/services/modules/smf/views.py:124
 msgid "An error occurred while processing your SMF account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines SMF Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines SMF Kontos."
 
 #: allianceauth/services/modules/smf/views.py:78
 msgid "Deactivated SMF account."
@@ -1751,7 +1751,7 @@ msgstr "Setze SMF Passwort."
 #: allianceauth/services/modules/teamspeak3/forms.py:14
 #, python-format
 msgid "Unable to locate user %s on server"
-msgstr "Kann den Benutzer %s auf dem Server nicht finden"
+msgstr "Der Benutzer %s konnte auf dem Server nicht gefunden werden"
 
 #: allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html:8
 msgid "Update TS3 groups"
@@ -1783,7 +1783,8 @@ msgstr "TeamSpeak3 Konto aktiviert."
 #: allianceauth/services/modules/teamspeak3/views.py:74
 #: allianceauth/services/modules/teamspeak3/views.py:100
 msgid "An error occurred while processing your TeamSpeak3 account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines TeamSpeak3 Kontos."
+msgstr ""
+"Es gab einen Fehler während der Verarbeitung Deines TeamSpeak3 Kontos."
 
 #: allianceauth/services/modules/teamspeak3/views.py:71
 msgid "Deactivated TeamSpeak3 account."
@@ -1802,7 +1803,7 @@ msgstr "XenForo Konto aktiviert."
 #: allianceauth/services/modules/xenforo/views.py:73
 #: allianceauth/services/modules/xenforo/views.py:94
 msgid "An error occurred while processing your XenForo account."
-msgstr "Es gab einen Fehler bei der Verarbeitung Deines XenForo Kontos."
+msgstr "Es gab einen Fehler während der Verarbeitung Deines XenForo Kontos."
 
 #: allianceauth/services/modules/xenforo/views.py:50
 msgid "Deactivated XenForo account."
@@ -1832,7 +1833,7 @@ msgstr "Formatieren"
 #: allianceauth/services/templates/services/service_confirm_delete.html:12
 #, python-format
 msgid "Delete %(service_name)s Account?"
-msgstr "Konto %(service_name)s löschen?"
+msgstr " %(service_name)s Konto löschen?"
 
 #: allianceauth/services/templates/services/service_confirm_delete.html:20
 #, python-format
@@ -1856,7 +1857,7 @@ msgstr "%(service_name)s Passwort ändern"
 #: allianceauth/services/templates/services/service_password.html:9
 #, python-format
 msgid "Set %(service_name)s Password"
-msgstr "%(service_name)s Passwort"
+msgstr "%(service_name)s Passwort setzen"
 
 #: allianceauth/services/templates/services/service_password.html:17
 msgid "Set Password"
@@ -1927,7 +1928,7 @@ msgstr "SRP Flotten Daten"
 
 #: allianceauth/srp/templates/srp/data.html:50
 msgid "SRP Fleet Data"
-msgstr "SRP-Flotte Daten"
+msgstr "SRP Flotte Daten"
 
 #: allianceauth/srp/templates/srp/data.html:55
 msgid "Mark Incomplete"
@@ -2005,7 +2006,7 @@ msgstr "Füge SRP Flotte hinzu"
 
 #: allianceauth/srp/templates/srp/management.html:39
 msgid "Fleet AAR"
-msgstr "Flotten AAR"
+msgstr "Flottenbericht"
 
 #: allianceauth/srp/templates/srp/management.html:40
 msgid "Fleet SRP Code"
@@ -2033,7 +2034,7 @@ msgstr "Deaktiviert"
 
 #: allianceauth/srp/templates/srp/management.html:83
 msgid "Completed"
-msgstr "Fertig"
+msgstr "Abgeschlossen"
 
 #: allianceauth/srp/templates/srp/management.html:101
 msgid "Are you sure you want to delete this SRP code and its contents?"
@@ -2086,7 +2087,7 @@ msgstr "SRP Link für %(fleetname)s aktiviert."
 #: allianceauth/srp/views.py:140
 #, python-format
 msgid "Marked SRP fleet %(fleetname)s as completed."
-msgstr "SRP Flotte %(fleetname)s als vollständig markiert."
+msgstr "SRP Flotte %(fleetname)s als abgeschlossen markiert."
 
 #: allianceauth/srp/views.py:153
 #, python-format
@@ -2204,7 +2205,7 @@ msgstr "Testversion verfügbar"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:78
 msgid "Task Queue"
-msgstr "Warteschlange"
+msgstr "Task-Warteschlange"
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:81
 #, python-format
@@ -2249,7 +2250,7 @@ msgstr "Ausloggen"
 
 #: allianceauth/timerboard/form.py:53
 msgid "Other"
-msgstr "anderes"
+msgstr "Anderes"
 
 #: allianceauth/timerboard/form.py:54
 #: allianceauth/timerboard/templates/timerboard/view.html:62
@@ -2353,7 +2354,7 @@ msgstr "Timer löschen"
 #: allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html:19
 #, python-format
 msgid "Are you sure you want to delete timer \"%(object)s\"?"
-msgstr "Bist Du sicher das Du Timer \"%(object)s\" löschen möchtest?"
+msgstr "Bist Du sicher das Du Timer „%(object)s“ löschen möchtest?"
 
 #: allianceauth/timerboard/templates/timerboard/timer_create_form.html:5
 #: allianceauth/timerboard/templates/timerboard/timer_create_form.html:13

allianceauth/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-09 18:20+1000\n"
+"POT-Creation-Date: 2023-11-08 23:55+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Google Analytics V4"
 msgstr ""
 
-#: allianceauth/authentication/decorators.py:37
+#: allianceauth/authentication/decorators.py:49
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
 
@@ -39,63 +39,68 @@ msgstr ""
 msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:80
+#: allianceauth/authentication/models.py:71
 msgid "English"
 msgstr ""
 
-#: allianceauth/authentication/models.py:81
+#: allianceauth/authentication/models.py:72
 msgid "German"
 msgstr ""
 
-#: allianceauth/authentication/models.py:82
+#: allianceauth/authentication/models.py:73
 msgid "Spanish"
 msgstr ""
 
-#: allianceauth/authentication/models.py:83
+#: allianceauth/authentication/models.py:74
 msgid "Chinese Simplified"
 msgstr ""
 
-#: allianceauth/authentication/models.py:84
+#: allianceauth/authentication/models.py:75
 msgid "Russian"
 msgstr ""
 
-#: allianceauth/authentication/models.py:85
+#: allianceauth/authentication/models.py:76
 msgid "Korean"
 msgstr ""
 
-#: allianceauth/authentication/models.py:86
+#: allianceauth/authentication/models.py:77
 msgid "French"
 msgstr ""
 
-#: allianceauth/authentication/models.py:87
+#: allianceauth/authentication/models.py:78
 msgid "Japanese"
 msgstr ""
 
-#: allianceauth/authentication/models.py:88
+#: allianceauth/authentication/models.py:79
 msgid "Italian"
 msgstr ""
 
-#: allianceauth/authentication/models.py:91
-msgid "Language"
+#: allianceauth/authentication/models.py:80
+msgid "Ukrainian"
 msgstr ""
 
 #: allianceauth/authentication/models.py:96
+msgid "Language"
+msgstr ""
+
+#: allianceauth/authentication/models.py:101
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr ""
 
-#: allianceauth/authentication/models.py:110
+#: allianceauth/authentication/models.py:115
 #, python-format
 msgid "State changed to: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:111
+#: allianceauth/authentication/models.py:116
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr ""
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:4
 #: allianceauth/authentication/templates/authentication/dashboard.html:7
+#: allianceauth/authentication/templates/authentication/tokens.html:4
 #: allianceauth/templates/allianceauth/side-menu.html:10
 msgid "Dashboard"
 msgstr ""
@@ -151,8 +156,49 @@ msgstr ""
 msgid "Alliance"
 msgstr ""
 
+#: allianceauth/authentication/templates/authentication/tokens.html:7
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
+msgid "Token Management"
+msgstr ""
+
+#: allianceauth/authentication/templates/authentication/tokens.html:12
+msgid "Scopes"
+msgstr ""
+
+#: allianceauth/authentication/templates/authentication/tokens.html:13
+#: allianceauth/hrapplications/templates/hrapplications/management.html:28
+#: allianceauth/hrapplications/templates/hrapplications/management.html:83
+#: allianceauth/hrapplications/templates/hrapplications/management.html:127
+#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
+#: allianceauth/hrapplications/templates/hrapplications/view.html:73
+#: allianceauth/srp/templates/srp/data.html:101
+#: allianceauth/srp/templates/srp/management.html:44
+msgid "Actions"
+msgstr ""
+
+#: allianceauth/authentication/templates/authentication/tokens.html:14
+#: allianceauth/corputils/templates/corputils/corpstats.html:74
+#: allianceauth/corputils/templates/corputils/corpstats.html:112
+#: allianceauth/corputils/templates/corputils/corpstats.html:156
+#: allianceauth/corputils/templates/corputils/search.html:13
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
+#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
+#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
+#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
+msgid "Character"
+msgstr ""
+
+#: allianceauth/authentication/templates/authentication/tokens.html:28
+msgid ""
+"This page is a best attempt, but backups or database logs can still contain "
+"your tokens. Always revoke tokens on https://community.eveonline.com/support/"
+"third-party-applications/ where possible."
+msgstr ""
+
 #: allianceauth/authentication/templates/public/login.html:6
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:58
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:69
 msgid "Login"
 msgstr ""
 
@@ -184,47 +230,47 @@ msgstr ""
 msgid "Invalid or expired activation link."
 msgstr ""
 
-#: allianceauth/authentication/views.py:77
+#: allianceauth/authentication/views.py:118
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:83
+#: allianceauth/authentication/views.py:124
 #, python-format
 msgid "Changed main character to %(char)s"
 msgstr ""
 
-#: allianceauth/authentication/views.py:92
+#: allianceauth/authentication/views.py:133
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:94
+#: allianceauth/authentication/views.py:135
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:133
+#: allianceauth/authentication/views.py:174
 msgid "Unable to authenticate as the selected character."
 msgstr ""
 
-#: allianceauth/authentication/views.py:197
+#: allianceauth/authentication/views.py:238
 msgid "Registration token has expired."
 msgstr ""
 
-#: allianceauth/authentication/views.py:252
+#: allianceauth/authentication/views.py:296
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 
-#: allianceauth/authentication/views.py:257
+#: allianceauth/authentication/views.py:301
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 
-#: allianceauth/authentication/views.py:262
+#: allianceauth/authentication/views.py:306
 msgid "Registration of new accounts is not allowed at this time."
 msgstr ""
 
@@ -267,19 +313,6 @@ msgstr ""
 msgid "Last update:"
 msgstr ""
 
-#: allianceauth/corputils/templates/corputils/corpstats.html:74
-#: allianceauth/corputils/templates/corputils/corpstats.html:112
-#: allianceauth/corputils/templates/corputils/corpstats.html:156
-#: allianceauth/corputils/templates/corputils/search.html:13
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:22
-#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:26
-#: allianceauth/groupmanagement/templates/groupmanagement/audit.html:30
-#: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112
-msgid "Character"
-msgstr ""
-
 #: allianceauth/corputils/templates/corputils/corpstats.html:75
 #: allianceauth/corputils/templates/corputils/search.html:14
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
@@ -611,36 +644,41 @@ msgstr ""
 msgid "Group Management"
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:15
+#: allianceauth/groupmanagement/forms.py:18
+#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
+msgid "Users"
+msgstr ""
+
+#: allianceauth/groupmanagement/forms.py:52
 msgid "This name has been reserved and can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:25
+#: allianceauth/groupmanagement/forms.py:62
 msgid "(auto)"
 msgstr ""
 
-#: allianceauth/groupmanagement/forms.py:34
+#: allianceauth/groupmanagement/forms.py:71
 msgid "There already exists a group with that name."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:105
+#: allianceauth/groupmanagement/models.py:104
 msgid ""
 "Internal group, users cannot see, join or request to join this group."
 "<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides "
 "Hidden and Open options when selected.</b>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:113
+#: allianceauth/groupmanagement/models.py:112
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:119
+#: allianceauth/groupmanagement/models.py:118
 msgid ""
 "Group is open and users will be automatically added upon request.<br>If the "
 "group is not open users will need their request manually approved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:126
+#: allianceauth/groupmanagement/models.py:125
 msgid ""
 "Group is public. Any registered user is able to join this group, with "
 "visibility based on the other options set for this group.<br>Auth will not "
@@ -648,65 +686,65 @@ msgid ""
 "authenticated."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:135
+#: allianceauth/groupmanagement/models.py:134
 msgid ""
 "Group is restricted. This means that adding or removing users for this group "
 "requires a superuser admin."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:144
+#: allianceauth/groupmanagement/models.py:143
 msgid ""
 "Group leaders can process requests for this group. Use the <code>auth."
 "group_management</code> permission to allow a user to manage all groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:154
+#: allianceauth/groupmanagement/models.py:153
 msgid ""
 "Members of leader groups can process requests for this group. Use the "
 "<code>auth.group_management</code> permission to allow a user to manage all "
 "groups.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:163
+#: allianceauth/groupmanagement/models.py:162
 msgid ""
 "States listed here will have the ability to join this group provided they "
 "have the proper permissions.<br>"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:171
+#: allianceauth/groupmanagement/models.py:170
 msgid ""
 "Short description <i>(max. 512 characters)</i> of the group shown to users."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:178
+#: allianceauth/groupmanagement/models.py:177
 msgid "Can request non-public groups"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:209
+#: allianceauth/groupmanagement/models.py:208
 msgid "name"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:212
+#: allianceauth/groupmanagement/models.py:211
 msgid "Name that can not be used for groups."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:215
+#: allianceauth/groupmanagement/models.py:214
 msgid "reason"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:215
+#: allianceauth/groupmanagement/models.py:214
 msgid "Reason why this name is reserved."
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:218
+#: allianceauth/groupmanagement/models.py:217
 msgid "created by"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:223
+#: allianceauth/groupmanagement/models.py:222
 msgid "created at"
 msgstr ""
 
-#: allianceauth/groupmanagement/models.py:223
+#: allianceauth/groupmanagement/models.py:222
 msgid "Date when this entry was created"
 msgstr ""
 
@@ -933,86 +971,86 @@ msgstr ""
 msgid "Group Membership"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:163
+#: allianceauth/groupmanagement/views.py:166
 #, python-format
 msgid "Removed user %(user)s from group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:165
+#: allianceauth/groupmanagement/views.py:168
 msgid "User does not exist in that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:168
+#: allianceauth/groupmanagement/views.py:171
 msgid "Group does not exist"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:195
+#: allianceauth/groupmanagement/views.py:198
 #, python-format
 msgid "Accepted application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:201
-#: allianceauth/groupmanagement/views.py:232
+#: allianceauth/groupmanagement/views.py:204
+#: allianceauth/groupmanagement/views.py:235
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:226
+#: allianceauth/groupmanagement/views.py:229
 #, python-format
 msgid "Rejected application from %(mainchar)s to %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:261
+#: allianceauth/groupmanagement/views.py:264
 #, python-format
 msgid "Accepted application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:266
-#: allianceauth/groupmanagement/views.py:298
+#: allianceauth/groupmanagement/views.py:269
+#: allianceauth/groupmanagement/views.py:301
 #, python-format
 msgid ""
 "An unhandled error occurred while processing the application from "
 "%(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:292
+#: allianceauth/groupmanagement/views.py:295
 #, python-format
 msgid "Rejected application from %(mainchar)s to leave %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:336
-#: allianceauth/groupmanagement/views.py:346
+#: allianceauth/groupmanagement/views.py:339
+#: allianceauth/groupmanagement/views.py:349
 msgid "You cannot join that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:341
+#: allianceauth/groupmanagement/views.py:344
 msgid "You are already a member of that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:358
+#: allianceauth/groupmanagement/views.py:361
 msgid "You already have a pending application for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:367
+#: allianceauth/groupmanagement/views.py:370
 #, python-format
 msgid "Applied to group %(group)s."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:377
+#: allianceauth/groupmanagement/views.py:380
 msgid "You cannot leave that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:381
+#: allianceauth/groupmanagement/views.py:384
 msgid "You are not a member of that group"
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:393
+#: allianceauth/groupmanagement/views.py:396
 msgid "You already have a pending leave request for that group."
 msgstr ""
 
-#: allianceauth/groupmanagement/views.py:409
+#: allianceauth/groupmanagement/views.py:412
 #, python-format
 msgid "Applied to leave group %(group)s."
 msgstr ""
@@ -1074,16 +1112,6 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: allianceauth/hrapplications/templates/hrapplications/management.html:28
-#: allianceauth/hrapplications/templates/hrapplications/management.html:83
-#: allianceauth/hrapplications/templates/hrapplications/management.html:127
-#: allianceauth/hrapplications/templates/hrapplications/searchview.html:27
-#: allianceauth/hrapplications/templates/hrapplications/view.html:73
-#: allianceauth/srp/templates/srp/data.html:101
-#: allianceauth/srp/templates/srp/management.html:44
-msgid "Actions"
-msgstr ""
-
 #: allianceauth/hrapplications/templates/hrapplications/management.html:38
 #: allianceauth/hrapplications/templates/hrapplications/management.html:99
 #: allianceauth/hrapplications/templates/hrapplications/management.html:143
@@ -1422,10 +1450,6 @@ msgstr ""
 msgid "Code Name"
 msgstr ""
 
-#: allianceauth/permissions_tool/templates/permissions_tool/overview.html:35
-msgid "Users"
-msgstr ""
-
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:41
 msgid "States"
 msgstr ""
@@ -2146,11 +2170,11 @@ msgid ""
 msgstr ""
 
 #: allianceauth/templates/allianceauth/admin-status/overview.html:95
-#, python-format
-msgid ""
-"\n"
-"                        %(queue_length)s queued tasks\n"
-"                        "
+msgid "running"
+msgstr ""
+
+#: allianceauth/templates/allianceauth/admin-status/overview.html:96
+msgid "queued"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
@@ -2166,11 +2190,11 @@ msgid "AA Support Discord"
 msgstr ""
 
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:10
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:14
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:16
 msgid "User Menu"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:56
+#: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:67
 msgid "Logout"
 msgstr ""
 
@@ -2226,22 +2250,30 @@ msgid "Objective"
 msgstr ""
 
 #: allianceauth/timerboard/form.py:64
-msgid "Days Remaining"
+msgid "Absolute Timer"
 msgstr ""
 
 #: allianceauth/timerboard/form.py:65
-msgid "Hours Remaining"
+msgid "Date and Time"
+msgstr ""
+
+#: allianceauth/timerboard/form.py:66
+msgid "Days Remaining"
 msgstr ""
 
 #: allianceauth/timerboard/form.py:67
-msgid "Minutes Remaining"
+msgid "Hours Remaining"
 msgstr ""
 
 #: allianceauth/timerboard/form.py:69
+msgid "Minutes Remaining"
+msgstr ""
+
+#: allianceauth/timerboard/form.py:71
 msgid "Important"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:70
+#: allianceauth/timerboard/form.py:72
 msgid "Corp-Restricted"
 msgstr ""
 

allianceauth/locale/es/LC_MESSAGES/django.po

@@ -4,11 +4,11 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# frank1210 <francolopez_16@hotmail.com>, 2021
-# Joel Falknau <ozirascal@gmail.com>, 2021
-# Young Anexo, 2023
 # Fegpawn Kaundur, 2023
+# frank1210 <francolopez_16@hotmail.com>, 2023
 # trenus, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2023
+# Young Anexo, 2023
 # 
 #, fuzzy
 msgid ""
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: trenus, 2023\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: Young Anexo, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/alliance-auth/teams/107430/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

allianceauth/locale/fr_FR/LC_MESSAGES/django.po

@@ -4,14 +4,14 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# François LACROIX-DURANT <umbre@fallenstarscreations.com>, 2020
-# Philippe Querin-Laporte <philippe.querin@hotmail.com>, 2020
-# Keven D. <theenarki@gmail.com>, 2020
-# Idea ., 2021
-# Mickael PATTE, 2021
-# Geoffrey Fabbro, 2021
+# Keven D. <theenarki@gmail.com>, 2023
+# rockclodbuster, 2023
+# Geoffrey Fabbro, 2023
 # Mohssine Daghghar, 2023
-# Ludovick Fortin, 2023
+# François LACROIX-DURANT <umbre@fallenstarscreations.com>, 2023
+# Mickael PATTE, 2023
+# Philippe Querin-Laporte <philippe.querin@hotmail.com>, 2023
+# Idea ., 2023
 # 
 #, fuzzy
 msgid ""
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Ludovick Fortin, 2023\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: Idea ., 2023\n"
 "Language-Team: French (France) (https://app.transifex.com/alliance-auth/teams/107430/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

allianceauth/locale/ja/LC_MESSAGES/django.po

@@ -4,8 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Foch Petain <brigadier.rockforward@gmail.com>, 2020
+# Foch Petain <brigadier.rockforward@gmail.com>, 2023
 # kotaneko, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -13,8 +14,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: kotaneko, 2023\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: Joel Falknau <ozirascal@gmail.com>, 2023\n"
 "Language-Team: Japanese (https://app.transifex.com/alliance-auth/teams/107430/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

allianceauth/locale/ko_KR/LC_MESSAGES/django.po

@@ -4,13 +4,13 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# None None <khd1226543@gmail.com>, 2020
-# Seowon Jung <seowon@hawaii.edu>, 2020
-# Olgeda Choi <undead.choi@gmail.com>, 2020
-# Lahty <js03js70@gmail.com>, 2020
-# Joel Falknau <ozirascal@gmail.com>, 2020
-# ThatRagingKid, 2022
-# jackfrost, 2022
+# None None <khd1226543@gmail.com>, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2023
+# Seowon Jung <seowon@hawaii.edu>, 2023
+# Olgeda Choi <undead.choi@gmail.com>, 2023
+# ThatRagingKid, 2023
+# Lahty <js03js70@gmail.com>, 2023
+# jackfrost, 2023
 # 
 #, fuzzy
 msgid ""
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: jackfrost, 2022\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: jackfrost, 2023\n"
 "Language-Team: Korean (Korea) (https://app.transifex.com/alliance-auth/teams/107430/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

allianceauth/locale/ru/LC_MESSAGES/django.po

@@ -4,9 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Alexander Gess <de.alex.gess@gmail.com>, 2020
-# Yuriy K <thedjcooltv@gmail.com>, 2020
-# Андрей Зубков <and.vareba81@gmail.com>, 2020
+# Yuriy K <thedjcooltv@gmail.com>, 2023
+# Андрей Зубков <and.vareba81@gmail.com>, 2023
+# Alexander Gess <de.alex.gess@gmail.com>, 2023
 # Filipp Chertiev <f@fzfx.ru>, 2023
 # 
 #, fuzzy
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
 "Last-Translator: Filipp Chertiev <f@fzfx.ru>, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/alliance-auth/teams/107430/ru/)\n"
 "MIME-Version: 1.0\n"

allianceauth/locale/uk/LC_MESSAGES/django.po

@@ -4,6 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
+# Denys Ivchenko, 2023
 # Kristof Swensen, 2023
 # 
 #, fuzzy
@@ -12,7 +13,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
 "Last-Translator: Kristof Swensen, 2023\n"
 "Language-Team: Ukrainian (https://app.transifex.com/alliance-auth/teams/107430/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +33,7 @@ msgstr "Google Analytics V4"
 #: allianceauth/authentication/decorators.py:37
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
-"Для виконання цієї дії потрібен головний персонаж. Додайте його нижче."
+"Для виконання цієї дії потрібен основний персонаж. Додайте його нижче."
 
 #: allianceauth/authentication/forms.py:12
 msgid "Email"
@@ -124,7 +125,7 @@ msgstr "Додати персонажа"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:115
 msgid "Change Main"
-msgstr "Змінити головного персонажа"
+msgstr "Змінити основного персонажа"
 
 #: allianceauth/authentication/templates/authentication/dashboard.html:125
 msgid "Group Memberships"
@@ -352,7 +353,7 @@ msgstr "Не вдалося зібрати статистику корпорац
 
 #: allianceauth/fleetactivitytracking/auth_hooks.py:9
 msgid "Fleet Activity Tracking"
-msgstr "Відстеження активності флоту"
+msgstr "Відстеження активності флотів"
 
 #: allianceauth/fleetactivitytracking/forms.py:6 allianceauth/srp/form.py:8
 #: allianceauth/srp/templates/srp/management.html:35
@@ -456,7 +457,7 @@ msgstr "Корабель"
 #: allianceauth/timerboard/templates/timerboard/view.html:202
 #: allianceauth/timerboard/templates/timerboard/view.html:375
 msgid "Eve Time"
-msgstr "Час в грі"
+msgstr "Ігровий час"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:33
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:36
@@ -560,16 +561,16 @@ msgstr "Fats"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:4
 msgid "Fatlink Corp Statistics"
-msgstr "Статистика корпорації Fatlink"
+msgstr "Статистика фатів корпорації"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:24
 msgid "Average fats"
-msgstr "Середній показник fats"
+msgstr "Середній показник фатів"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:4
 msgid "Fatlink statistics"
-msgstr "Статистика Fatlink"
+msgstr "Статистика фатів"
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:20
 msgid "Ticker"
@@ -625,7 +626,7 @@ msgid ""
 "Cannot register the fleet participation for {character.character_name}. The "
 "character needs to be online."
 msgstr ""
-"Не можна зареєструвати участь в флоті для {character.character_name}. "
+"Не вдалося зареєструвати участь в флоті для {character.character_name}. "
 "Персонаж повинен бути в мережі."
 
 #: allianceauth/groupmanagement/auth_hooks.py:17
@@ -659,8 +660,7 @@ msgstr ""
 #: allianceauth/groupmanagement/models.py:113
 msgid "Group is hidden from users but can still join with the correct link."
 msgstr ""
-"Група прихована від користувачів, але можна приєднатися з правильним "
-"посиланням."
+"Група прихована від користувачів, але можна приєднатися за посиланням."
 
 #: allianceauth/groupmanagement/models.py:119
 msgid ""
@@ -1045,7 +1045,7 @@ msgstr "Ви вже є членом цієї групи."
 
 #: allianceauth/groupmanagement/views.py:358
 msgid "You already have a pending application for that group."
-msgstr "У вас вже є очікуюча заявка на вступ до цієї групи."
+msgstr "Ви вже подали заявку на вступ до цієї групи."
 
 #: allianceauth/groupmanagement/views.py:367
 #, python-format
@@ -1062,7 +1062,7 @@ msgstr "Ви не є учасником цієї групи"
 
 #: allianceauth/groupmanagement/views.py:393
 msgid "You already have a pending leave request for that group."
-msgstr "Ви вже маєте очікувану запит на вихід з цієї групи."
+msgstr "Ви вже подали запит на вихід з цієї групи."
 
 #: allianceauth/groupmanagement/views.py:409
 #, python-format
@@ -1321,7 +1321,7 @@ msgstr "Всі прочитані повідомлення видалено."
 
 #: allianceauth/optimer/auth_hooks.py:10
 msgid "Fleet Operations"
-msgstr "Операції флоту"
+msgstr "Флотові операції"
 
 #: allianceauth/optimer/form.py:12
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:11
@@ -1345,7 +1345,7 @@ msgstr "Тип операції"
 #: allianceauth/optimer/form.py:17
 #: allianceauth/srp/templates/srp/management.html:38
 msgid "Fleet Commander"
-msgstr "Командувач флоту"
+msgstr "Командир флоту"
 
 #: allianceauth/optimer/form.py:22 allianceauth/srp/form.py:14
 #: allianceauth/srp/templates/srp/data.html:91
@@ -1400,7 +1400,7 @@ msgstr "Немає наступних таймерів."
 
 #: allianceauth/optimer/templates/optimer/management.html:33
 msgid "Past Fleet Operations"
-msgstr "Минулі флотові операції"
+msgstr "Завершені флотові операції"
 
 #: allianceauth/optimer/templates/optimer/management.html:37
 #: allianceauth/timerboard/templates/timerboard/view.html:535
@@ -1484,7 +1484,7 @@ msgstr "Стани"
 
 #: allianceauth/services/abstract.py:72
 msgid "That service account already exists"
-msgstr "Такий обліковий запис сервісу вже існує"
+msgstr "Такий сервісний обліковий запис вже існує"
 
 #: allianceauth/services/abstract.py:103
 #, python-brace-format
@@ -1505,7 +1505,7 @@ msgstr "Командир флоту:"
 
 #: allianceauth/services/forms.py:8
 msgid "Fleet Comms:"
-msgstr "Комунікації флоту:"
+msgstr "Голосовий канал флоту:"
 
 #: allianceauth/services/forms.py:9
 msgid "Fleet Type:"
@@ -1545,7 +1545,7 @@ msgstr "Ні"
 
 #: allianceauth/services/forms.py:16
 msgid "Important?*"
-msgstr "Важливо?*"
+msgstr "Важливий?*"
 
 #: allianceauth/services/forms.py:21 allianceauth/services/forms.py:31
 msgid "Password"
@@ -1614,7 +1614,7 @@ msgstr "Ви не маєте прав на доступ до Discourse."
 
 #: allianceauth/services/modules/discourse/views.py:34
 msgid "You must have a main character set to access Discourse."
-msgstr "Ви повинні мати головний персонаж, щоб отримати доступ до Discourse."
+msgstr "Ви повинні мати основний персонаж, щоб отримати доступ до Discourse."
 
 #: allianceauth/services/modules/discourse/views.py:44
 msgid ""
@@ -1702,7 +1702,7 @@ msgstr "Відправлено трансляцію Jabber на %s"
 
 #: allianceauth/services/modules/openfire/views.py:144
 msgid "Set jabber password."
-msgstr "Встановлення пароля Jabber."
+msgstr "Встановити пароль Jabber."
 
 #: allianceauth/services/modules/phpbb3/views.py:34
 msgid "Activated forum account."
@@ -1713,7 +1713,7 @@ msgstr "Активований обліковий запис форуму."
 #: allianceauth/services/modules/phpbb3/views.py:78
 #: allianceauth/services/modules/phpbb3/views.py:101
 msgid "An error occurred while processing your forum account."
-msgstr "Виникла помилка під час обробки вашого облікового запису форуму."
+msgstr "Виникла помилка під час обробки вашого облікового запису на форумі."
 
 #: allianceauth/services/modules/phpbb3/views.py:53
 msgid "Deactivated forum account."
@@ -1721,11 +1721,11 @@ msgstr "Деактивований обліковий запис форуму."
 
 #: allianceauth/services/modules/phpbb3/views.py:70
 msgid "Reset forum password."
-msgstr "Скидання пароля форуму."
+msgstr "Скинути пароль форуму."
 
 #: allianceauth/services/modules/phpbb3/views.py:98
 msgid "Set forum password."
-msgstr "Встановлення пароля форуму."
+msgstr "Встановити пароль форуму."
 
 #: allianceauth/services/modules/smf/views.py:52
 msgid "Activated SMF account."
@@ -1744,11 +1744,11 @@ msgstr "Деактивований обліковий запис SMF."
 
 #: allianceauth/services/modules/smf/views.py:95
 msgid "Reset SMF password."
-msgstr "Скидання пароля SMF."
+msgstr "Скинути пароль SMF."
 
 #: allianceauth/services/modules/smf/views.py:121
 msgid "Set SMF password."
-msgstr "Встановлення пароля SMF."
+msgstr "Встановити пароль SMF."
 
 #: allianceauth/services/modules/teamspeak3/forms.py:14
 #, python-format
@@ -1761,7 +1761,7 @@ msgstr "Оновити групи TS3"
 
 #: allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html:5
 msgid "Verify Teamspeak"
-msgstr "Перевірте Teamspeak"
+msgstr "Перевірити Teamspeak"
 
 #: allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html:10
 msgid "Verify Teamspeak Identity"
@@ -1869,11 +1869,11 @@ msgstr "Керування послугами"
 
 #: allianceauth/services/templates/services/services.html:9
 msgid "Available Services"
-msgstr "Доступні послуги"
+msgstr "Доступні сервіси"
 
 #: allianceauth/services/templates/services/services.html:14
 msgid "Service"
-msgstr "Послуга"
+msgstr "Сервіс"
 
 #: allianceauth/services/templates/services/services.html:16
 msgid "Domain"
@@ -1881,7 +1881,7 @@ msgstr "Домен"
 
 #: allianceauth/srp/auth_hooks.py:13
 msgid "Ship Replacement"
-msgstr "Компенсація за корабель"
+msgstr "Компенсації"
 
 #: allianceauth/srp/form.py:9
 #: allianceauth/srp/templates/srp/management.html:36

allianceauth/locale/zh_Hans/LC_MESSAGES/django.po

@@ -4,9 +4,10 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Joel Falknau <ozirascal@gmail.com>, 2020
-# Jesse . <sgeine@hotmail.com>, 2020
-# Aaron BuBu <351793078@qq.com>, 2020
+# Jesse . <sgeine@hotmail.com>, 2023
+# Aaron BuBu <351793078@qq.com>, 2023
+# Joel Falknau <ozirascal@gmail.com>, 2023
+# Shen Yang, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,8 +15,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-09 18:20+1000\n"
-"PO-Revision-Date: 2020-02-18 03:14+0000\n"
-"Last-Translator: Aaron BuBu <351793078@qq.com>, 2020\n"
+"PO-Revision-Date: 2023-10-08 09:23+0000\n"
+"Last-Translator: Shen Yang, 2023\n"
 "Language-Team: Chinese Simplified (https://app.transifex.com/alliance-auth/teams/107430/zh-Hans/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,48 +47,48 @@ msgstr ""
 
 #: allianceauth/authentication/models.py:80
 msgid "English"
-msgstr ""
+msgstr "英语"
 
 #: allianceauth/authentication/models.py:81
 msgid "German"
-msgstr ""
+msgstr "德语"
 
 #: allianceauth/authentication/models.py:82
 msgid "Spanish"
-msgstr ""
+msgstr "西班牙语"
 
 #: allianceauth/authentication/models.py:83
 msgid "Chinese Simplified"
-msgstr ""
+msgstr "简体中文"
 
 #: allianceauth/authentication/models.py:84
 msgid "Russian"
-msgstr ""
+msgstr "俄语"
 
 #: allianceauth/authentication/models.py:85
 msgid "Korean"
-msgstr ""
+msgstr "韩语"
 
 #: allianceauth/authentication/models.py:86
 msgid "French"
-msgstr ""
+msgstr "法语"
 
 #: allianceauth/authentication/models.py:87
 msgid "Japanese"
-msgstr ""
+msgstr "日语"
 
 #: allianceauth/authentication/models.py:88
 msgid "Italian"
-msgstr ""
+msgstr "意大利语"
 
 #: allianceauth/authentication/models.py:91
 msgid "Language"
-msgstr ""
+msgstr "语言"
 
 #: allianceauth/authentication/models.py:96
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
-msgstr ""
+msgstr "夜间模式"
 
 #: allianceauth/authentication/models.py:110
 #, python-format
@@ -696,7 +697,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/models.py:215
 msgid "reason"
-msgstr ""
+msgstr "原因"
 
 #: allianceauth/groupmanagement/models.py:215
 msgid "Reason why this name is reserved."
@@ -754,7 +755,7 @@ msgstr "操作者"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:48
 msgid "Removed"
-msgstr ""
+msgstr "已移除"
 
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:60
 msgid "All times displayed are EVE/UTC."
@@ -1198,11 +1199,11 @@ msgstr "添加评论"
 
 #: allianceauth/notifications/models.py:21
 msgid "danger"
-msgstr ""
+msgstr "危险"
 
 #: allianceauth/notifications/models.py:22
 msgid "warning"
-msgstr ""
+msgstr "警告"
 
 #: allianceauth/notifications/models.py:23
 msgid "info"
@@ -1343,7 +1344,7 @@ msgstr "当前EVE游戏内时间"
 
 #: allianceauth/optimer/templates/optimer/management.html:26
 msgid "Next Fleet Operations"
-msgstr ""
+msgstr "下一个舰队任务"
 
 #: allianceauth/optimer/templates/optimer/management.html:30
 #: allianceauth/timerboard/templates/timerboard/view.html:362
@@ -1352,7 +1353,7 @@ msgstr "没有快到的时间节点，歇一会吧"
 
 #: allianceauth/optimer/templates/optimer/management.html:33
 msgid "Past Fleet Operations"
-msgstr ""
+msgstr "过去的舰队任务"
 
 #: allianceauth/optimer/templates/optimer/management.html:37
 #: allianceauth/timerboard/templates/timerboard/view.html:535
@@ -2257,15 +2258,15 @@ msgstr ""
 
 #: allianceauth/timerboard/models.py:15
 msgid "Shield"
-msgstr ""
+msgstr "护盾"
 
 #: allianceauth/timerboard/models.py:16
 msgid "Armor"
-msgstr ""
+msgstr "装甲"
 
 #: allianceauth/timerboard/models.py:17
 msgid "Hull"
-msgstr ""
+msgstr "结构"
 
 #: allianceauth/timerboard/models.py:18
 msgid "Final"
@@ -2273,11 +2274,11 @@ msgstr ""
 
 #: allianceauth/timerboard/models.py:19
 msgid "Anchoring"
-msgstr ""
+msgstr "铆钉"
 
 #: allianceauth/timerboard/models.py:20
 msgid "Unanchoring"
-msgstr ""
+msgstr "解锚"
 
 #: allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html:11
 msgid "Delete Timer"

allianceauth/menu/apps.py

@@ -3,6 +3,7 @@ import logging
 from django.apps import AppConfig
 from django.db.utils import ProgrammingError, OperationalError
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -12,8 +13,7 @@ class MenuConfig(AppConfig):
 
     def ready(self):
         try:
-            logger.debug("Syncing MenuItem Hooks")
-            from allianceauth.menu.providers import MenuItem
-            MenuItem.sync_hook_models()
+            from allianceauth.menu.providers import menu_provider
+            menu_provider.clear_synced_flag()
         except (ProgrammingError, OperationalError):
             logger.warning("Migrations not completed for MenuItems")

allianceauth/menu/hooks.py

@@ -8,7 +8,7 @@ class MenuItemHook:
     """
     Auth Hook for generating Side Menu Items
     """
-    def __init__(self, text: str, classes: List[str], url_name: str, order: Optional[int] = None, navactive: List = list([])):
+    def __init__(self, text: str, classes: str, url_name: str, order: Optional[int] = None, navactive: List = []):
         """
         :param text: The text shown as menu item, e.g. usually the name of the app.
         :type text: str

allianceauth/menu/middleware.py

@@ -0,0 +1,15 @@
+from django.utils.deprecation import MiddlewareMixin
+
+import logging
+
+from allianceauth.menu.providers import menu_provider
+
+logger = logging.getLogger(__name__)
+
+
+class MenuSyncMiddleware(MiddlewareMixin):
+
+    def __call__(self, request):
+        """Alliance Auth Menu Sync Middleware"""
+        menu_provider.check_and_sync_menu()
+        return super().__call__(request)

allianceauth/menu/models.py

@@ -144,7 +144,7 @@ class MenuItem(models.Model):
                     "render": _render,
                     "text": mi.text,
                     "rank": mi.rank,
-                    "classes": (mi.icon_classes if mi.icon_classes != "" else "fas fa-folder"),
+                    "classes": (mi.icon_classes if mi.icon_classes != "" else "fa-solid fa-folder"),
                     "hide": mi.hide
                 }
 

allianceauth/menu/providers.py

@@ -1,10 +1,49 @@
-from django.template.loader import render_to_string
+import logging
 
-from allianceauth.hooks import get_hooks
+from django.core.cache import cache
 
-from .models import MenuItem
+from allianceauth.menu.models import MenuItem
+from allianceauth.utils.django import StartupCommand
+
+logger = logging.getLogger(__name__)
+
+MENU_SYNC_CACHE_KEY = "ALLIANCEAUTH-MENU-SYNCED"
+MENU_CACHE_KEY = "ALLIANCEAUTH-MENU-CACHE"
 
 
 class MenuProvider():
-    def __init__(self) -> None:
+
+    def clear_synced_flag(self) -> bool:
+        return cache.delete(MENU_SYNC_CACHE_KEY)
+
+    def set_synced_flag(self) -> bool:
+        return cache.set(MENU_SYNC_CACHE_KEY, True)
+
+    def get_synced_flag(self) -> bool:
+        return cache.get(MENU_SYNC_CACHE_KEY, False)
+
+    def sync_menu_models(self):
+        MenuItem.sync_hook_models()
+        self.set_synced_flag()
+
+    def check_and_sync_menu(self) -> None:
+        if self.get_synced_flag():
+            # performance hit to each page view to ensure tests work.
+            # tests clear DB but not cache.
+            # TODO rethink all of this?
+            if MenuItem.objects.all().count() > 0:
+                logger.debug("Menu Hooks Synced")
+            else:
+                self.sync_menu_models()
+        else:
+            logger.debug("Syncing Menu Hooks")
+            self.sync_menu_models()
+
+    def get_and_cache_menu(self):
         pass
+
+    def clear_menu_cache(self):
+        pass
+
+
+menu_provider = MenuProvider()

allianceauth/menu/templates/menu/menu-item-bs5.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load navactive %}
+
 {% if not item.hide %}
     <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
         <i class="nav-link {{ item.classes }} fa-fw align-self-center me-3 {% if item.navactive %}{% navactive request item.navactive|join:' ' %}{% endif %}" {% if item.items|length %} type="button" data-bs-toggle="collapse" data-bs-target="#id-{{ item.text|slugify }}" aria-expanded="false" aria-controls="" {% endif %}></i>
@@ -7,20 +8,24 @@
             href="{% if item.url_name %}{% url item.url_name %}{% else %}{{ item.url }}{% endif %}">
             {% translate item.text %}
         </a>
+
         {% if item.count >= 1 %}
-            <span class="badge bg-primary rounded-pill m-2 align-self-center {% if item.items|length == 0 %}me-4{% endif %}">
+            <span class="badge bg-primary m-2 align-self-center {% if item.items|length == 0 %}me-4{% endif %}">
                 {{ item.count }}
             </span>
         {% elif item.url %}
             <span class="pill m-2 me-4 align-self-center fas fa-external-link-alt"></span>
         {% endif %}
+
         {% if item.items|length > 0 %}
-            <span class="pill m-2 me-4 align-self-center fas fa-solid fa-chevron-down"
+            <span
+                class="pill m-2 me-4 align-self-center fas fa-solid fa-chevron-down"
                 type="button"
                 data-bs-toggle="collapse"
                 data-bs-target="#id-{{ item.text|slugify }}"
                 aria-expanded="false"
-                aria-controls=""></span>
+                aria-controls="">
+            </span>
             <!--<hr class="m-0 w-100">-->
             <ul class="collapse ps-1 w-100 border-start rounded-start border-light border-3" id="id-{{ item.text|slugify }}">
                 {% for sub_item in item.items %}

allianceauth/menu/templates/menu/menu-notification-block.html

@@ -1,17 +1,13 @@
 {% load i18n %}
 {% load navactive %}
 {% load auth_notifications %}
-<li class="nav-item {% navactive request 'notifications:' %}"
-    id="menu_item_notifications">
-    <a class="nav-link"
-        href="{% url 'notifications:list' %}">
-        <span class="fa">
-            {% with unread_count=request.user|user_unread_notification_count %}
-            <i
-                class="fas fa-bell{% if unread_count %} text-danger{% endif %}"
-            ></i>
-            {% endwith %}
-        </span>
+
+<li class="nav-item {% navactive request 'notifications:' %}" id="menu_item_notifications">
+    <a class="nav-link" href="{% url 'notifications:list' %}">
+        {% with unread_count=request.user|user_unread_notification_count %}
+            <i class="fa-solid fa-bell{% if unread_count %} text-danger{% endif %}"></i>
+        {% endwith %}
+
         <span class="d-lg-none d-md-inline m-2">
             {% translate "Notifications" %}
         </span>

allianceauth/menu/templates/menu/menu-user.html

@@ -1,51 +1,58 @@
 {% load i18n %}
 {% load evelinks %}
 {% load theme_tags %}
-<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2">
 
-    {% if request.user.profile.main_character %}
-        {% with request.user.profile.main_character as main %}
-            <div class="p-2 position-relative m-2">
-                <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}"/>
-                <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}"/>
-                {% if main.alliance_id %}
-                    <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}"/>
-                {% elif main.faction_id %}
-                    <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}"/>
-                {% endif %}
-            </div>
-            <h5>{{ main.character_name }}</h5>
-        {% endwith %}
-    {% else %}
-        <img class="rounded-circle m-2" src="{{ 1|character_portrait_url:32 }}" alt="{% translate 'No Main Character!' %}"/>
-        <h5>{% translate "No Main Character!" %}</h5>
-    {% endif %}
+<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2">
     {% if user.is_authenticated %}
+        {% if request.user.profile.main_character %}
+            {% with request.user.profile.main_character as main %}
+                <div class="p-2 position-relative m-2">
+                    <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
+                    <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
+
+                    {% if main.alliance_id %}
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
+                    {% elif main.faction_id %}
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
+                    {% endif %}
+                </div>
+                <h5>{{ main.character_name }}</h5>
+            {% endwith %}
+        {% else %}
+            <img class="rounded-circle m-2" src="{{ 1|character_portrait_url:32 }}" alt="{% translate 'No Main Character!' %}">
+            <h5>{% translate "No Main Character!" %}</h5>
+        {% endif %}
+
         {% theme_select %}
     {% endif %}
+
     <div class="btn-group m-2">
         <button type="button" class="btn btn-secondary p-1">
             {% include "public/lang_select.html" %}
         </button>
+
         {% if user.is_superuser %}
-        <a role="button" class="btn btn btn-secondary d-flex"
-            href="{% url 'admin:index' %}"
-            bs-data-toggle="button">
-            <span class="align-self-center">{% translate "Admin" %}</span>
-        </a>
+            <a role="button" class="btn btn btn-secondary d-flex" href="{% url 'admin:index' %}">
+                <span class="align-self-center">{% translate "Admin" %}</span>
+            </a>
         {% endif %}
     </div>
+
     <div class="btn-group m-2">
-        <a role="button" class="btn btn-info" href="{% url 'authentication:token_management' %}" alt="Token Management"><i class="fa-solid fa-user-lock fa-fw"></i></a>
-    {% if user.is_superuser %}
-        <a role="button" class="btn btn-info" href="https://allianceauth.readthedocs.io/" alt="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i></a>
-        <a role="button" class="btn btn-info" href="https://discord.gg/fjnHAmk" alt="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i></a>
-        <a role="button" class="btn btn-info" href="https://gitlab.com/allianceauth/allianceauth" alt="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i></a>
-    {% endif %}
-    {% if user.is_authenticated %}
-        <a role="button" class="btn btn-danger" href="{% url 'logout' %}" alt="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw"></i></a>
-    {% else %}
-        <a role="button" class="btn btn-success" href="{% url 'authentication:login' %}" alt="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw"></i></a>
-    {% endif %}
+        {% if user.is_authenticated %}
+            <a role="button" class="btn btn-info" href="{% url 'authentication:token_management' %}" title="Token Management"><i class="fa-solid fa-user-lock fa-fw"></i></a>
+        {% endif %}
+
+        {% if user.is_superuser %}
+            <a role="button" class="btn btn-info" href="https://allianceauth.readthedocs.io/" title="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i></a>
+            <a role="button" class="btn btn-info" href="https://discord.gg/fjnHAmk" title="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i></a>
+            <a role="button" class="btn btn-info" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i></a>
+        {% endif %}
+
+        {% if user.is_authenticated %}
+            <a role="button" class="btn btn-danger" href="{% url 'logout' %}" title="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw"></i></a>
+        {% else %}
+            <a role="button" class="btn btn-success" href="{% url 'authentication:login' %}" title="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw"></i></a>
+        {% endif %}
     </div>
 </div>

allianceauth/menu/templates/menu/sortable-side-menu.html

@@ -1,19 +1,24 @@
 {% load i18n %}
 {% load navactive %}
-{% load menu_items %}
-<div class="col-auto px-0 " >
-    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar" >
+{% load menu_menu_items %}
+
+<div class="col-auto px-0">
+    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div style="width: 350px;">
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo" >
-                <ul style="z-index:5;"  id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
-                    <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
-                        <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
-                        <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
-                            {% translate "Dashboard" %}
-                        </a>
-                    </li>
-                    {% sorted_menu_items %}
-                </ul>
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo">
+                {% if user.is_authenticated %}
+                    <ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
+                        <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
+                            <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
+                            <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
+                                {% translate "Dashboard" %}
+                            </a>
+                        </li>
+
+                        {% sorted_menu_items %}
+                    </ul>
+                {% endif %}
+
                 {% include 'menu/menu-user.html' %}
             </div>
         </div>

allianceauth/menu/templatetags/menu_menu_items.py

@@ -3,7 +3,6 @@ from django import template
 from allianceauth.hooks import get_hooks
 from allianceauth.menu.models import MenuItem
 
-from ..providers import MenuProvider
 
 register = template.Library()
 
@@ -29,7 +28,7 @@ def menu_items(context):
 @register.inclusion_tag('menu/menu-block.html', takes_context=True)
 def sorted_menu_items(context):
     request = context['request']
-    manu_items = MenuItem.render_menu(request)
+    menu_items = MenuItem.render_menu(request)
     return {
-        'menu_items':manu_items
+        'menu_items':menu_items
     }

allianceauth/notifications/templates/notifications/list.html

@@ -1,42 +1,49 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load static %}
 {% load i18n %}
 
 {% block page_title %}
     {% translate "Notifications" %}
 {% endblock page_title %}
+
 {% block header_nav_brand %}
     {% translate "Notifications" %}
 {% endblock header_nav_brand %}
+
 {% block header_nav_collapse_left %}
-<li class="nav-item">
-    <a class="nav-link active" id="unread-tab" data-bs-toggle="tab" data-bs-target="#unread" type="button" role="tab" aria-controls="unread" aria-selected="true">
-        {% translate "Unread" %}
-        <span class="badge bg-secondary">{{ unread|length }}</span>
-    </a>
-</li>
-<li class="nav-item">
-    <a class="nav-link" id="read-tab" data-bs-toggle="tab" data-bs-target="#read" type="button" role="tab" aria-controls="read" aria-selected="false">
-        {% translate "Read" %}
-        <span class="badge bg-secondary">{{ read|length }}</span>
-    </a>
-</li>
+    <li class="nav-item">
+        <a class="nav-link active" id="unread-tab" data-bs-toggle="tab" data-bs-target="#unread" type="button" role="tab" aria-controls="unread" aria-selected="true">
+            {% translate "Unread" %}
+            <span class="badge bg-secondary">{{ unread|length }}</span>
+        </a>
+    </li>
+
+    <li class="nav-item">
+        <a class="nav-link" id="read-tab" data-bs-toggle="tab" data-bs-target="#read" type="button" role="tab" aria-controls="read" aria-selected="false">
+            {% translate "Read" %}
+            <span class="badge bg-secondary">{{ read|length }}</span>
+        </a>
+    </li>
 {% endblock %}
+
 {% block header_nav_collapse_right %}
-<li class="nav-item">
-    <a href="{% url 'notifications:mark_all_read' %}" class="nav-link">
-        <i class="fas fa-check-double"></i>
-    </a>
-</li>
-<li class="nav-item">
-    <a href="{% url 'notifications:delete_all_read' %}" class="nav-link">
-        <i class="fas fa-trash"></i>
-    </a>
-</li>
+    <li class="nav-item">
+        <a href="{% url 'notifications:mark_all_read' %}" class="nav-link" title="{% translate 'Mark all notifications as read' %}">
+            <i class="fa-solid fa-check-double"></i>
+        </a>
+    </li>
+
+    <li class="nav-item">
+        <a href="{% url 'notifications:delete_all_read' %}" class="nav-link" title="{% translate 'Delete all read notifications' %}">
+            <i class="fa-solid fa-trash-can"></i>
+        </a>
+    </li>
 {% endblock %}
+
 {% block content %}
     <div class="tab-content">
-        <div class="tab-pane active" id="unread">
+        <div class="tab-pane fade active show" id="unread">
             {% include "notifications/list_partial.html" with notifications=unread %}
         </div>
 

allianceauth/notifications/templates/notifications/list_partial.html

@@ -3,25 +3,27 @@
 {% if notifications %}
     <table class="table table-striped">
         <tr>
-            <th class="text-center">{% translate "Timestamp" %}</th>
-            <th class="text-center">{% translate "Title" %}</th>
-            <th class="text-center">{% translate "Action" %}</th>
+            <th>{% translate "Timestamp" %}</th>
+            <th>{% translate "Title" %}</th>
+            <th class="text-end">{% translate "Action" %}</th>
         </tr>
+
         {% for notif in notifications %}
-            <tr class="{{ notif.level }}">
-                <td class="text-center">{{ notif.timestamp }}</td>
-                <td class="text-center">{{ notif.title }}</td>
-                <td class="text-center">
-                    <a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary" title="View">
-                        <span class="fas fa-eye"></span>
+            <tr class="table-{{ notif.level }}">
+                <td>{{ notif.timestamp }}</td>
+                <td>{{ notif.title }}</td>
+                <td class="text-end">
+                    <a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary btn-sm" title="View">
+                        <span class="fa-solid fa-eye"></span>
                     </a>
-                    <a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger" title="Remove">
-                        <span class="fas fa-trash"></span>
+
+                    <a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger btn-sm" title="Remove">
+                        <span class="fa-solid fa-trash-can"></span>
                     </a>
                 </td>
             </tr>
         {% endfor %}
     </table>
 {% else %}
-    <div class="alert alert-default text-center">{% translate "No notifications." %}</div>
+    <div class="alert alert-info">{% translate "No notifications." %}</div>
 {% endif %}

allianceauth/notifications/templates/notifications/view.html

@@ -1,25 +1,29 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
 {% load i18n %}
 
-{% block page_title %}{% translate "View Notification" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "View Notification" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "View Notification" %}
+{% endblock %}
 
 {% block content %}
-    <h1 class="page-header text-center">
-        {% translate "View Notification" %}
-        <div class="text-end">
-            <a href="{% url 'notifications:list' %}" class="btn btn-primary btn-lg">
-                <span class="glyphicon glyphicon-arrow-left"></span>
-            </a>
-        </div>
-    </h1>
-
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="panel panel-{{ notif.level }}">
-                <div class="panel-heading">{{ notif.timestamp }} {{ notif.title }}</div>
-                <div class="panel-body"><pre>{{ notif.message }}</pre></div>
-            </div>
-        </div>
+    <div class="text-end mb-4">
+        <a href="{% url 'notifications:list' %}" class="btn btn-primary">
+            <i class="fa-solid fa-arrow-left"></i>
+        </a>
     </div>
 
+    <div class="card border-{{ notif.level }}">
+        <div class="card-header bg-{{ notif.level }}">
+            {{ notif.timestamp }}
+            {{ notif.title }}
+        </div>
+
+        <div class="card-body">
+            <pre>{{ notif.message }}</pre>
+        </div>
+    </div>
 {% endblock %}