From 3bd6baa8f9a692dda1e0a1bd4d0b61eb3e8665d0 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Mon, 18 Jul 2022 21:35:49 +0200 Subject: [PATCH 1/2] Templates cleaned up / fixed - Deprecated CSS atrributes removed - HTML fixes - Mandatory attributes added - Missing semicolons added - Missing closing tags added - Missing label association in forms added/fixed - Missing quotes added - Closing tags that have no opening tag removed - Bootstrap fixes - Unused template tags removed --- .../templates/authentication/dashboard.html | 23 ++++++++++--------- .../authentication/templates/public/base.html | 2 +- .../templates/public/login.html | 2 +- .../templates/corputils/corpstats.html | 14 +++++------ .../corputils/templates/corputils/search.html | 2 +- .../characternotexisting.html | 2 +- .../fleetactivitytracking/fatlinkmodify.html | 1 - .../fatlinkpersonalmonthlystatisticsview.html | 1 - .../fatlinkpersonalstatisticsview.html | 1 - .../fatlinkstatisticscorpview.html | 3 +-- .../fatlinkstatisticsview.html | 5 ++-- .../fleetactivitytracking/fatlinkview.html | 1 - .../groupmanagement/groupmembers.html | 2 +- .../templates/groupmanagement/index.html | 4 ++-- .../templates/hrapplications/create.html | 6 ++--- .../templates/hrapplications/management.html | 2 +- .../templates/hrapplications/searchview.html | 2 +- .../templates/hrapplications/view.html | 2 +- .../templates/notifications/list.html | 12 +++++----- .../optimer/templates/optimer/management.html | 1 - .../templates/permissions_tool/audit.html | 2 -- .../templates/permissions_tool/audit_row.html | 2 +- .../templates/permissions_tool/overview.html | 2 -- .../services/mumble/mumble_service_ctrl.html | 8 +++---- .../teamspeak3/teamspeak3_service_ctrl.html | 2 +- .../services/service_credentials.html | 2 +- allianceauth/srp/templates/srp/data.html | 8 +++---- .../srp/templates/srp/management.html | 3 +-- .../allianceauth/admin-status/overview.html | 4 ++-- .../templates/allianceauth/top-menu.html | 2 +- .../timerboard/templates/timerboard/view.html | 4 ++-- 31 files changed, 57 insertions(+), 70 deletions(-) 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/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..c65858ca 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 %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html index 70f61d90..1239d69c 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html @@ -1,6 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{{ permission.permission.codename }} - {% translate "Permissions Audit" %}{% endblock page_title %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html index b6d25192..55313c24 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html @@ -5,7 +5,7 @@ {{ type }}: {{ name }}
+ESC to cancel{% endblocktrans %}" id="blah"> {% if perms.auth.srp_management %} @@ -113,7 +112,6 @@ ESC to cancel{% endblocktrans %}"id="blah"> {% endif %} [{{ srpfleetrequest.character.corporation.corporation_ticker }}] {{ srpfleetrequest.character.character_name }}  -
- + {{ 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 }} - + {{ user.profile.main_character.character_name }} {{ user }}
 diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index c1e7618f..50eafbbe 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -1,6 +1,4 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} -{% load static %} {% load i18n %} {% block page_title %}{% translate "Permissions Overview" %}{% endblock page_title %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html index 8415ba77..4d751238 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html @@ -4,17 +4,17 @@ 		{{ service_url }} {% if username == "" %} - + {% else %} - + - + - + diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html index 3b3ba578..736788be 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html @@ -10,7 +10,7 @@ {% else %} - + diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html index 48a7b949..eb9e4fe0 100644 --- a/allianceauth/services/templates/services/service_credentials.html +++ b/allianceauth/services/templates/services/service_credentials.html @@ -12,7 +12,7 @@ {% for key, value in credentials.items %}
- +
{% endfor %} diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html index 96dd7473..4974bcea 100644 --- a/allianceauth/srp/templates/srp/data.html +++ b/allianceauth/srp/templates/srp/data.html @@ -1,10 +1,9 @@ {% extends "allianceauth/base.html" %} -{% load bootstrap %} {% load static %} {% load i18n %} {% load humanize %} -{% block page_title %}Srp Fleet Data{% endblock page_title %} +{% block page_title %}{% translate "Srp Fleet Data" %}{% endblock page_title %} {% block extra_css %} {% include 'bundles/datatables-css.html' %} {% include 'bundles/x-editable.css.html' %} @@ -96,7 +95,7 @@ 		{% translate "SRP ISK Cost" %} {% translate "Post Time" %} {% translate "Status" %} {% include 'bundles/clipboard-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/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index 4ac9ec3e..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' %} -