diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index 6b404199..45f53136 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -27,7 +27,7 @@ @@ -39,7 +39,7 @@
- + {{ main.character_name }}
@@ -52,7 +52,7 @@
- + {{ main.corporation_name }}
@@ -63,7 +63,7 @@
- + {{ main.alliance_name }}
@@ -75,13 +75,13 @@

- - + {{ main.corporation_name }} + {{ main.corporation_name }} {% if main.alliance_id %} - + {{ main.alliance_name }} {% endif %} {% if main.faction_id %} - + {{ main.faction_name }} {% endif %}

@@ -121,7 +121,7 @@

{% translate "Group Memberships" %}

-
+
- + {{ main.faction_name }}
{% for group in groups %} @@ -154,7 +154,8 @@ {% for char in characters %} - @@ -168,7 +169,7 @@ {% for char in characters %}
+ + {{ char.character_name }} {{ char.character_name }} {{ char.corporation_name }}
- + {{ char.character_name }} {{ char.character_name }}
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index dda3d966..f0933b2c 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -47,7 +47,7 @@ -
+
{% block content %} {% endblock %}
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html index 0bffaab7..11d4b792 100644 --- a/allianceauth/authentication/templates/public/login.html +++ b/allianceauth/authentication/templates/public/login.html @@ -7,6 +7,6 @@ {% block middle_box_content %} - + {% translate 'Login with Eve SSO' %} {% endblock %} diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html index 5ab9de1a..d1d7cc16 100644 --- a/allianceauth/corputils/templates/corputils/corpstats.html +++ b/allianceauth/corputils/templates/corputils/corpstats.html @@ -8,11 +8,11 @@ {% if corpstats.corp.alliance %} {% endif %} @@ -59,7 +59,7 @@ @@ -119,7 +119,7 @@ {% for member in members %} - + - + {% for member in unregistered %} - + {% for result in results %} - + diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html index ffd4319a..d0b9d8ae 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html @@ -12,7 +12,7 @@
{{ character_name }}
- + {{ character_name }}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 13e0d899..e0bbcd21 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% 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 5cab8bd8..f219c24f 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% 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 5812dac2..2a4bd218 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% 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 6ecfd16a..5160cd98 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% load i18n %} {% block page_title %}{% translate "Fatlink Corp Statistics" %}{% endblock page_title %} @@ -28,7 +27,7 @@ {% for memberStat in fatStats %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html index 98d58a15..5ff4199b 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% load i18n %} {% block page_title %}{% translate "Fatlink statistics" %}{% endblock page_title %} @@ -29,9 +28,9 @@ {% for corpStat in fatStats %} - + diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html index 9679208d..2d836a7e 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% 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 881434af..c0e8c71a 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -36,7 +36,7 @@ {% for member in members %} diff --git a/allianceauth/hrapplications/views.py b/allianceauth/hrapplications/views.py index e4aecd41..fe7c93f5 100755 --- a/allianceauth/hrapplications/views.py +++ b/allianceauth/hrapplications/views.py @@ -219,7 +219,7 @@ def hr_application_search(request): Q(user__character_ownerships__character__corporation_name__icontains=searchstring) | Q(user__character_ownerships__character__alliance_name__icontains=searchstring) | Q(user__username__icontains=searchstring) - ) + ).distinct() context = {'applications': applications, 'search_form': HRApplicationSearchForm()} diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html index 93c36e4b..13881f70 100644 --- a/allianceauth/notifications/templates/notifications/list.html +++ b/allianceauth/notifications/templates/notifications/list.html @@ -8,15 +8,15 @@
-
-
    +
    + +
    + {% translate "Mark All Read" %} + {% translate "Delete All Read" %} +
    diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html index 95abf969..5f11779d 100644 --- a/allianceauth/optimer/templates/optimer/management.html +++ b/allianceauth/optimer/templates/optimer/management.html @@ -1,5 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load static %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} @@ -42,7 +41,7 @@ {% include 'bundles/moment-js.html' with locale=True %} {% include 'bundles/timers-js.html' %} - {% else %} - + {% endif %} {% else %} {% if debug %} - + {% else %} - + {% endif %} {% endif %} diff --git a/allianceauth/templates/bundles/clipboard-js.html b/allianceauth/templates/bundles/clipboard-js.html index bee9d097..2827e812 100644 --- a/allianceauth/templates/bundles/clipboard-js.html +++ b/allianceauth/templates/bundles/clipboard-js.html @@ -1,3 +1,3 @@ - + diff --git a/allianceauth/templates/bundles/filterdropdown-js.html b/allianceauth/templates/bundles/filterdropdown-js.html index 5ce5ce98..677fa536 100644 --- a/allianceauth/templates/bundles/filterdropdown-js.html +++ b/allianceauth/templates/bundles/filterdropdown-js.html @@ -1,3 +1,3 @@ {% load static %} - + diff --git a/allianceauth/templates/bundles/moment-js.html b/allianceauth/templates/bundles/moment-js.html index 56cab334..94dcfbe6 100644 --- a/allianceauth/templates/bundles/moment-js.html +++ b/allianceauth/templates/bundles/moment-js.html @@ -2,6 +2,6 @@ {% if locale and LANGUAGE_CODE != 'en' %} - + {% endif %} diff --git a/allianceauth/timerboard/migrations/0005_alter_timer_planet_moon.py b/allianceauth/timerboard/migrations/0005_alter_timer_planet_moon.py new file mode 100644 index 00000000..52c21ad9 --- /dev/null +++ b/allianceauth/timerboard/migrations/0005_alter_timer_planet_moon.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.6 on 2022-07-18 17:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('timerboard', '0004_timer_type'), + ] + + operations = [ + migrations.AlterField( + model_name='timer', + name='planet_moon', + field=models.CharField(blank=True, default='', max_length=254), + ), + ] diff --git a/allianceauth/timerboard/models.py b/allianceauth/timerboard/models.py index 7261ca45..bceafa29 100755 --- a/allianceauth/timerboard/models.py +++ b/allianceauth/timerboard/models.py @@ -26,7 +26,7 @@ class Timer(models.Model): details = models.CharField(max_length=254, default="") system = models.CharField(max_length=254, default="") - planet_moon = models.CharField(max_length=254, default="") + planet_moon = models.CharField(max_length=254, blank=True, default="") structure = models.CharField(max_length=254, default="") timer_type = models.CharField( max_length=254, diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index b22ba106..d7637b42 100644 --- a/allianceauth/timerboard/templates/timerboard/view.html +++ b/allianceauth/timerboard/templates/timerboard/view.html @@ -540,7 +540,7 @@ {% include 'bundles/moment-js.html' with locale=True %} {% include 'bundles/timers-js.html' %} -
- + {{ corpstats.corp.corporation_name }} - + {{ corpstats.corp.alliance.alliance_name }}
- + {{ main.main }}
{{ main.main }}
@@ -80,7 +80,7 @@
- + {{ alt.character_name }}
{{ alt.character_name }}
{{ member }} {{ member }} {% translate "Killboard" %} @@ -131,7 +131,7 @@ {% endfor %} {% for member in unregistered %}
{{ member.character_name }} {{ member.character_name }} {% translate "Killboard" %} @@ -160,7 +160,7 @@
{{ member.character_name }} {{ member.character_name }} diff --git a/allianceauth/corputils/templates/corputils/search.html b/allianceauth/corputils/templates/corputils/search.html index e8e80c1d..83c34802 100644 --- a/allianceauth/corputils/templates/corputils/search.html +++ b/allianceauth/corputils/templates/corputils/search.html @@ -21,7 +21,7 @@
{{ result.1.character_name }} {{ result.1.character_name }} {{ result.0.corp.corporation_name }} {% translate "Killboard" %}
- + {{ memberStat.mainchar.character_name }} {{ memberStat.mainchar.character_name }} {{ memberStat.n_chars }}
- + {{ corpStat.corp.corporation_name }} [{{ corpStat.corp.corporation_ticker }}][{{ corpStat.corp.corporation_ticker }}] {{ corpStat.corp.corporation_name }} {{ corpStat.corp.member_count }} {{ corpStat.n_fats }}
- + {{ member.main_char.character_name }} {% if member.main_char %} {{ member.main_char.character_name }} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 61ae0583..5a383501 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -63,7 +63,7 @@ {% for acceptrequest in acceptrequests %}
- + {{ acceptrequest.main_char.character_name }} {% if acceptrequest.main_char %} {{ acceptrequest.main_char.character_name }} @@ -120,7 +120,7 @@ {% for leaverequest in leaverequests %}
- + {{ leaverequest.main_char.character_name }} {% if leaverequest.main_char %} {{ leaverequest.main_char.character_name }} diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html index 5e3bbeb4..93507d46 100644 --- a/allianceauth/hrapplications/templates/hrapplications/create.html +++ b/allianceauth/hrapplications/templates/hrapplications/create.html @@ -15,11 +15,11 @@
{% if question.help_text %} -
{{ question.help_text }}
+
{{ question.help_text }}
{% endif %} {% for choice in question.choices.all %} - -
+ +
{% empty %} {% endfor %} diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html index dfc3e92f..b9e7f260 100644 --- a/allianceauth/hrapplications/templates/hrapplications/management.html +++ b/allianceauth/hrapplications/templates/hrapplications/management.html @@ -177,7 +177,7 @@
-
- + {% csrf_token %} {{ search_form|bootstrap }}
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html index f4164ecb..2656db31 100644 --- a/allianceauth/hrapplications/templates/hrapplications/view.html +++ b/allianceauth/hrapplications/templates/hrapplications/view.html @@ -48,7 +48,7 @@ {% for char in app.characters %}
- + {{ char.character_name }} {{ char.character_name }} {{ char.corporation_name }}