mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-19 12:11:55 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - Bootstrap3 modal working again in admin area.

Browse Source
This commit is contained in:
Cameron 2015-07-15 22:13:22 -07:00
parent a26de7bc84
commit 83288964f1
4 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/header.php
View File

@ -541,6 +541,12 @@ echo getAlert();
function getModal($caption = '', $type='')
{
if(deftrue('BOOTSTRAP') === 3) // see bootstrap3/admin_template.php
{
return '';
}
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable
{
return;

2
e107_themes/bootstrap3/admin_style.css
View File

@ -109,7 +109,7 @@ td.options .btn-group { display: flex; }
.label, .badge { text-shadow: 1px 1px 0px #000; box-shadow: 1px 1px 0px #000; }
#admin-ui-modal { width: 90%; }

41
e107_themes/bootstrap3/admin_template.php
View File

@ -191,7 +191,46 @@ $ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-nav navbar-fixed-top">
*/
$ADMIN_HEADER = '<div class="navbar navbar-default navbar-fixed-top" role="navigation">
/*
$ADMIN_MODAL = '<div id="uiModal" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-caption">&nbsp;</h4>
</div>
<div class="modal-body">
<p>Loading…</p>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
</div>
</div>';*/
$ADMIN_MODAL = '<div id="uiModal" class="modal fade">
<div id="admin-ui-modal" class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title modal-caption">&nbsp;</h4>
</div>
<div class="modal-body">
<p>Loading...</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->';
$ADMIN_HEADER = $ADMIN_MODAL. '
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container" >
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">

9
e107_web/js/core/admin.jquery.js
View File

@ -204,12 +204,17 @@ $(document).ready(function()
/* Bootstrap Modal window within an iFrame */
$('.e-modal').on('click', function(e)
{
e.preventDefault();
var url = $(this).attr('href');
var caption = $(this).attr('data-modal-caption');
var height = ($(window).height() * 0.7) - 50;
if(caption === undefined)
{
caption = '';
}
$('.modal-body').html('<div class="well"><iframe id="e-modal-iframe" width="100%" height="'+height+'px" frameborder="0" scrolling="auto" style="display:block;background-color:transparent" allowtransparency="true" src="' + url + '"></iframe></div>');
$('.modal-caption').html(caption + ' <i id="e-modal-loading" class="fa fa-spin fa-spinner"></i>');
$('.modal').modal('show');