mirror of https://gitlab.crans.org/bde/nk20
Update django-light-admin, fix conflict between jQuery, select2 and turbolinks
This commit is contained in:
parent
0728ba4a5c
commit
886abd8188
|
@ -3,7 +3,7 @@ chardet==3.0.4
|
|||
defusedxml==0.6.0
|
||||
Django~=2.2
|
||||
django-allauth==0.39.1
|
||||
django-autocomplete-light==3.3.0
|
||||
django-autocomplete-light==3.5.1
|
||||
django-crispy-forms==1.7.2
|
||||
django-extensions==2.1.9
|
||||
django-filter==2.2.0
|
||||
|
|
|
@ -31,18 +31,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
<link rel="stylesheet"
|
||||
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
|
||||
|
||||
{# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
|
||||
{% if form.media %}
|
||||
{{ form.media }}
|
||||
{% endif %}
|
||||
|
||||
{# Select2 JavaScript #}
|
||||
<script type="text/javascript" src="/static/admin/js/vendor/jquery/jquery.js"></script>
|
||||
<script type="text/javascript" src="/static/admin/js/vendor/select2/select2.full.js"></script>
|
||||
<script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/fr.js"></script>
|
||||
<script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/en.js"></script>
|
||||
<script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/de.js"></script>
|
||||
|
||||
{# Bootstrap JavaScript #}
|
||||
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
|
||||
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
|
||||
|
@ -59,6 +47,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
src="https://cdnjs.cloudflare.com/ajax/libs/turbolinks/5.2.0/turbolinks.js"
|
||||
crossorigin="anonymous"></script>
|
||||
|
||||
{# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
|
||||
{% if form.media %}
|
||||
{{ form.media }}
|
||||
{% endif %}
|
||||
|
||||
{% block extracss %}{% endblock %}
|
||||
</head>
|
||||
<body class="d-flex w-100 h-100 flex-column">
|
||||
|
|
Loading…
Reference in New Issue