diff --git a/allianceauth/authentication/admin.py b/allianceauth/authentication/admin.py index 4e2e773c..69658f8f 100644 --- a/allianceauth/authentication/admin.py +++ b/allianceauth/authentication/admin.py @@ -100,7 +100,7 @@ class UserProfileInline(admin.StackedInline): formset.get_form_kwargs = get_kwargs return formset - def has_add_permission(self, request): + def has_add_permission(self, request, obj=None): return False def has_delete_permission(self, request, obj=None): @@ -549,7 +549,7 @@ class PermissionAdmin(admin.ModelAdmin): def admin_name(obj): return str(obj) - def has_add_permission(self, request): + def has_add_permission(self, request, obj=None): return False def has_delete_permission(self, request, obj=None): 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..c418fed1 100644 --- a/allianceauth/authentication/views.py +++ b/allianceauth/authentication/views.py @@ -6,7 +6,7 @@ from django.contrib.auth import login, authenticate from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core import signing -from django.urls import reverse +from django.urls import reverse, reverse_lazy from django.shortcuts import redirect, render from django.utils.translation import gettext_lazy as _ @@ -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,10 @@ def sso_login(request, token): # Step 2 class RegistrationView(BaseRegistrationView): form_class = RegistrationForm - success_url = 'authentication:dashboard' - - def get_success_url(self, user): - if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True): - return 'authentication:dashboard', (), {} - return super().get_success_url(user) + template_name = "public/register.html" + email_body_template = "registration/activation_email.txt" + email_subject_template = "registration/activation_email_subject.txt" + success_url = reverse_lazy('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 +174,9 @@ class RegistrationView(BaseRegistrationView): # Step 3 class ActivationView(BaseActivationView): + template_name = "registration/activate.html" + success_url = reverse_lazy('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/admin.py b/allianceauth/groupmanagement/admin.py index d03a4929..de04f912 100644 --- a/allianceauth/groupmanagement/admin.py +++ b/allianceauth/groupmanagement/admin.py @@ -41,7 +41,7 @@ class AuthGroupInlineAdmin(admin.StackedInline): kwargs["queryset"] = Group.objects.order_by(Lower('name')) return super().formfield_for_manytomany(db_field, request, **kwargs) - def has_add_permission(self, request): + def has_add_permission(self, request, obj=None): return False def has_delete_permission(self, request, obj=None): diff --git a/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py b/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py new file mode 100644 index 00000000..891f3e2c --- /dev/null +++ b/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-09-18 14:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('groupmanagement', '0013_fix_requestlog_date_field'), + ] + + operations = [ + migrations.AlterField( + model_name='requestlog', + name='request_type', + field=models.BooleanField(null=True), + ), + ] diff --git a/allianceauth/groupmanagement/models.py b/allianceauth/groupmanagement/models.py index c0fca555..035b9ba2 100644 --- a/allianceauth/groupmanagement/models.py +++ b/allianceauth/groupmanagement/models.py @@ -25,7 +25,7 @@ class GroupRequest(models.Model): class RequestLog(models.Model): - request_type = models.NullBooleanField(default=0) + request_type = models.BooleanField(null=True) group = models.ForeignKey(Group, on_delete=models.CASCADE) request_info = models.CharField(max_length=254) action = models.BooleanField(default=0) 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/migrations/0007_auto_20200918_1412.py b/allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py new file mode 100644 index 00000000..aade3620 --- /dev/null +++ b/allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-09-18 14:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hrapplications', '0006_remove_legacy_models'), + ] + + operations = [ + migrations.AlterField( + model_name='application', + name='approved', + field=models.BooleanField(blank=True, default=None, null=True), + ), + ] diff --git a/allianceauth/hrapplications/models.py b/allianceauth/hrapplications/models.py index d8fbd068..4767ec7f 100755 --- a/allianceauth/hrapplications/models.py +++ b/allianceauth/hrapplications/models.py @@ -35,7 +35,7 @@ class ApplicationForm(models.Model): class Application(models.Model): form = models.ForeignKey(ApplicationForm, on_delete=models.CASCADE, related_name='applications') user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='applications') - approved = models.NullBooleanField(blank=True, null=True, default=None) + approved = models.BooleanField(blank=True, null=True, default=None) reviewer = models.ForeignKey(User, on_delete=models.SET_NULL, blank=True, null=True) reviewer_character = models.ForeignKey(EveCharacter, on_delete=models.SET_NULL, blank=True, null=True) created = models.DateTimeField(auto_now_add=True) 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/discord/models.py b/allianceauth/services/modules/discord/models.py index 64738c7a..8c75bb93 100644 --- a/allianceauth/services/modules/discord/models.py +++ b/allianceauth/services/modules/discord/models.py @@ -211,6 +211,7 @@ class DiscordUser(models.Model): Return None if user does no longer exist """ try: + _user = self.user client = DiscordUser.objects._bot_client(is_rate_limited=is_rate_limited) success = client.remove_guild_member( guild_id=DISCORD_GUILD_ID, user_id=self.uid @@ -220,7 +221,7 @@ class DiscordUser(models.Model): if deleted_count > 0: if notify_user: notify( - user=self.user, + user=_user, title=gettext_lazy('Discord Account Disabled'), message=gettext_lazy( 'Your Discord account was disabeled automatically ' @@ -229,22 +230,22 @@ class DiscordUser(models.Model): ), level='warning' ) - logger.info('Account for user %s was deleted.', self.user) + logger.info('Account for user %s was deleted.', _user) return True else: - logger.debug('Account for user %s was already deleted.', self.user) + logger.debug('Account for user %s was already deleted.', _user) return None else: logger.warning( - 'Failed to remove user %s from the Discord server', self.user + 'Failed to remove user %s from the Discord server', _user ) return False except (HTTPError, ConnectionError, DiscordApiBackoff) as ex: if handle_api_exceptions: logger.exception( - 'Failed to remove user %s from Discord server: %s', self.user, ex + 'Failed to remove user %s from Discord server: %s',self.user, ex ) return False else: 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 17d0a7c6..79add9bb 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 %}