From 004100091f18b2b70871f51463fe50333127cff4 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 14:01:32 +0200 Subject: [PATCH] Moved `authentication` and `services` into `allianceauth` folder --- allianceauth/authentication/admin.py | 4 ++-- .../{ => allianceauth}/authentication/css/admin.css | 0 .../authentication/img/background.jpg | Bin .../img/sso/EVE_SSO_Login_Buttons_Large_Black.png | Bin .../img/sso/EVE_SSO_Login_Buttons_Large_White.png | Bin .../authentication/templates/public/login.html | 2 +- allianceauth/services/admin.py | 2 +- .../static/{ => allianceauth}/services/admin.css | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename allianceauth/authentication/static/{ => allianceauth}/authentication/css/admin.css (100%) rename allianceauth/authentication/static/{ => allianceauth}/authentication/img/background.jpg (100%) rename allianceauth/authentication/static/{ => allianceauth}/authentication/img/sso/EVE_SSO_Login_Buttons_Large_Black.png (100%) rename allianceauth/authentication/static/{ => allianceauth}/authentication/img/sso/EVE_SSO_Login_Buttons_Large_White.png (100%) rename allianceauth/services/static/{ => allianceauth}/services/admin.css (100%) 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/authentication/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/authentication/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/authentication/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/authentication/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/public/login.html b/allianceauth/authentication/templates/public/login.html index aaff4ec2..0bffaab7 100644 --- a/allianceauth/authentication/templates/public/login.html +++ b/allianceauth/authentication/templates/public/login.html @@ -7,6 +7,6 @@ {% block middle_box_content %} - + {% endblock %} diff --git a/allianceauth/services/admin.py b/allianceauth/services/admin.py index e16bfc08..129105a2 100644 --- a/allianceauth/services/admin.py +++ b/allianceauth/services/admin.py @@ -17,7 +17,7 @@ class ServicesUserAdmin(admin.ModelAdmin): """Parent class for UserAdmin classes for all services""" class Media: css = { - "all": ("services/admin.css",) + "all": ("allianceauth/services/admin.css",) } search_fields = ('user__username',) diff --git a/allianceauth/services/static/services/admin.css b/allianceauth/services/static/allianceauth/services/admin.css similarity index 100% rename from allianceauth/services/static/services/admin.css rename to allianceauth/services/static/allianceauth/services/admin.css