Merge branch 'user-agents' into 'master'

Proposal: User-Agent Consistency See merge request allianceauth/allianceauth!1658
Merge branch 'bootstrap-class-fixes' into 'master'
2025-07-20 17:52:30 +02:00 · 2025-05-06 21:06:48 +00:00 · 2025-05-06 02:03:56 +00:00 · 2025-05-06 02:03:50 +00:00 · 2025-05-06 02:03:44 +00:00 · 2025-05-05 01:49:40 +02:00
31 changed files with 102 additions and 79 deletions
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@ -31,7 +31,7 @@
                    <tr>
                        <td style="white-space:initial;">
                            {% for s in t.scopes.all %}
-                                <span class="badge bg-secondary">{{ s.name }}</span>
+                                <span class="badge text-bg-secondary">{{ s.name }}</span>
                            {% endfor %}
                        </td>

--- a/allianceauth/corputils/models.py
+++ b/allianceauth/corputils/models.py
@ -9,10 +9,13 @@ from esi.errors import TokenError
 from esi.models import Token
 from allianceauth.eveonline.models import EveCorporationInfo, EveCharacter, EveAllianceInfo
 from allianceauth.notifications import notify
-
+from allianceauth import __version__
+from esi import __version__ as esi__version__
 from allianceauth.corputils.managers import CorpStatsManager

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+APP_INFO_TEXT = f"allianceauth/{__version__} django-esi/{esi__version__}"
+
 """
 Swagger spec operations:

@ -48,7 +51,7 @@ class CorpStats(models.Model):

    def update(self):
        try:
-            c = self.token.get_esi_client(spec_file=SWAGGER_SPEC_PATH)
+            c = self.token.get_esi_client(spec_file=SWAGGER_SPEC_PATH, app_info_text=APP_INFO_TEXT)
            assert c.Character.get_characters_character_id(character_id=self.token.character_id).result()['corporation_id'] == int(self.corp.corporation_id)
            member_ids = c.Corporation.get_corporations_corporation_id_members(
                corporation_id=self.corp.corporation_id).result()
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@ -138,7 +138,7 @@
                                                                <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">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                                        {% translate "Killboard" %}
                                                                    </a>
                                                                </td>
@ -175,7 +175,7 @@
                                                <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>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-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>
@ -188,7 +188,7 @@
                                                <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>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                </td>
                                                <td></td>
                                                <td></td>
@ -219,7 +219,7 @@
                                                <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">
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                        {% translate "Killboard" %}
                                                    </a>
                                                </td>
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@ -28,7 +28,7 @@
                            <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><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-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>
--- a/allianceauth/corputils/views.py
+++ b/allianceauth/corputils/views.py
@ -9,10 +9,14 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 from esi.decorators import token_required
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
+from allianceauth import __version__
+from esi import __version__ as esi__version__

 from .models import CorpStats, CorpMember

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+APP_INFO_TEXT = f"allianceauth/{__version__} django-esi/{esi__version__}"
+
 """
 Swagger spec operations:

@ -36,7 +40,7 @@ def corpstats_add(request, token):
            corp_id = EveCharacter.objects.get(character_id=token.character_id).corporation_id
        else:
            corp_id = \
-                token.get_esi_client(spec_file=SWAGGER_SPEC_PATH).Character.get_characters_character_id(
+                token.get_esi_client(spec_file=SWAGGER_SPEC_PATH, app_info_text=APP_INFO_TEXT).Character.get_characters_character_id(
                    character_id=token.character_id).result()['corporation_id']
        try:
            corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
--- a/allianceauth/eveonline/providers.py
+++ b/allianceauth/eveonline/providers.py
@ -8,8 +8,10 @@ from django.conf import settings
 from esi.clients import esi_client_factory

 from allianceauth import __version__
+from esi import __version__ as esi__version__
 from allianceauth.utils.django import StartupCommand

+APP_INFO_TEXT = f"allianceauth.eveonline/{__version__} allianceauth/{__version__} django-esi/{esi__version__}"

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(
    os.path.abspath(__file__)), 'swagger.json'
@ -185,7 +187,7 @@ class EveSwaggerProvider(EveProvider):
                self._client = esi_client_factory(
                    token=token,
                    spec_file=SWAGGER_SPEC_PATH,
-                    app_info_text=f"allianceauth v{__version__}"
+                    app_info_text=APP_INFO_TEXT
                )
            except (HTTPError, RefResolutionError):
                logger.exception(
@ -202,7 +204,7 @@ class EveSwaggerProvider(EveProvider):
    def client(self):
        if self._client is None:
            self._client = esi_client_factory(
-                token=self._token, spec_file=SWAGGER_SPEC_PATH, app_info_text=("allianceauth v" + __version__)
+                token=self._token, spec_file=SWAGGER_SPEC_PATH, app_info_text=APP_INFO_TEXT
            )
        return self._client

--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@ -80,7 +80,7 @@
                        {% for link in created_fats %}
                            <tr>
                                <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">
                                        {{ link.fleet }}
                                    </a>
                                </td>
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@ -97,7 +97,7 @@
                        {% for link in fatlinks %}
                            <tr>
                                <td class="text-center">
-                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge bg-primary">{{ link.fleet }}</a>
+                                    <a href="{% url 'fatlink:click' link.hash %}" class="badge text-bg-primary">{{ link.fleet }}</a>
                                </td>
                                <td class="text-center">{{ link.creator.username }}</td>
                                <td class="text-center">{{ link.fleet }}</td>
--- a/allianceauth/fleetactivitytracking/views.py
+++ b/allianceauth/fleetactivitytracking/views.py
@ -16,12 +16,16 @@ from allianceauth.eveonline.providers import provider
 from .forms import FatlinkForm
 from .models import Fatlink, Fat
 from django.utils.crypto import get_random_string
+from allianceauth import __version__
+from esi import __version__ as esi__version__

 from allianceauth.eveonline.models import EveAllianceInfo
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.eveonline.models import EveCorporationInfo

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+APP_INFO_TEXT = f"allianceauth/{__version__} django-esi/{esi__version__}"
+
 """
 Swagger spec operations:

@ -256,7 +260,7 @@ def fatlink_monthly_personal_statistics_view(request, year, month, char_id=None)
    ]
 )
 def click_fatlink_view(request, token, fat_hash=None):
-    c = token.get_esi_client(spec_file=SWAGGER_SPEC_PATH)
+    c = token.get_esi_client(spec_file=SWAGGER_SPEC_PATH, app_info_text=APP_INFO_TEXT)
    character = EveCharacter.objects.get_character_by_id(token.character_id)
    character_online = c.Location.get_characters_character_id_online(
        character_id=token.character_id
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@ -39,12 +39,12 @@

                            <td>
                                {% if group.authgroup.hidden %}
-                                    <span class="badge bg-info">{% translate "Hidden" %}</span>
+                                    <span class="badge text-bg-info">{% translate "Hidden" %}</span>
                                {% endif %}
                                {% if group.authgroup.open %}
-                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                    <span class="badge text-bg-success">{% translate "Open" %}</span>
                                {% else %}
-                                    <span class="badge bg-secondary">{% translate "Requestable" %}</span>
+                                    <span class="badge text-bg-secondary">{% translate "Requestable" %}</span>
                                {% endif %}
                            </td>

--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@ -17,7 +17,7 @@
        <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>
+                    <span class="badge text-bg-secondary">{{ req_count }}</span>
                {% endif %}
            </a>
        </li>
@ -33,8 +33,8 @@
                    <th>{% translate "Description" %}</th>
                    <th>
                        {% translate "Leaders" %}<br>
-                        <span class="my-1 me-1 fw-lighter badge bg-primary">{% translate "User" %}</span>
-                        <span class="my-1 me-1 fw-lighter badge bg-secondary">{% translate "Group" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-primary">{% translate "User" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge text-bg-secondary">{% translate "Group" %}</span>
                    </th>
                    <th></th>
                </tr>
@ -53,13 +53,13 @@
                            {% if g.group.authgroup.group_leaders.all.count %}
                                {% for leader in g.group.authgroup.group_leaders.all %}
                                    {% if leader.profile.main_character %}
-                                        <span class="my-1 me-1 badge bg-primary">{{leader.profile.main_character}}</span>
+                                        <span class="my-1 me-1 badge text-bg-primary">{{leader.profile.main_character}}</span>
                                    {% endif %}
                                {% endfor %}
                            {% endif %}
                            {% if g.group.authgroup.group_leader_groups.all.count %}
                                {% for group in g.group.authgroup.group_leader_groups.all %}
-                                    <span class="my-1 me-1 badge bg-secondary">{{group.name}}</span>
+                                    <span class="my-1 me-1 badge text-bg-secondary">{{group.name}}</span>
                                {% endfor %}
                            {% endif %}
                        </td>
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@ -19,7 +19,7 @@
            {% translate "Join Requests" %}

            {% if acceptrequests %}
-                <span class="badge bg-secondary">{{ acceptrequests|length }}</span>
+                <span class="badge text-bg-secondary">{{ acceptrequests|length }}</span>
            {% endif %}
        </a>
    </li>
@ -30,7 +30,7 @@
                {% translate "Leave Requests" %}

                {% if leaverequests %}
-                    <span class="badge bg-secondary">{{ leaverequests|length }}</span>
+                    <span class="badge text-bg-secondary">{{ leaverequests|length }}</span>
                {% endif %}
            </a>
        </li>
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@ -43,11 +43,11 @@
                                <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>
+                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                    {% elif personal_app.approved == True %}
-                                        <div class="badge bg-success">{% translate "Approved" %}</div>
+                                        <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                    {% else %}
-                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                        <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                    {% endif %}
                                </td>
                                <td class="text-center">
@ -133,14 +133,14 @@
                                            <td class="text-center">
                                                {% if app.approved == None %}
                                                    {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                    {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
                                                {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                {% endif %}
                                            </td>
                                            <td class="text-center">
@ -177,14 +177,14 @@
                                            <td class="text-center">
                                                {% if app.approved == None %}
                                                    {% if app.reviewer_str %}
-                                                        <div class="badge bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                        <div class="badge text-bg-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                    {% else %}
-                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                                        <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
                                                {% elif app.approved == True %}
-                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                                {% else %}
-                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                                {% endif %}
                                            </td>
                                            <td class="text-center">
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@ -43,11 +43,11 @@
                            <td>{{ app.form.corp }}</td>
                            <td class="text-center">
                                {% if app.approved == None %}
-                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
+                                    <div class="badge text-bg-warning">{% translate "Pending" %}</div>
                                {% elif app.approved == True %}
-                                    <div class="badge bg-success">{% translate "Approved" %}</div>
+                                    <div class="badge text-bg-success">{% translate "Approved" %}</div>
                                {% else %}
-                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
+                                    <div class="badge text-bg-danger">{% translate "Rejected" %}</div>
                                {% endif %}
                            </td>
                            <td class="text-end">
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@ -31,7 +31,7 @@
        </div>

        <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                <div class="card-title mb-0">{% translate "Applicant" %}</div>
            </div>

@ -50,7 +50,7 @@
        </div>

        <div class="card mb-3">
-            <div class="card-header bg-info">
+            <div class="card-header text-bg-info">
                <div class="card-title mb-0">{% translate "Characters" %}</div>
            </div>

--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@ -27,7 +27,7 @@
    </a>

    {% if item.count >= 1 %}
-        <span class="badge bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
+        <span class="badge text-bg-primary m-2 align-self-center{% if not item.is_folder %} me-2{% endif %}">
            {{ item.count }}
        </span>
    {% elif item.url %}
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@ -5,7 +5,7 @@
 <div class="col-auto px-0">
    <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
        <div>
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark text-bg-dark px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                {% if user.is_authenticated %}
                    <ul 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">
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@ -15,14 +15,14 @@
    <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>
+            <span class="badge text-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>
+            <span class="badge text-bg-secondary">{{ read|length }}</span>
        </a>
    </li>
 {% endblock %}
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@ -17,7 +17,7 @@
    </div>

    <div class="card border-{{ notif.level }}">
-        <div class="card-header bg-{{ notif.level }}">
+        <div class="card-header text-bg-{{ notif.level }}">
            {{ notif.timestamp }}
            {{ notif.title }}
        </div>
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@ -24,7 +24,7 @@
 {% block content %}
    <div>
        <div class="text-center mb-3">
-            <div class="badge bg-primary text-start">
+            <div class="badge text-bg-primary text-start">
                <b>{% translate "Current EVE time:" %}</b>
                <span id="current-time"></span>
            </div>
--- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
+++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html
@ -14,7 +14,7 @@
 {% endblock %}

 {% block active %}
-    <span class="badge bg-success">
+    <span class="badge text-bg-success">
        {% translate "SSO login active" %}
    </span>
 {% endblock %}
--- a/allianceauth/srp/providers.py
+++ b/allianceauth/srp/providers.py
@ -2,9 +2,10 @@ import os
 from esi.clients import EsiClientProvider

 from allianceauth import __version__
+from esi import __version__ as esi__version__

 SWAGGER_SPEC = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
-
+APP_INFO_TEXT = f"allianceauth/{__version__} django-esi/{esi__version__}"
 """
 Swagger spec operations:
 get_killmails_killmail_id_killmail_hash
@ -14,5 +15,5 @@ get_universe_types_type_id

 esi = EsiClientProvider(
    spec_file=SWAGGER_SPEC,
-    app_info_text=("allianceauth v" + __version__)
+    app_info_text=APP_INFO_TEXT
 )
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@ -92,11 +92,14 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                        {{ srpfleetrequest.character.alliance.alliance_ticker }}
                                    {% endif %}
                                    [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
-                                    {{ srpfleetrequest.character.character_name }}&nbsp;<i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                    {{ srpfleetrequest.character.character_name }}&nbsp;
+                                    <sup>
+                                        <i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                    </sup>
                                </td>
                                <td>
                                    <a href="{{ srpfleetrequest.killboard_link }}"
-                                    target="_blank" class="badge bg-warning">{% translate "Link" %}</a>
+                                    target="_blank" class="badge text-bg-warning">{% translate "Link" %}</a>
                                </td>
                                <td>{{ srpfleetrequest.additional_info }}</td>
                                <td>{{ srpfleetrequest.srp_ship_name }}</td>
@ -105,15 +108,15 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                <td data-sort="{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}">{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }}</td>
                                <td>
                                    {% if srpfleetrequest.srp_status == "Approved" %}
-                                        <div class="badge bg-success">
+                                        <div class="badge text-bg-success">
                                            {% translate "Approved" %}
                                        </div>
                                    {% elif srpfleetrequest.srp_status == "Rejected" %}
-                                        <div class="badge bg-danger">
+                                        <div class="badge text-bg-danger">
                                            {% translate "Rejected" %}
                                        </div>
                                    {% else %}
-                                        <div class="badge bg-warning">
+                                        <div class="badge text-bg-warning">
                                            {% translate "Pending" %}
                                        </div>
                                    {% endif %}
@ -239,13 +242,19 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                }
            });

+            // Non-Orderable columns
+            const nonOrderableTargets = [1];
+            {% if perms.auth.srp_management %}
+                nonOrderableTargets.push(8);
+            {% endif %}
+
            elementTableSrpList.DataTable({
                language: {url: '{{ DT_LANG_PATH }}'},
                "order": [[ 6, "asc" ]],
                "paging": false,
                "columnDefs": [
                    {
-                        "targets": [1, 8],
+                        "targets": nonOrderableTargets,
                        "orderable": false
                    },
                    {
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@ -61,20 +61,20 @@
                            <td>{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
                            <td>{{ srpfleet.fleet_doctrine }}</td>
                            <td>
-                                <div class="badge bg-success">
+                                <div class="badge text-bg-success">
                                    {{ srpfleet.fleet_commander.character_name }}
                                </div>
                            </td>
                            <td>
                                {% if srpfleet.fleet_srp_aar_link %}
-                                    <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge bg-primary">{% translate "Link" %}</a>
+                                    <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge text-bg-primary">{% translate "Link" %}</a>
                                {% endif %}
                            </td>
                            <td>
                                {% if srpfleet.fleet_srp_code %}
-                                    <a class="badge bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                                    <a class="badge text-bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
                                {% else %}
-                                    <div class="badge bg-danger">
+                                    <div class="badge text-bg-danger">
                                        {% translate "Disabled" %}
                                    </div>
                                {% endif %}
@ -83,17 +83,17 @@

                            <td>
                                {% if srpfleet.fleet_srp_status == "" %}
-                                    <div class="badge bg-warning">
+                                    <div class="badge text-bg-warning">
                                        {% translate "Pending" %}
                                    </div>
                                {% else %}
-                                    <div class="badge bg-success">
+                                    <div class="badge text-bg-success">
                                        {% translate "Completed" %}
                                    </div>
                                {% endif %}
                            </td>
                            <td>
-                                <div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
+                                <div class="badge text-bg-warning">{{ srpfleet.pending_requests }}</div>
                            </td>
                            <td class="text-end text-nowrap">
                                <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary btn-sm m-1" title="View">
--- a/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
+++ b/allianceauth/templates/allianceauth/admin-status/celery_bar_partial.html
@ -2,7 +2,7 @@
 {% load admin_status %}

 <div
-    class="progress-bar bg-{{ level }} task-status-progress-bar"
+    class="progress-bar text-bg-{{ level }} task-status-progress-bar"
    role="progressbar"
    aria-valuenow="{% decimal_widthratio tasks_count tasks_total 100 %}"
    aria-valuemin="0"
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@ -12,7 +12,7 @@
                    <ul class="list-group">
                        {% for notif in notifications %}
                            <li class="list-group-item">
-                                <span class="badge bg-success me-2">{% translate "Open" %}</span>
+                                <span class="badge text-bg-success me-2">{% translate "Open" %}</span>
                                <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
                            </li>
                        {% empty %}
@ -24,13 +24,13 @@

                    <div class="text-end pt-3">
                        <a href="https://gitlab.com/allianceauth/allianceauth/issues" target="_blank" class="me-1 text-decoration-none">
-                            <span class="badge" style="background-color: rgb(230 83 40);">
+                            <span class="badge text-bg-danger">
                                <i class="fab fa-gitlab" aria-hidden="true"></i>
                                {% translate 'Powered by GitLab' %}
                            </span>
                        </a>
                        <a href="https://discord.com/invite/fjnHAmk" target="_blank" class="text-decoration-none">
-                            <span class="badge" style="background-color: rgb(110 133 211);">
+                            <span class="badge text-bg-info">
                                <i class="fab fa-discord" aria-hidden="true"></i>
                                {% translate 'Support Discord' %}
                            </span>
@ -58,7 +58,7 @@
                            </div>
                        </li>

-                        <li class="list-group-item bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
+                        <li class="list-group-item text-bg-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %} w-100">
                            <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_patch_version }}">
                                <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>

@ -71,7 +71,7 @@
                        </li>

                        {% if latest_beta %}
-                            <li class="list-group-item bg-info w-100">
+                            <li class="list-group-item text-bg-info w-100">
                                <a class="btn h-100 w-100" href="https://gitlab.com/allianceauth/allianceauth/-/releases/v{{ latest_beta_version }}">
                                    <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>

--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@ -39,7 +39,7 @@

    <body>
        <!-- Top Menu, Blocks don't work in "include" tagged views -->
-        <nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-primary">
+        <nav class="navbar navbar-expand-lg navbar-dark fixed-top text-bg-primary">
            <div class="container-fluid justify-content-start">
                <a class="navbar-brand" data-bs-toggle="collapse" data-bs-target="#sidebar" role="button">
                    <i class="fa-solid fa-bars ms-2 me-2"></i>
--- a/allianceauth/templates/allianceauth/top-menu-rh-default.html
+++ b/allianceauth/templates/allianceauth/top-menu-rh-default.html
@ -2,7 +2,7 @@
 {% if user.is_authenticated %}
 <li class="nav-item">
    <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}">
-        <i class="fa-solid fa-plus"></i>
+        <i class="fa-solid fa-user-plus"></i>
        <span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span>
    </a>
 </li>
--- a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
+++ b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
@ -30,17 +30,17 @@
                                </td>
                                <td class="text-center" nowrap>
                                    {% if timer.objective == "Hostile" %}
-                                        <div class="badge bg-danger">
+                                        <div class="badge text-bg-danger">
                                            {% translate "Hostile" %}
                                        </div>
                                    {% endif %}
                                    {% if timer.objective == "Friendly" %}
-                                        <div class="badge bg-primary">
+                                        <div class="badge text-bg-primary">
                                            {% translate "Friendly" %}
                                        </div>
                                    {% endif %}
                                    {% if timer.objective == "Neutral" %}
-                                        <div class="badge bg-secondary">
+                                        <div class="badge text-bg-secondary">
                                            {% translate "Neutral" %}
                                        </div>
                                    {% endif %}
--- a/allianceauth/timerboard/templates/timerboard/timertable.html
+++ b/allianceauth/timerboard/templates/timerboard/timertable.html
@ -21,7 +21,7 @@

        <tbody>
            {% for timer in timers %}
-                <tr class="{% if timer.important == True %}bg-danger bg-opacity-25{% else %}bg-info bg-opacity-25{% endif %}">
+                <tr class="{% if timer.important == True %}text-bg-danger bg-opacity-50{% else %}text-bg-info bg-opacity-50{% endif %}">
                    <td style="width: 150px;" class="text-center">
                        {{ timer.details }}

@ -34,15 +34,15 @@
                    <td class="text-center">
                        {% comment %} Objective: Hostile (BG: Danger) {% endcomment %}
                        {% if timer.objective == "Hostile" %}
-                            <div class="badge bg-danger">
+                            <div class="badge text-bg-danger">

                        {% comment %} Objective: Friendly (BG: Primare) {% endcomment %}
                        {% elif timer.objective == "Friendly" %}
-                            <div class="badge bg-primary">
+                            <div class="badge text-bg-primary">

                        {% comment %} Objective: Neutral (BG: Secondary) {% endcomment %}
                        {% elif timer.objective == "Neutral" %}
-                            <div class="badge bg-secondary">
+                            <div class="badge text-bg-secondary">
                        {% endif %}

                            {{ timer.get_objective_display }}
@ -54,7 +54,7 @@
                    </td>

                    <td class="text-center">
-                        <div class="badge bg-{{ timer.bg_modifier }}">
+                        <div class="badge text-bg-{{ timer.bg_modifier }}">
                            {{ timer.get_structure_display }}
                        </div>
                    </td>
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@ -28,7 +28,7 @@
 {% block content %}
    <div class="allianceauth-timerboard">
        <div class="col-lg-12 text-center mb-3">
-            <div class="badge bg-primary text-start">
+            <div class="badge text-bg-primary text-start">
                <span>{% translate "Current EVE time:" %}</span>
                <span id="current-time"></span>
            </div>
Author	SHA1	Message	Date
Ariel Rin	693eedf577	Merge branch 'user-agents' into 'master' Proposal: User-Agent Consistency See merge request allianceauth/allianceauth!1658	2025-05-06 21:06:48 +00:00
Ariel Rin	54910746e3	Merge branch 'bootstrap-class-fixes' into 'master' [FIX] BG color classes See merge request allianceauth/allianceauth!1716	2025-05-06 02:03:56 +00:00
Ariel Rin	07ae68333d	Merge branch 'improve-add-character-icon' into 'master' [CHANGE] Better "Add Character" Icon See merge request allianceauth/allianceauth!1720	2025-05-06 02:03:50 +00:00
Ariel Rin	69e70a4c9b	Merge branch '1426-fix-srp-datatable-warning' into 'master' [FIX] SRP Datatable Warning about incorrect column count Closes #1426 See merge request allianceauth/allianceauth!1721	2025-05-06 02:03:44 +00:00
Peter Pfeufer	b55f11ee74	[FIX] SRP Datatable Warning about incorrect column count This was triggered by an incorrect column count due to missing permissions, or not taking missing permissions into account when loading the page and setting up the non-orderable columns. Fixes #1426	2025-05-05 01:49:40 +02:00
Peter Pfeufer	94ee3c0203	[CHANGE] Better "Add Character" Icon	2025-05-02 01:06:26 +02:00
Peter Pfeufer	25cf329a50	[FIX] BG color classes Use `text-bg-` instead of just `bg-` to make use of Bootstraps native text color selection for those backgrounds.	2025-04-29 07:39:11 +02:00
Joel Falknau	d89639e873	unify user-agents	2024-10-21 12:46:23 +10:00