Skip to content

Commit d2ab0ac

Browse files
fix javascript errors
1 parent 19bcdad commit d2ab0ac

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

dojo/templates/base.html

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,20 @@
4646
<!-- jquery cookie -->
4747
<script src="{% static "jquery.cookie/jquery.cookie.js" %}"></script>
4848
<!-- DataTables Javascript -->
49-
<script src="{% static "datatables.net/js/dataTables.min.js" %}"></script>
50-
<script src="{% static "datatables.net-dt/js/dataTables.dataTables.min.js" %}"></script>
51-
<script src="{% static "datatables.net-bs/js/dataTables.bootstrap.min.js" %}"></script>
52-
<script src="{% static "datatables.net-buttons/js/dataTables.buttons.min.js" %}"></script>
53-
<script src="{% static "datatables.net-buttons/js/buttons.html5.min.js" %}"></script>
54-
<script src="{% static "datatables.net-buttons/js/buttons.colVis.min.js" %}"></script>
55-
<script src="{% static "datatables.net-buttons/js/buttons.print.min.js" %}"></script>
56-
<script src="{% static "datatables.net-buttons-bs/js/buttons.bootstrap.min.js" %}"></script>
57-
<script src="{% static "datatables.net-colreorder/js/dataTables.colReorder.min.js" %}"></script>
49+
<!-- DataTables core (required) -->
50+
<script src="{% static 'datatables.net/js/dataTables.min.js' %}"></script>
51+
<!-- DataTables with Bootstrap styling (integration) -->
52+
<script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
53+
<!-- DataTables Buttons extension (core) -->
54+
<script src="{% static 'datatables.net-buttons/js/dataTables.buttons.min.js' %}"></script>
55+
<!-- DataTables Buttons Bootstrap integration -->
56+
<script src="{% static 'datatables.net-buttons-bs/js/buttons.bootstrap.min.js' %}"></script>
57+
<!-- Other Buttons extensions -->
58+
<script src="{% static 'datatables.net-buttons/js/buttons.html5.min.js' %}"></script>
59+
<script src="{% static 'datatables.net-buttons/js/buttons.colVis.min.js' %}"></script>
60+
<script src="{% static 'datatables.net-buttons/js/buttons.print.min.js' %}"></script>
61+
<!-- ColReorder extension -->
62+
<script src="{% static 'datatables.net-colreorder/js/dataTables.colReorder.min.js' %}"></script>
5863

5964
<script src="{% static "pdfmake/build/pdfmake.min.js" %}"></script>
6065
<script src="{% static "pdfmake/build/vfs_fonts.js" %}"></script>
@@ -1044,7 +1049,7 @@ <h3 class="no-margin-top" style="padding-bottom: 5px;">
10441049
<div class="modal fade" id="sessionTimeoutModal" tabindex="-1" role="dialog" aria-labelledby="sessionModalLabel" aria-hidden="true">
10451050
<div class="modal-dialog" role="document">
10461051
<div class="modal-content">
1047-
<div class="modal-header">
1052+
<div class="modal-header">
10481053
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
10491054
<span aria-hidden="true">&times;</span>
10501055
</button>
@@ -1111,7 +1116,7 @@ <h4 class="modal-title" id="sessionModalLabel">Session Expiring Soon</h4>
11111116
function() { $(this).popover('show'); }, // hover
11121117
function() { $(this).popover('hide'); } // unhover
11131118
);
1114-
1119+
11151120
{% if request.user.is_authenticated %}
11161121
function session_notifcation() {
11171122
var warningTime = "{{ session_notify_time|default:0|escapejs }}"; // When the warning will show
@@ -1122,7 +1127,7 @@ <h4 class="modal-title" id="sessionModalLabel">Session Expiring Soon</h4>
11221127
$('#sessionTimeoutModal').modal('show');
11231128
}, timeout * 1000);
11241129

1125-
}
1130+
}
11261131
session_notifcation();
11271132
$('#sessionTimeoutModal').on('show.bs.modal', function (event) {
11281133
$(this).attr('aria-hidden', 'false');

0 commit comments

Comments
 (0)