From 83288964f179570fe706ff5df7fc84db5af25ebb Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 15 Jul 2015 22:13:22 -0700
Subject: [PATCH] Issue #1138 - Bootstrap3 modal working again in admin area.

---
 e107_admin/header.php                     |  6 ++++
 e107_themes/bootstrap3/admin_style.css    |  2 +-
 e107_themes/bootstrap3/admin_template.php | 41 ++++++++++++++++++++++-
 e107_web/js/core/admin.jquery.js          |  9 +++--
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/e107_admin/header.php b/e107_admin/header.php
index 73f7b6212..77b39af5a 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -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;
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 36e7d5ce5..dbcf8a6a6 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -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%; }
 
 
 
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 8a690162e..83047dcde 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -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">
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index cbe520207..c765011f3 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -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');