diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12c00d2a..05faa270 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: rev: 2.4.0 hooks: - id: editorconfig-checker - exclude: ^(LICENSE|allianceauth\/static\/css\/themes\/bootstrap-locals.less|allianceauth\/eveonline\/swagger.json|(.*.po)|(.*.mo)) + exclude: ^(LICENSE|allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|allianceauth\/eveonline\/swagger.json|(.*.po)|(.*.mo)) - repo: https://github.com/asottile/pyupgrade rev: v2.34.0 diff --git a/allianceauth/authentication/admin.py b/allianceauth/authentication/admin.py index f39af894..80fd53bc 100644 --- a/allianceauth/authentication/admin.py +++ b/allianceauth/authentication/admin.py @@ -322,7 +322,7 @@ class UserAdmin(BaseUserAdmin): class Media: css = { - "all": ("authentication/css/admin.css",) + "all": ("allianceauth/authentication/css/admin.css",) } def get_queryset(self, request): @@ -542,7 +542,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin): class Media: css = { - "all": ("authentication/css/admin.css",) + "all": ("allianceauth/authentication/css/admin.css",) } def get_readonly_fields(self, request, obj=None): diff --git a/allianceauth/authentication/static/authentication/css/admin.css b/allianceauth/authentication/static/allianceauth/authentication/css/admin.css similarity index 100% rename from allianceauth/authentication/static/authentication/css/admin.css rename to allianceauth/authentication/static/allianceauth/authentication/css/admin.css diff --git a/allianceauth/authentication/static/authentication/img/background.jpg b/allianceauth/authentication/static/allianceauth/authentication/img/background.jpg similarity index 100% rename from allianceauth/authentication/static/authentication/img/background.jpg rename to allianceauth/authentication/static/allianceauth/authentication/img/background.jpg diff --git a/allianceauth/authentication/static/img/sso/EVE_SSO_Login_Buttons_Large_Black.png b/allianceauth/authentication/static/allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_Black.png similarity index 100% rename from allianceauth/authentication/static/img/sso/EVE_SSO_Login_Buttons_Large_Black.png rename to allianceauth/authentication/static/allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_Black.png diff --git a/allianceauth/authentication/static/img/sso/EVE_SSO_Login_Buttons_Large_White.png b/allianceauth/authentication/static/allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_White.png similarity index 100% rename from allianceauth/authentication/static/img/sso/EVE_SSO_Login_Buttons_Large_White.png rename to allianceauth/authentication/static/allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_White.png diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index 4d2fc049..6b404199 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Dashboard" %}{% endblock %} @@ -28,7 +27,7 @@ @@ -40,7 +39,7 @@
- +
@@ -53,7 +52,7 @@
- +
@@ -64,7 +63,7 @@
- +
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index 9ca3fc9c..dda3d966 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -7,7 +7,7 @@ - + {% include 'allianceauth/icons.html' %} @@ -21,7 +21,7 @@
- +