From cf49a2cb65725afb457e1a90d40cc58396f49826 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 13:30:32 +0200 Subject: [PATCH 1/7] Moved static files to their own directory --- .pre-commit-config.yaml | 2 +- .../static/{ => allianceauth}/css/auth-base.css | 0 .../static/{ => allianceauth}/css/checkbox.css | 0 .../css/themes/bootstrap-locals.less | 0 .../{ => allianceauth}/css/themes/darkly/LICENSE | 0 .../css/themes/darkly/darkly.less | 0 .../css/themes/darkly/darkly.min.css | 0 .../css/themes/flatly-shared.less | 0 .../{ => allianceauth}/css/themes/flatly/LICENSE | 0 .../css/themes/flatly/flatly.less | 0 .../css/themes/flatly/flatly.min.css | 0 .../{ => allianceauth}/icons/allianceauth.png | Bin .../{ => allianceauth}/icons/apple-touch-icon.png | Bin .../{ => allianceauth}/icons/favicon-16x16.png | Bin .../{ => allianceauth}/icons/favicon-32x32.png | Bin .../{ => allianceauth}/icons/favicon-96x96.png | Bin .../static/{ => allianceauth}/js/eve-time.js | 0 .../js/filterDropDown/filterDropDown.min.js | 0 .../1.12.1/css/images/ui-icons_444444_256x240.png | Bin .../1.12.1/css/images/ui-icons_555555_256x240.png | Bin .../1.12.1/css/images/ui-icons_777620_256x240.png | Bin .../1.12.1/css/images/ui-icons_777777_256x240.png | Bin .../1.12.1/css/images/ui-icons_cc0000_256x240.png | Bin .../1.12.1/css/images/ui-icons_ffffff_256x240.png | Bin .../js/jquery-ui/1.12.1/css/jquery-ui.min.css | 0 .../{ => allianceauth}/js/refresh_notifications.js | 0 allianceauth/static/{ => allianceauth}/js/timers.js | 0 27 files changed, 1 insertion(+), 1 deletion(-) rename allianceauth/static/{ => allianceauth}/css/auth-base.css (100%) rename allianceauth/static/{ => allianceauth}/css/checkbox.css (100%) rename allianceauth/static/{ => allianceauth}/css/themes/bootstrap-locals.less (100%) rename allianceauth/static/{ => allianceauth}/css/themes/darkly/LICENSE (100%) rename allianceauth/static/{ => allianceauth}/css/themes/darkly/darkly.less (100%) rename allianceauth/static/{ => allianceauth}/css/themes/darkly/darkly.min.css (100%) rename allianceauth/static/{ => allianceauth}/css/themes/flatly-shared.less (100%) rename allianceauth/static/{ => allianceauth}/css/themes/flatly/LICENSE (100%) rename allianceauth/static/{ => allianceauth}/css/themes/flatly/flatly.less (100%) rename allianceauth/static/{ => allianceauth}/css/themes/flatly/flatly.min.css (100%) rename allianceauth/static/{ => allianceauth}/icons/allianceauth.png (100%) rename allianceauth/static/{ => allianceauth}/icons/apple-touch-icon.png (100%) rename allianceauth/static/{ => allianceauth}/icons/favicon-16x16.png (100%) rename allianceauth/static/{ => allianceauth}/icons/favicon-32x32.png (100%) rename allianceauth/static/{ => allianceauth}/icons/favicon-96x96.png (100%) rename allianceauth/static/{ => allianceauth}/js/eve-time.js (100%) rename allianceauth/static/{ => allianceauth}/js/filterDropDown/filterDropDown.min.js (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png (100%) rename allianceauth/static/{ => allianceauth}/js/jquery-ui/1.12.1/css/jquery-ui.min.css (100%) rename allianceauth/static/{ => allianceauth}/js/refresh_notifications.js (100%) rename allianceauth/static/{ => allianceauth}/js/timers.js (100%) 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/static/css/auth-base.css b/allianceauth/static/allianceauth/css/auth-base.css similarity index 100% rename from allianceauth/static/css/auth-base.css rename to allianceauth/static/allianceauth/css/auth-base.css diff --git a/allianceauth/static/css/checkbox.css b/allianceauth/static/allianceauth/css/checkbox.css similarity index 100% rename from allianceauth/static/css/checkbox.css rename to allianceauth/static/allianceauth/css/checkbox.css diff --git a/allianceauth/static/css/themes/bootstrap-locals.less b/allianceauth/static/allianceauth/css/themes/bootstrap-locals.less similarity index 100% rename from allianceauth/static/css/themes/bootstrap-locals.less rename to allianceauth/static/allianceauth/css/themes/bootstrap-locals.less diff --git a/allianceauth/static/css/themes/darkly/LICENSE b/allianceauth/static/allianceauth/css/themes/darkly/LICENSE similarity index 100% rename from allianceauth/static/css/themes/darkly/LICENSE rename to allianceauth/static/allianceauth/css/themes/darkly/LICENSE diff --git a/allianceauth/static/css/themes/darkly/darkly.less b/allianceauth/static/allianceauth/css/themes/darkly/darkly.less similarity index 100% rename from allianceauth/static/css/themes/darkly/darkly.less rename to allianceauth/static/allianceauth/css/themes/darkly/darkly.less diff --git a/allianceauth/static/css/themes/darkly/darkly.min.css b/allianceauth/static/allianceauth/css/themes/darkly/darkly.min.css similarity index 100% rename from allianceauth/static/css/themes/darkly/darkly.min.css rename to allianceauth/static/allianceauth/css/themes/darkly/darkly.min.css diff --git a/allianceauth/static/css/themes/flatly-shared.less b/allianceauth/static/allianceauth/css/themes/flatly-shared.less similarity index 100% rename from allianceauth/static/css/themes/flatly-shared.less rename to allianceauth/static/allianceauth/css/themes/flatly-shared.less diff --git a/allianceauth/static/css/themes/flatly/LICENSE b/allianceauth/static/allianceauth/css/themes/flatly/LICENSE similarity index 100% rename from allianceauth/static/css/themes/flatly/LICENSE rename to allianceauth/static/allianceauth/css/themes/flatly/LICENSE diff --git a/allianceauth/static/css/themes/flatly/flatly.less b/allianceauth/static/allianceauth/css/themes/flatly/flatly.less similarity index 100% rename from allianceauth/static/css/themes/flatly/flatly.less rename to allianceauth/static/allianceauth/css/themes/flatly/flatly.less diff --git a/allianceauth/static/css/themes/flatly/flatly.min.css b/allianceauth/static/allianceauth/css/themes/flatly/flatly.min.css similarity index 100% rename from allianceauth/static/css/themes/flatly/flatly.min.css rename to allianceauth/static/allianceauth/css/themes/flatly/flatly.min.css diff --git a/allianceauth/static/icons/allianceauth.png b/allianceauth/static/allianceauth/icons/allianceauth.png similarity index 100% rename from allianceauth/static/icons/allianceauth.png rename to allianceauth/static/allianceauth/icons/allianceauth.png diff --git a/allianceauth/static/icons/apple-touch-icon.png b/allianceauth/static/allianceauth/icons/apple-touch-icon.png similarity index 100% rename from allianceauth/static/icons/apple-touch-icon.png rename to allianceauth/static/allianceauth/icons/apple-touch-icon.png diff --git a/allianceauth/static/icons/favicon-16x16.png b/allianceauth/static/allianceauth/icons/favicon-16x16.png similarity index 100% rename from allianceauth/static/icons/favicon-16x16.png rename to allianceauth/static/allianceauth/icons/favicon-16x16.png diff --git a/allianceauth/static/icons/favicon-32x32.png b/allianceauth/static/allianceauth/icons/favicon-32x32.png similarity index 100% rename from allianceauth/static/icons/favicon-32x32.png rename to allianceauth/static/allianceauth/icons/favicon-32x32.png diff --git a/allianceauth/static/icons/favicon-96x96.png b/allianceauth/static/allianceauth/icons/favicon-96x96.png similarity index 100% rename from allianceauth/static/icons/favicon-96x96.png rename to allianceauth/static/allianceauth/icons/favicon-96x96.png diff --git a/allianceauth/static/js/eve-time.js b/allianceauth/static/allianceauth/js/eve-time.js similarity index 100% rename from allianceauth/static/js/eve-time.js rename to allianceauth/static/allianceauth/js/eve-time.js diff --git a/allianceauth/static/js/filterDropDown/filterDropDown.min.js b/allianceauth/static/allianceauth/js/filterDropDown/filterDropDown.min.js similarity index 100% rename from allianceauth/static/js/filterDropDown/filterDropDown.min.js rename to allianceauth/static/allianceauth/js/filterDropDown/filterDropDown.min.js diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/jquery-ui.min.css b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/jquery-ui.min.css similarity index 100% rename from allianceauth/static/js/jquery-ui/1.12.1/css/jquery-ui.min.css rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/jquery-ui.min.css diff --git a/allianceauth/static/js/refresh_notifications.js b/allianceauth/static/allianceauth/js/refresh_notifications.js similarity index 100% rename from allianceauth/static/js/refresh_notifications.js rename to allianceauth/static/allianceauth/js/refresh_notifications.js diff --git a/allianceauth/static/js/timers.js b/allianceauth/static/allianceauth/js/timers.js similarity index 100% rename from allianceauth/static/js/timers.js rename to allianceauth/static/allianceauth/js/timers.js From 7618dd0f91ceb818a9b238702f0c5c207d09abd9 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 13:31:12 +0200 Subject: [PATCH 2/7] Removed obsolete attribute --- allianceauth/authentication/templates/public/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html index 5460b330..e52e65b3 100644 --- a/allianceauth/authentication/templates/public/login.html +++ b/allianceauth/authentication/templates/public/login.html @@ -7,6 +7,6 @@ {% block middle_box_content %} - + {% endblock %} From 0cd36ad5bc20489474f9889e1bd38a5fe292fcd0 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 13:46:56 +0200 Subject: [PATCH 3/7] Moved SSO button from "root" to "authentication" --- .../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 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename allianceauth/authentication/static/{ => authentication}/img/sso/EVE_SSO_Login_Buttons_Large_Black.png (100%) rename allianceauth/authentication/static/{ => authentication}/img/sso/EVE_SSO_Login_Buttons_Large_White.png (100%) diff --git a/allianceauth/authentication/static/img/sso/EVE_SSO_Login_Buttons_Large_Black.png b/allianceauth/authentication/static/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/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/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/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 e52e65b3..aaff4ec2 100644 --- a/allianceauth/authentication/templates/public/login.html +++ b/allianceauth/authentication/templates/public/login.html @@ -7,6 +7,6 @@ {% block middle_box_content %} - + {% endblock %} From 0851a6d08591d381b64908c77794688b40816e81 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 13:51:10 +0200 Subject: [PATCH 4/7] [Cleanup] Removed `{% load static %}` when no static files are loaded --- .../templates/authentication/dashboard.html | 9 ++++----- .../authentication/templates/public/middle_box.html | 1 - .../authentication/templates/public/register.html | 1 - .../templates/registration/registration_form.html | 1 - .../fleetactivitytracking/fatlinkformatter.html | 1 - .../templates/fleetactivitytracking/fatlinkmodify.html | 1 - .../fatlinkpersonalmonthlystatisticsview.html | 1 - .../fatlinkpersonalstatisticsview.html | 1 - .../fleetactivitytracking/fatlinkstatisticscorpview.html | 1 - .../fleetactivitytracking/fatlinkstatisticsview.html | 1 - .../templates/fleetactivitytracking/fatlinkview.html | 1 - .../templates/groupmanagement/groupmembers.html | 1 - .../templates/groupmanagement/groupmembership.html | 1 - .../templates/groupmanagement/groups.html | 1 - .../groupmanagement/templates/groupmanagement/index.html | 1 - .../groupmanagement/templates/groupmanagement/menu.html | 1 - .../templates/hrapplications/corpchoice.html | 1 - .../hrapplications/templates/hrapplications/create.html | 1 - .../templates/hrapplications/management.html | 1 - .../templates/hrapplications/searchview.html | 1 - .../hrapplications/templates/hrapplications/view.html | 1 - .../notifications/templates/notifications/list.html | 1 - .../notifications/templates/notifications/view.html | 1 - allianceauth/optimer/templates/optimer/add.html | 1 - allianceauth/optimer/templates/optimer/update.html | 1 - .../openfire/templates/services/openfire/broadcast.html | 1 - .../templates/admin/teamspeak3/authts/change_list.html | 1 - .../templates/services/teamspeak3/teamspeakjoin.html | 1 - .../services/templates/services/fleetformattertool.html | 1 - .../services/templates/services/service_credentials.html | 1 - .../services/templates/services/service_password.html | 1 - allianceauth/services/templates/services/services.html | 1 - allianceauth/srp/templates/srp/add.html | 1 - allianceauth/srp/templates/srp/management.html | 1 - allianceauth/srp/templates/srp/request.html | 1 - allianceauth/srp/templates/srp/update.html | 1 - allianceauth/templates/bundles/jquery-visibility-js.html | 1 - allianceauth/timerboard/templates/timerboard/form.html | 1 - 38 files changed, 4 insertions(+), 42 deletions(-) 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/middle_box.html b/allianceauth/authentication/templates/public/middle_box.html index cb127c36..ff3688bb 100644 --- a/allianceauth/authentication/templates/public/middle_box.html +++ b/allianceauth/authentication/templates/public/middle_box.html @@ -1,5 +1,4 @@ {% extends 'public/base.html' %} -{% load static %} {% block content %}
{% if messages %} diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html index 9ddeea9d..e0f80382 100644 --- a/allianceauth/authentication/templates/public/register.html +++ b/allianceauth/authentication/templates/public/register.html @@ -1,6 +1,5 @@ {% extends 'public/base.html' %} -{% load static %} {% load bootstrap %} {% load i18n %} diff --git a/allianceauth/authentication/templates/registration/registration_form.html b/allianceauth/authentication/templates/registration/registration_form.html index a9aa5ef5..8d5f2ea1 100644 --- a/allianceauth/authentication/templates/registration/registration_form.html +++ b/allianceauth/authentication/templates/registration/registration_form.html @@ -1,7 +1,6 @@ {% extends 'public/middle_box.html' %} {% load bootstrap %} {% load i18n %} -{% load static %} {% block page_title %}{% translate "Register" %}{% endblock %} {% block middle_box_content %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html index 903b961a..25f9656e 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Create Fatlink" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 20b155de..13e0d899 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html index 2c87554c..5cab8bd8 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html index 673a79e0..5812dac2 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html index 9d58af09..6ecfd16a 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Fatlink Corp Statistics" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html index 35fdda5a..98d58a15 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Fatlink statistics" %}{% endblock page_title %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html index 8afae5ad..9679208d 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index ab6be2b2..881434af 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% load evelinks %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index 08cf4633..196ce6e0 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Groups Membership" %}{% endblock page_title %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html index 6b1124a1..7b750f54 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Available Groups" %}{% endblock page_title %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 842ea4bc..61ae0583 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% load evelinks %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/menu.html b/allianceauth/groupmanagement/templates/groupmanagement/menu.html index 0f4410ed..be84acb5 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/menu.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/menu.html @@ -1,4 +1,3 @@ -{% load static %} {% load i18n %} {% load navactive %} diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html index 7752197a..ab97414b 100644 --- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html +++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %} diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html index ce45356e..5e3bbeb4 100644 --- a/allianceauth/hrapplications/templates/hrapplications/create.html +++ b/allianceauth/hrapplications/templates/hrapplications/create.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %} diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html index 95d1e844..dfc3e92f 100644 --- a/allianceauth/hrapplications/templates/hrapplications/management.html +++ b/allianceauth/hrapplications/templates/hrapplications/management.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %} diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html index 064ece8d..3dc1a167 100644 --- a/allianceauth/hrapplications/templates/hrapplications/searchview.html +++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %} diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html index a30e4d61..f4164ecb 100644 --- a/allianceauth/hrapplications/templates/hrapplications/view.html +++ b/allianceauth/hrapplications/templates/hrapplications/view.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load bootstrap %} {% load i18n %} diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html index 1e332ad4..93c36e4b 100644 --- a/allianceauth/notifications/templates/notifications/list.html +++ b/allianceauth/notifications/templates/notifications/list.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Notifications" %}{% endblock %} diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html index e6a50167..2aede4ee 100644 --- a/allianceauth/notifications/templates/notifications/view.html +++ b/allianceauth/notifications/templates/notifications/view.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "View Notification" %}{% endblock page_title %} diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html index fffc9707..9b9ddecd 100644 --- a/allianceauth/optimer/templates/optimer/add.html +++ b/allianceauth/optimer/templates/optimer/add.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html index ec0d1429..6bccf30b 100644 --- a/allianceauth/optimer/templates/optimer/update.html +++ b/allianceauth/optimer/templates/optimer/update.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html index 50dd1b7d..2f6791bd 100755 --- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html +++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Jabber Broadcast" %}{% endblock page_title %} diff --git a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html index 134f197a..2e157736 100644 --- a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html +++ b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html @@ -1,5 +1,4 @@ {% extends "admin/change_list.html" %} -{% load static %} {% load i18n %} {% block object-tools-items %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html index 2c78b2fc..c77fcc23 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Verify Teamspeak" %}{% endblock page_title %} diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html index dc906622..bcb8e02c 100644 --- a/allianceauth/services/templates/services/fleetformattertool.html +++ b/allianceauth/services/templates/services/fleetformattertool.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Fleet Formatter Tool" %}{% endblock page_title %} diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html index 7c903046..48a7b949 100644 --- a/allianceauth/services/templates/services/service_credentials.html +++ b/allianceauth/services/templates/services/service_credentials.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% blocktrans with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktrans %}{% endblock page_title %} diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html index 0ecc18f4..b110c0f5 100644 --- a/allianceauth/services/templates/services/service_password.html +++ b/allianceauth/services/templates/services/service_password.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% blocktrans with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktrans %}{% endblock page_title %} diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html index 7d89223e..203f5080 100755 --- a/allianceauth/services/templates/services/services.html +++ b/allianceauth/services/templates/services/services.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Services Management" %}{% endblock page_title %} diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html index e7ed4cc0..4c91dae1 100644 --- a/allianceauth/srp/templates/srp/add.html +++ b/allianceauth/srp/templates/srp/add.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "SRP Fleet Create" %}{% endblock page_title %} diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html index 805efbe5..32f35e57 100644 --- a/allianceauth/srp/templates/srp/management.html +++ b/allianceauth/srp/templates/srp/management.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% load humanize %} diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html index 6e669f62..0e46aa31 100644 --- a/allianceauth/srp/templates/srp/request.html +++ b/allianceauth/srp/templates/srp/request.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "SRP Request" %}{% endblock page_title %} diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html index 82c33674..baf1a8c6 100644 --- a/allianceauth/srp/templates/srp/update.html +++ b/allianceauth/srp/templates/srp/update.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Update AAR Link" %}{% endblock page_title %} diff --git a/allianceauth/templates/bundles/jquery-visibility-js.html b/allianceauth/templates/bundles/jquery-visibility-js.html index 5592ee1f..ac912283 100644 --- a/allianceauth/templates/bundles/jquery-visibility-js.html +++ b/allianceauth/templates/bundles/jquery-visibility-js.html @@ -1,4 +1,3 @@ -{% load static %} diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html index 8d1980a9..e52727c3 100644 --- a/allianceauth/timerboard/templates/timerboard/form.html +++ b/allianceauth/timerboard/templates/timerboard/form.html @@ -1,6 +1,5 @@ {% extends "allianceauth/base.html" %} {% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %} From 20231ce198fd692318b35d3268c99b025456433d Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 25 Jun 2022 13:51:46 +0200 Subject: [PATCH 5/7] Load static files from their new place --- allianceauth/authentication/templates/public/base.html | 2 +- .../groupmanagement/templates/groupmanagement/audit.html | 2 +- allianceauth/optimer/templates/optimer/management.html | 2 +- .../templates/permissions_tool/audit.html | 2 +- .../templates/permissions_tool/overview.html | 2 +- allianceauth/srp/templates/srp/data.html | 6 +++--- allianceauth/templates/allianceauth/base.html | 6 +++--- allianceauth/templates/allianceauth/icons.html | 8 ++++---- allianceauth/templates/allianceauth/top-menu.html | 2 +- allianceauth/templates/bundles/bootstrap-css.html | 8 ++++---- allianceauth/templates/bundles/jquery-ui-css.html | 2 +- allianceauth/timerboard/templates/timerboard/view.html | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index 9ca3fc9c..bb8d02c1 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -7,7 +7,7 @@ - + {% include 'allianceauth/icons.html' %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 4c1759de..88a750c2 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -74,7 +74,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} {% include 'bundles/moment-js.html' with locale=True %} - + {% endblock %} {% block extra_css %} diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html index 51b48c8e..bbf79798 100644 --- a/allianceauth/optimer/templates/optimer/management.html +++ b/allianceauth/optimer/templates/optimer/management.html @@ -40,7 +40,7 @@
{% include 'bundles/moment-js.html' with locale=True %} - + + {% endblock %} {% block extra_css %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index 05bcfb80..439e5f21 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -80,7 +80,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} - + {% endblock %} {% block extra_css %} diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html index d4f1e278..96dd7473 100644 --- a/allianceauth/srp/templates/srp/data.html +++ b/allianceauth/srp/templates/srp/data.html @@ -8,7 +8,7 @@ {% block extra_css %} {% include 'bundles/datatables-css.html' %} {% include 'bundles/x-editable.css.html' %} - +
- +