Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-14 06:50:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-filterdropdown-js-to-bundles' into 'v3.x'

Browse Source 
Add filterdropdown js to bundles

See merge request allianceauth/allianceauth!1436
This commit is contained in:
Ariel Rin 2022-07-11 04:14:46 +00:00
commit 54bce4315b
10 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/groupmanagement/templates/groupmanagement/audit.html
View File

@ -25,6 +25,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped" id="log-entries"> <table class="table table-striped" id="log-entries">
<thead> <thead>
<tr>
<th scope="col">{% translate "Date/Time" %}</th> <th scope="col">{% translate "Date/Time" %}</th>
<th scope="col">{% translate "Requestor" %}</th> <th scope="col">{% translate "Requestor" %}</th>
<th scope="col">{% translate "Character" %}</th> <th scope="col">{% translate "Character" %}</th>
@ -32,6 +33,7 @@
<th scope="col">{% translate "Type" %}</th> <th scope="col">{% translate "Type" %}</th>
<th scope="col">{% translate "Action" %}</th> <th scope="col">{% translate "Action" %}</th>
<th scope="col">{% translate "Actor" %}</th> <th scope="col">{% translate "Actor" %}</th>
</tr>
</thead> </thead>
<tbody> <tbody>
@ -74,7 +76,7 @@
{% block extra_javascript %} {% block extra_javascript %}
{% include 'bundles/datatables-js.html' %} {% include 'bundles/datatables-js.html' %}
{% include 'bundles/moment-js.html' with locale=True %} {% include 'bundles/moment-js.html' with locale=True %}
<script type="application/javascript" src="{% static 'allianceauth/js/filterDropDown/filterDropDown.min.js' %}"></script> {% include 'bundles/filterdropdown-js.html' %}
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}

2
allianceauth/optimer/templates/optimer/management.html
View File

@ -40,7 +40,7 @@
</div> </div>
{% include 'bundles/moment-js.html' with locale=True %} {% include 'bundles/moment-js.html' with locale=True %}
<script src="{% static 'allianceauth/js/timers.js' %}"></script> {% include 'bundles/timers-js.html' %}
<script type="application/javascript"> <script type="application/javascript">
// Data // Data

2
allianceauth/permissions_tool/templates/permissions_tool/audit.html
View File

@ -47,7 +47,7 @@
{% block extra_javascript %} {% block extra_javascript %}
{% include 'bundles/datatables-js.html' %} {% include 'bundles/datatables-js.html' %}
<script type="application/javascript" src="{% static 'allianceauth/js/filterDropDown/filterDropDown.min.js' %}"></script> {% include 'bundles/filterdropdown-js.html' %}
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}

2
allianceauth/permissions_tool/templates/permissions_tool/overview.html
View File

@ -80,7 +80,7 @@
{% block extra_javascript %} {% block extra_javascript %}
{% include 'bundles/datatables-js.html' %} {% include 'bundles/datatables-js.html' %}
<script type="application/javascript" src="{% static 'allianceauth/js/filterDropDown/filterDropDown.min.js' %}"></script> {% include 'bundles/filterdropdown-js.html' %}
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}

4
allianceauth/templates/allianceauth/base.html
View File

@ -49,8 +49,8 @@
userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}" userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}"
}; };
</script> </script>
<script src="{% static 'allianceauth/js/refresh_notifications.js' %}"></script> {% include 'bundles/refresh-notifications-js.html' %}
<script src="{% static 'allianceauth/js/eve-time.js' %}"></script> {% include 'bundles/evetime-js.html' %}
{% block extra_javascript %} {% block extra_javascript %}
{% endblock extra_javascript %} {% endblock extra_javascript %}

3
allianceauth/templates/bundles/evetime-js.html Normal file
View File

@ -0,0 +1,3 @@
{% load static %}
<script src="{% static 'allianceauth/js/eve-time.js' %}"></script>

3
allianceauth/templates/bundles/filterdropdown-js.html Normal file
View File

@ -0,0 +1,3 @@
{% load static %}
<script type="application/javascript" src="{% static 'allianceauth/js/filterDropDown/filterDropDown.min.js' %}"></script>

3
allianceauth/templates/bundles/refresh-notifications-js.html Normal file
View File

@ -0,0 +1,3 @@
{% load static %}
<script src="{% static 'allianceauth/js/refresh_notifications.js' %}"></script>

3
allianceauth/templates/bundles/timers-js.html Normal file
View File

@ -0,0 +1,3 @@
{% load static %}
<script src="{% static 'allianceauth/js/timers.js' %}"></script>

2
allianceauth/timerboard/templates/timerboard/view.html
View File

@ -539,7 +539,7 @@
</div> </div>
{% include 'bundles/moment-js.html' with locale=True %} {% include 'bundles/moment-js.html' with locale=True %}
<script src="{% static 'allianceauth/js/timers.js' %}"></script> {% include 'bundles/timers-js.html' %}
<script type="application/javascript"> <script type="application/javascript">
let timers = [ let timers = [
{% for timer in timers %} {% for timer in timers %}