Fix: modal in FileAdmin

flask_admin/templates/bootstrap4/admin/file/list.html

@@ -143,7 +143,7 @@
     {% block toolbar %}
     <div class="btn-toolbar">
         {% if admin_view.can_upload %}
-        <div class="mx-1">
+        <div class="btn-group">
             {%- if admin_view.upload_modal -%}
               {{ lib.add_modal_button(url=get_dir_url('.upload', path=dir_path, modal=True),
                                       btn_class="btn btn-secondary",
@@ -187,4 +187,5 @@
     {{ actionslib.script(_gettext('Please select at least one file.'),
                          actions,
                          actions_confirmation) }}
+  <script src="{{ admin_static.url(filename='admin/js/bs4_modal.js', v='1.0.0') }}"></script>
 {% endblock %}

flask_admin/templates/bootstrap4/admin/file/modals/form.html

@@ -4,8 +4,8 @@
 {% block body %}
   {# content added to modal-content #}
   <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     {% block header %}<h3>{{ header_text }}</h3>{% endblock %}
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
   </div>
   <div class="modal-body">
     {% block fa_form %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block tail %}
-  <script src="{{ admin_static.url(filename='admin/js/bs3_modal.js', v='1.0.0') }}"></script>
+  <script src="{{ admin_static.url(filename='admin/js/bs4_modal.js', v='1.0.0') }}"></script>
 {% endblock %}