diff --git a/allianceauth/authentication/forms.py b/allianceauth/authentication/forms.py
index 08fb240c..ea0379ca 100644
--- a/allianceauth/authentication/forms.py
+++ b/allianceauth/authentication/forms.py
@@ -1,6 +1,8 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
-
-
+from allianceauth.authentication.models import User
class RegistrationForm(forms.Form):
email = forms.EmailField(label=_('Email'), max_length=254, required=True)
+
+ class _meta:
+ model = User
diff --git a/allianceauth/authentication/hmac_urls.py b/allianceauth/authentication/hmac_urls.py
index 3cf98bf4..a4d225d7 100644
--- a/allianceauth/authentication/hmac_urls.py
+++ b/allianceauth/authentication/hmac_urls.py
@@ -10,5 +10,5 @@ urlpatterns = [
url(r'^register/$', views.RegistrationView.as_view(), name='registration_register'),
url(r'^register/complete/$', views.registration_complete, name='registration_complete'),
url(r'^register/closed/$', views.registration_closed, name='registration_disallowed'),
- url(r'', include('registration.auth_urls')),
+ url(r'', include('django.contrib.auth.urls')),
]
\ No newline at end of file
diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index 18f57d1f..d4401aa1 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Dashboard" %}{% endblock %}
diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html
index 4fc689ba..05bc685b 100644
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@@ -1,7 +1,7 @@
-{% load staticfiles %}
+{% extends 'public/base.html' %}
+{% load static %}
{% load bootstrap %}
{% load i18n %}
-{% extends 'public/base.html' %}
{% block page_title %}Registration{% endblock %}
{% block extra_include %}
{% include 'bundles/bootstrap-css.html' %}
diff --git a/allianceauth/authentication/views.py b/allianceauth/authentication/views.py
index 98b93a62..0ea2e549 100644
--- a/allianceauth/authentication/views.py
+++ b/allianceauth/authentication/views.py
@@ -14,12 +14,12 @@ from allianceauth.eveonline.models import EveCharacter
from esi.decorators import token_required
from esi.models import Token
-from registration.backends.hmac.views import (
+from django_registration.backends.activation.views import (
RegistrationView as BaseRegistrationView,
ActivationView as BaseActivationView,
REGISTRATION_SALT
)
-from registration.signals import user_registered
+from django_registration.signals import user_registered
from .models import CharacterOwnership
from .forms import RegistrationForm
@@ -134,12 +134,12 @@ def sso_login(request, token):
# Step 2
class RegistrationView(BaseRegistrationView):
form_class = RegistrationForm
- success_url = 'authentication:dashboard'
+ template_name = "public/register.html"
+ email_body_template = "registration/activation_email.txt"
+ email_subject_template = "registration/activation_email_subject.txt"
def get_success_url(self, user):
- if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
- return 'authentication:dashboard', (), {}
- return super().get_success_url(user)
+ return reverse('registration_complete')
def dispatch(self, request, *args, **kwargs):
# We're storing a key in the session to pass user information from OAuth response. Make sure it's there.
@@ -176,6 +176,11 @@ class RegistrationView(BaseRegistrationView):
# Step 3
class ActivationView(BaseActivationView):
+ template_name = "registration/activate.html"
+
+ def get_success_url(self, user):
+ return reverse('registration_activation_complete')
+
def validate_key(self, activation_key):
try:
dump = signing.loads(activation_key, salt=REGISTRATION_SALT,
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index e9a0b018..1d401af8 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Create Fatlink" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
index ee9de083..522b19e8 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index ad389ca4..3bd39fe0 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
index 3ccfb4eb..b3678865 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
index e717b584..8872edd5 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink Corp Statistics" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
index df86d306..6ca585a4 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink statistics" %}{% endblock page_title %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index 42d04482..49a2df4e 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
index 24770252..51cc2ef5 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{{ group }} {% trans "Audit Log" %}{% endblock page_title %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index 91da8bce..438137fc 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% load evelinks %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index c6db9810..d4c0ad8a 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Groups Membership" %}{% endblock page_title %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index e6f97f75..d2c2b036 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html
index d4b27947..117bbd79 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% load evelinks %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/menu.html b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
index 96761d96..a0a057e7 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/menu.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% load navactive %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index 9bb5275b..5db667b1 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Choose a Corp" %}{% endblock page_title %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index 1f26562b..ab4ce6ab 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "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 29e4bdcc..eea93c36 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "HR Application Management" %}{% endblock page_title %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index c17a296d..ec37aa1f 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}HR Application Management{% endblock page_title %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index b6e6461b..5bf12da5 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load bootstrap %}
{% load i18n %}
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index 19347362..074b17b8 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Notifications" %}{% endblock %}
diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html
index 34e88692..1c03f086 100644
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "View Notification" %}{% endblock page_title %}
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index 52ad79cf..170ece69 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index abe7c77b..ed353032 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% 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 4c2736e5..a93b98f1 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
index f69e0167..54f6ca4c 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{{ permission.permission.codename }} - {% trans "Permissions Audit" %}{% endblock page_title %}
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
index b6c25bb5..3055d76a 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Permissions Overview" %}{% endblock page_title %}
diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 81d5d965..411dd65d 100755
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Jabber Broadcast" %}{% endblock page_title %}
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index ba053975..b4984045 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Verify Teamspeak" %}{% endblock page_title %}
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index 3c405643..32713680 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "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 e4b218b7..d18ad4da 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% 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 5dfd25c6..a51531ba 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% 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 0f2d10d7..cf36b033 100755
--- a/allianceauth/services/templates/services/services.html
+++ b/allianceauth/services/templates/services/services.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Services Management" %}{% endblock page_title %}
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index bba0e585..9a747844 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index c7325813..92f74e81 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% load humanize %}
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index 4b97fbb4..50aa1253 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% load humanize %}
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index b425e11c..c783fd9c 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index ac4f4597..5af774b2 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
diff --git a/allianceauth/templates/allianceauth/top-menu.html b/allianceauth/templates/allianceauth/top-menu.html
index 580d2be4..4263344b 100644
--- a/allianceauth/templates/allianceauth/top-menu.html
+++ b/allianceauth/templates/allianceauth/top-menu.html
@@ -35,7 +35,7 @@
{% if user.is_staff %}
{% trans "Admin" %}
{% endif %}
- {% trans "Logout" %}
+ {% trans "Logout" %}
{% else %}
{% trans "Login" %}
{% endif %}
diff --git a/allianceauth/templates/bundles/bootstrap-css.html b/allianceauth/templates/bundles/bootstrap-css.html
index 86270900..3d1c6ff7 100644
--- a/allianceauth/templates/bundles/bootstrap-css.html
+++ b/allianceauth/templates/bundles/bootstrap-css.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
{% if NIGHT_MODE %}
{% if debug %}
diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html
index 827c06ef..ecf6eea9 100644
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% block page_title %}
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html
index be668d1a..c2980a55 100644
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
{% load evelinks %}
diff --git a/setup.py b/setup.py
index d50e16e7..20c4dd2c 100644
--- a/setup.py
+++ b/setup.py
@@ -22,12 +22,12 @@ install_requires = [
'celery>=4.3.0,<5.0.0,!=4.4.4', # 4.4.4 is missing a dependency
'celery_once',
- 'django>=2.2.1,<3.0',
+ 'django>=3.1.1,<4.0.0 ',
'django-bootstrap-form',
- 'django-registration==2.4',
+ 'django-registration>=3.1',
'django-sortedm2m',
'django-redis-cache>=2.1.0,<3.0.0',
- 'django-celery-beat>=1.1.1,<2.0.0',
+ 'django-celery-beat>=2.0.0',
'openfire-restapi',
'sleekxmpp',