tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
BUG Fix import modal
This commit is contained in:
Chris Joe 2017-09-13 13:49:41 +12:00 committed by GitHub
commit c329891b56
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Forms/GridField/GridFieldImportButton.php
View File

@ -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;

6
templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
View File

@ -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 %>