diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index feb8909a..ba763a7a 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -32,7 +32,7 @@ } .card-login { - background: rgba(48 48 48 / 0.7); + background: rgba(48 48 48 / 0.7); color: rgb(255 255 255); padding-bottom: 21px; } diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 53519714..24943440 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html @@ -45,7 +45,7 @@ {{ fat.user }} {{ fat.character.character_name }} - {% if fat.station != "No Station" %} + {% if fat.station != "No Station" %} {% translate "Docked in" %} {% endif %} {{ fat.system }} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html index 697c2b5a..24256381 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html @@ -59,7 +59,7 @@
- {% blocktranslate count links=n_created_fats trimmed %} + {% blocktranslate count links=n_created_fats trimmed %} {{ user }} has created one link this month. {% plural %} {{ user }} has created {{ links }} links this month. @@ -88,14 +88,14 @@ {{ link.fatdatetime }} {{ link.duration }} - + - {% endfor %} + {% endfor %}
diff --git a/allianceauth/fleetactivitytracking/views.py b/allianceauth/fleetactivitytracking/views.py index 59644ba0..232fa456 100644 --- a/allianceauth/fleetactivitytracking/views.py +++ b/allianceauth/fleetactivitytracking/views.py @@ -377,12 +377,12 @@ def modify_fatlink_view(request, fat_hash=None): if request.GET.get('removechar', None): character_id = request.GET.get('removechar') character = EveCharacter.objects.get(character_id=character_id) - logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}") + logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}") Fat.objects.filter(fatlink=fatlink).filter(character=character).delete() if request.GET.get('deletefat', None): - logger.debug("Removing fleetactivitytracking %s" % fatlink) + logger.debug("Removing fleetactivitytracking %s" % fatlink) fatlink.delete() return redirect('fatlink:view') diff --git a/allianceauth/groupmanagement/migrations/0004_authgroup.py b/allianceauth/groupmanagement/migrations/0004_authgroup.py index b0540b05..e3c8848e 100644 --- a/allianceauth/groupmanagement/migrations/0004_authgroup.py +++ b/allianceauth/groupmanagement/migrations/0004_authgroup.py @@ -74,11 +74,11 @@ class Migration(migrations.Migration): migrations.CreateModel( name='AuthGroup', fields=[ - ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')), + ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')), ('internal', models.BooleanField(default=True, help_text='Internal group, users cannot see, join or request to join this group.
Used for groups such as Members, Corp_*, Alliance_* etc.
Overrides Hidden and Open options when selected.')), ('hidden', models.BooleanField(default=True, help_text='Group is hidden from users but can still join with the correct link.')), ('open', models.BooleanField(default=False, help_text='Group is open and users will be automatically added upon request.
If the group is not open users will need their request manually approved.')), - ('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )), + ('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )), ('group_leaders', models.ManyToManyField(related_name='leads_groups', to=settings.AUTH_USER_MODEL, blank=True, help_text='Group leaders can process group requests for this group specifically. Use the auth.group_management permission to allow a user to manage all groups.',)), ], diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 1cd6c651..b7b015bc 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -24,7 +24,7 @@ - {% if not show_leave_tab %} + {% if not show_leave_tab %}
  • {% translate "Leave Requests" %} @@ -105,7 +105,7 @@ {% endif %}
    • - {% if not show_leave_tab %} + {% if not show_leave_tab %}
    {% if leaverequests %}
    diff --git a/allianceauth/hrapplications/admin.py b/allianceauth/hrapplications/admin.py index 538d3ffa..f1075da7 100644 --- a/allianceauth/hrapplications/admin.py +++ b/allianceauth/hrapplications/admin.py @@ -13,7 +13,7 @@ class ChoiceInline(admin.TabularInline): @admin.register(ApplicationQuestion) class QuestionAdmin(admin.ModelAdmin): fieldsets = [ - (None, {'fields': ['title', 'help_text', 'multi_select']}), + (None, {'fields': ['title', 'help_text', 'multi_select']}), ] inlines = [ChoiceInline] diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html index 6af139b7..370b6300 100644 --- a/allianceauth/hrapplications/templates/hrapplications/management.html +++ b/allianceauth/hrapplications/templates/hrapplications/management.html @@ -44,7 +44,7 @@ {% if personal_app.approved == None %}
    {% translate "Pending" %}
    - {% elif personal_app.approved == True %} + {% elif personal_app.approved == True %}
    {% translate "Approved" %}
    {% else %}
    {% translate "Rejected" %}
    @@ -137,7 +137,7 @@ {% else %}
    {% translate "Pending" %}
    {% endif %} - {% elif app.approved == True %} + {% elif app.approved == True %}
    {% translate "Approved" %}
    {% else %}
    {% translate "Rejected" %}
    @@ -181,7 +181,7 @@ {% else %}
    {% translate "Pending" %}
    {% endif %} - {% elif app.approved == True %} + {% elif app.approved == True %}
    {% translate "Approved" %}
    {% else %}
    {% translate "Rejected" %}
    diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html index 1b1eeff8..c667e95c 100644 --- a/allianceauth/hrapplications/templates/hrapplications/searchview.html +++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html @@ -44,7 +44,7 @@ {% if app.approved == None %}
    {% translate "Pending" %}
    - {% elif app.approved == True %} + {% elif app.approved == True %}
    {% translate "Approved" %}
    {% else %}
    {% translate "Rejected" %}
    diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html index 8da4b3d8..25d07c79 100644 --- a/allianceauth/menu/templates/menu/sortable-side-menu.html +++ b/allianceauth/menu/templates/menu/sortable-side-menu.html @@ -7,7 +7,7 @@