diff --git a/README.md b/README.md
index 1b4232ea..31557bc5 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
# Alliance Auth
-[](https://pypi.org/project/allianceauth/)
-[](https://pypi.org/project/allianceauth/)
-[](https://pypi.org/project/allianceauth/)
-[](https://pypi.org/project/allianceauth/)
-[](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[](https://pypi.org/project/allianceauth/)
+[](https://pypi.org/project/allianceauth/)
+[](https://pypi.org/project/allianceauth/)
+[](https://pypi.org/project/allianceauth/)
+[](https://gitlab.com/allianceauth/allianceauth/commits/master)
[](https://allianceauth.readthedocs.io/?badge=latest)
-[](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[](https://gitlab.com/allianceauth/allianceauth/commits/master)
[](https://discord.gg/fjnHAmk)
-An auth system for EVE Online to help in-game organizations manage online service access.
+A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.
## Content
@@ -22,17 +22,17 @@ An auth system for EVE Online to help in-game organizations manage online servic
## Overview
-Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.
Main features:
-- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
- Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.
-- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
-- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
- Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
@@ -42,9 +42,15 @@ For further details about AA - including an installation guide and a full list o
## Screenshot
-Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
+Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:
-
+### Flatly Theme
+
+
+
+### Darkly Theme
+
+
## Support
diff --git a/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html b/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
index d322bba4..b926917f 100644
--- a/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
+++ b/allianceauth/admin_status/templates/admin-status/celery_bar_partial.html
@@ -2,7 +2,7 @@
{% load admin_status %}
{% for notif in notifications %}
- {% if not notif.is_hidden %}
-
diff --git a/allianceauth/framework/api/user.py b/allianceauth/framework/api/user.py
index 1be7fbd4..5796c9e6 100644
--- a/allianceauth/framework/api/user.py
+++ b/allianceauth/framework/api/user.py
@@ -9,24 +9,39 @@ from allianceauth.authentication.models import CharacterOwnership
from allianceauth.eveonline.models import EveCharacter
-def get_all_characters_from_user(user: User) -> list:
+def get_all_characters_from_user(user: User, main_first: bool = False) -> list:
"""
- Get all characters from a user or an empty list
- when no characters are found for the user or the user is None
+ Get all characters from a user
+ This function retrieves all characters associated with a given user, optionally ordering them
+ with the main character first.
+ If the user is None, an empty list is returned.
- :param user:
- :type user:
- :return:
- :rtype:
+ :param user: The user whose characters are to be retrieved
+ :type user: User
+ :param main_first: If True, the main character will be listed first
+ :type main_first: bool
+ :return: A list of EveCharacter objects associated with the user
+ :rtype: list[EveCharacter]
"""
if user is None:
return []
try:
- characters = [
- char.character for char in CharacterOwnership.objects.filter(user=user)
- ]
+ if main_first:
+ characters = [
+ char.character
+ for char in CharacterOwnership.objects.filter(user=user).order_by(
+ "-character__userprofile", "character__character_name"
+ )
+ ]
+ else:
+ characters = [
+ char.character
+ for char in CharacterOwnership.objects.filter(user=user).order_by(
+ "character__character_name"
+ )
+ ]
except AttributeError:
return []
diff --git a/allianceauth/framework/apps.py b/allianceauth/framework/apps.py
index 77264525..7942d437 100644
--- a/allianceauth/framework/apps.py
+++ b/allianceauth/framework/apps.py
@@ -3,6 +3,7 @@ Framework App Config
"""
from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
class FrameworkConfig(AppConfig):
@@ -12,3 +13,4 @@ class FrameworkConfig(AppConfig):
name = "allianceauth.framework"
label = "framework"
+ verbose_name = _("Framework")
diff --git a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
index defc5a09..628c76ec 100644
--- a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
+++ b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
@@ -5,6 +5,24 @@
* to be used throughout Alliance Auth and its Community Apps
*/
+/* General
+------------------------------------------------------------------------------------- */
+@media all {
+ .navbar-toggler.collapsed {
+ transform: rotate(180deg);
+ }
+
+ ul#nav-right:has(li) + ul#nav-right-character-control > li:first-child {
+ display: list-item !important;
+ }
+}
+
+@media all and (max-width: 991px) {
+ ul#nav-left:has(li) + ul#nav-right + ul#nav-right-character-control > li:first-child {
+ display: list-item !important;
+ }
+}
+
/* Bootstrap fixes
------------------------------------------------------------------------------------- */
@media all {
diff --git a/allianceauth/framework/staticfiles/storage.py b/allianceauth/framework/staticfiles/storage.py
new file mode 100644
index 00000000..c0dae084
--- /dev/null
+++ b/allianceauth/framework/staticfiles/storage.py
@@ -0,0 +1,105 @@
+"""
+Custom static files storage for Alliance Auth.
+
+This module defines a custom static files storage class for
+Alliance Auth, named `AaManifestStaticFilesStorage`.
+
+Using `ManifestStaticFilesStorage` will give us a hashed name for
+our static files, which is useful for cache busting.
+
+This storage class extends Django's `ManifestStaticFilesStorage` to ignore missing files,
+which the original class does not handle, and log them in debug mode.
+It is useful for handling cases where static files may not exist, such as when a
+CSS file references a background image that is not present in the static files directory.
+
+With debug mode enabled, it will print a message for each missing file when running `collectstatic`,
+which can help identify issues with static file references during development.
+"""
+
+from django.conf import settings
+from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
+
+
+class AaManifestStaticFilesStorage(ManifestStaticFilesStorage):
+ """
+ Custom static files storage that ignores missing files.
+ """
+
+ @classmethod
+ def _cleanup_name(cls, name: str) -> str:
+ """
+ Clean up the name by removing quotes.
+ This method is used to ensure that the name does not contain any quotes,
+ which can cause issues with file paths.
+
+ :param name: The name of the static file.
+ :type name: str
+ :return: The cleaned-up name without quotes.
+ :rtype: str
+ """
+
+ # Remove quotes from the name
+ return name.replace('"', "").replace("'", "")
+
+ def __init__(self, *args, **kwargs):
+ """
+ Initialize the static files storage, ignoring missing files.
+
+ :param args:
+ :type args:
+ :param kwargs:
+ :type kwargs:
+ """
+
+ self.missing_files = []
+
+ super().__init__(*args, **kwargs)
+
+ def hashed_name(self, name, content=None, filename=None):
+ """
+ Generate a hashed name for the given static file, ignoring missing files.
+
+ Ignore missing files, e.g. non-existent background image referenced from css.
+ Returns the original filename if the referenced file doesn't exist.
+
+ :param name: The name of the static file to hash.
+ :type name: str
+ :param content: The content of the static file, if available.
+ :type content: bytes | None
+ :param filename: The original filename of the static file, if available.
+ :type filename: str | None
+ :return: The hashed name of the static file, or the original name if the file is missing.
+ :rtype: str
+ """
+
+ try:
+ clean_name = self._cleanup_name(name)
+
+ return super().hashed_name(clean_name, content, filename)
+ except ValueError as e:
+ if settings.DEBUG:
+ # In debug mode, we log the missing file message
+ message = e.args[0].split(" with ")[0]
+ self.missing_files.append(message)
+ # print(f'\x1b[0;30;41m{message}\x1b[0m')
+
+ return name
+
+ def post_process(self, *args, **kwargs):
+ """
+ Post-process the static files, printing any missing files in debug mode.
+
+ :param args:
+ :type args:
+ :param kwargs:
+ :type kwargs:
+ :return:
+ :rtype:
+ """
+
+ yield from super().post_process(*args, **kwargs)
+
+ if settings.DEBUG:
+ # In debug mode, print the missing files
+ for message in sorted(set(self.missing_files)):
+ print(f"\x1b[0;30;41m{message}\x1b[0m")
diff --git a/allianceauth/framework/templates/framework/header/page-header.html b/allianceauth/framework/templates/framework/header/page-header.html
index d84868c2..dd8330b4 100644
--- a/allianceauth/framework/templates/framework/header/page-header.html
+++ b/allianceauth/framework/templates/framework/header/page-header.html
@@ -2,12 +2,14 @@
{# {% include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}
{% if title %}
-
- {{ title }}
+
+
+ {{ title }}
- {% if subtitle %}
-
- {{ subtitle }}
- {% endif %}
-