From 7669c9e55d8a1f6187bba4290113a060560319e8 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Thu, 7 Jul 2022 11:50:52 +0200 Subject: [PATCH 1/5] Add `filterDropDown.js` to bundles --- .../groupmanagement/templates/groupmanagement/audit.html | 2 +- .../permissions_tool/templates/permissions_tool/audit.html | 2 +- .../permissions_tool/templates/permissions_tool/overview.html | 2 +- allianceauth/templates/bundles/filterdropdown-js.html | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 allianceauth/templates/bundles/filterdropdown-js.html diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 88a750c2..6da9c504 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -74,7 +74,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} {% include 'bundles/moment-js.html' with locale=True %} - + {% include 'bundles/filterdropdown-js.html' %} {% endblock %} {% block extra_css %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html index caadd1ae..70f61d90 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html @@ -47,7 +47,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} - + {% include 'bundles/filterdropdown-js.html' %} {% endblock %} {% block extra_css %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index 439e5f21..c1e7618f 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -80,7 +80,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} - + {% include 'bundles/filterdropdown-js.html' %} {% endblock %} {% block extra_css %} diff --git a/allianceauth/templates/bundles/filterdropdown-js.html b/allianceauth/templates/bundles/filterdropdown-js.html new file mode 100644 index 00000000..5ce5ce98 --- /dev/null +++ b/allianceauth/templates/bundles/filterdropdown-js.html @@ -0,0 +1,3 @@ +{% load static %} + + From d8c29449667db465809e8b7517ed2404c71d8eac Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Thu, 7 Jul 2022 11:55:10 +0200 Subject: [PATCH 2/5] [FIX] table HTML syntax --- .../templates/groupmanagement/audit.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 6da9c504..8b6c10f9 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -25,13 +25,15 @@
- - - - - - - + + + + + + + + + From 7c05217900f984929f28770813a0c2aa669ea664 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 9 Jul 2022 15:45:25 +0200 Subject: [PATCH 3/5] Add `timers.js` to bundle It's used in `mumbletemps` --- allianceauth/optimer/templates/optimer/management.html | 2 +- allianceauth/templates/bundles/timers-js.html | 3 +++ allianceauth/timerboard/templates/timerboard/view.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 allianceauth/templates/bundles/timers-js.html diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html index bbf79798..95abf969 100644 --- a/allianceauth/optimer/templates/optimer/management.html +++ b/allianceauth/optimer/templates/optimer/management.html @@ -40,7 +40,7 @@ {% include 'bundles/moment-js.html' with locale=True %} - + {% include 'bundles/timers-js.html' %} diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index 976d3d6b..b22ba106 100644 --- a/allianceauth/timerboard/templates/timerboard/view.html +++ b/allianceauth/timerboard/templates/timerboard/view.html @@ -539,7 +539,7 @@ {% include 'bundles/moment-js.html' with locale=True %} - + {% include 'bundles/timers-js.html' %} - + {% include 'bundles/evetime-js.html' %} {% block extra_javascript %} {% endblock extra_javascript %} diff --git a/allianceauth/templates/bundles/evetime-js.html b/allianceauth/templates/bundles/evetime-js.html new file mode 100644 index 00000000..63b712c3 --- /dev/null +++ b/allianceauth/templates/bundles/evetime-js.html @@ -0,0 +1,3 @@ +{% load static %} + + From 8c1f06d7b8e651966c924758f0b1b77e4b52d776 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sat, 9 Jul 2022 15:51:55 +0200 Subject: [PATCH 5/5] Added `refresh_notifications.js` to bundles Probably used in template overrides --- allianceauth/templates/allianceauth/base.html | 2 +- allianceauth/templates/bundles/refresh-notifications-js.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 allianceauth/templates/bundles/refresh-notifications-js.html diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html index 3a266380..d7e66e53 100644 --- a/allianceauth/templates/allianceauth/base.html +++ b/allianceauth/templates/allianceauth/base.html @@ -49,7 +49,7 @@ userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}" }; - + {% include 'bundles/refresh-notifications-js.html' %} {% include 'bundles/evetime-js.html' %} {% block extra_javascript %} diff --git a/allianceauth/templates/bundles/refresh-notifications-js.html b/allianceauth/templates/bundles/refresh-notifications-js.html new file mode 100644 index 00000000..27622b3e --- /dev/null +++ b/allianceauth/templates/bundles/refresh-notifications-js.html @@ -0,0 +1,3 @@ +{% load static %} + +
{% translate "Date/Time" %}{% translate "Requestor" %}{% translate "Character" %}{% translate "Corporation" %}{% translate "Type" %}{% translate "Action" %}{% translate "Actor" %}
{% translate "Date/Time" %}{% translate "Requestor" %}{% translate "Character" %}{% translate "Corporation" %}{% translate "Type" %}{% translate "Action" %}{% translate "Actor" %}