Merge pull request #7372 from open-sausages/pulls/4.0/fix-import-modal

BUG Fix import modal

src/Forms/GridField/GridFieldImportButton.php

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Forms\GridField;
 
-use SilverStripe\Control\Session;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Forms\Form;
 use SilverStripe\View\ArrayData;

templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss

@@ -2,12 +2,12 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                </button>
                 <% if $ImportModalTitle %>
                     <h2 class="modal-title">$ImportModalTitle</h2>
                 <% end_if %>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
             </div>
             <div class="modal-body">
                 <% if $ImportIframe %>