From 9743cb4e95175a6245d4dcc60a52b5c1e17c0a56 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 2 Dec 2021 11:20:58 -0800
Subject: [PATCH] Fixes #4528 - Frontend modal now functional with Bootstrap5.

---
 e107_core/templates/header_default.php | 9 +++++----
 e107_plugins/online/online_menu.php    | 2 +-
 e107_web/css/e107.css                  | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 8ed165c84..f9cb16cee 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -742,17 +742,18 @@ if(deftrue('BOOTSTRAP'))
 //	if(empty($LAYOUT['_modal_'])) // leave it set for now.
 	{
 		$LAYOUT['_modal_'] = '<div id="uiModal" class="modal fade" tabindex="-1" role="dialog"  aria-hidden="true">
-					<div class="modal-dialog modal-lg">
+					<div class="modal-dialog modal-lg modal-xl modal-dialog-centered modal-dialog-scrollable">
 						<div class="modal-content">
 				            <div class="modal-header">
-				                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				                <h4 class="modal-caption">&nbsp;</h4>
+				            	<h4 class="modal-caption modal-title col-sm-11">&nbsp;</h4>
+				                <button type="button" class="close" data-dismiss="modal" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				                
 				             </div>
 				             <div class="modal-body">
 				             <p>Loading…</p>
 				             </div>
 				             <div class="modal-footer">
-				                <a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
+				                <a href="#" data-dismiss="modal" data-bs-dismiss="modal" class="btn btn-primary">Close</a>
 				            </div>
 			            </div>
 		            </div>
diff --git a/e107_plugins/online/online_menu.php b/e107_plugins/online/online_menu.php
index 825c28a87..de1095814 100644
--- a/e107_plugins/online/online_menu.php
+++ b/e107_plugins/online/online_menu.php
@@ -143,7 +143,7 @@ $caption = $img.' '.vartrue($menu_pref['online_caption'], LAN_ONLINE_4);
 if (getperms('1')) 
 {
 	$path = e_PLUGIN_ABS."online/config.php?iframe=1";
-	$caption .= "<a class='e-modal pull-right float-right' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='fa fa-cog'></i></a>";
+	$caption .= "<a class='e-modal pull-right float-right float-end' data-bs-toggle='modal' data-bs-target='#uiModal' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='fa fa-cog'></i></a>";
 }
 
 
diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css
index d36992763..e34c23d5f 100644
--- a/e107_web/css/e107.css
+++ b/e107_web/css/e107.css
@@ -397,13 +397,13 @@ div.login-page-signup-link, div.login-page-fpw-link { text-align:center }
 
 div.search-menu { text-align: center }
 
-div.e-debug                     { margin-top:50px; padding:5px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: rgb(39, 43, 48); color: rgb(200, 200, 200) }
-div.e-debug .table              { background-color: rgb(46, 51, 56); border-collapse: collapse; border-spacing: 0; box-sizing: border-box;
+div.e-debug                     { margin-top:50px; padding:5px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: rgb(39, 43, 48) !important; color: rgb(200, 200, 200) !important }
+div.e-debug .table              { background-color: rgb(46, 51, 56) !important; border-collapse: collapse; border-spacing: 0; box-sizing: border-box;
                                 color: rgb(200, 200, 200); font-size: 14px; line-height: 20px; margin-bottom: 20px; width: 100%;  }
 
-div.e-debug .table-striped > tbody > tr:nth-of-type(2n+1) { background-color: #353a41; }
+div.e-debug .table-striped > tbody > tr:nth-of-type(2n+1) { background-color: #353a41 !important; }
 
-div.e-debug td, div.e-debug th  { padding: 5px;  color: rgb(200, 200, 200); }
+div.e-debug td, div.e-debug th  { padding: 5px;  color: rgb(200, 200, 200) !important; }
 div.e-debug td                  { font-size: 14px; line-height: 20px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #1c1e22; }
 div.e-debug h4                  { text-shadow: -1px -1px 0 rgba(0,0,0,0.3); font-size: 18px; }
 div.e-debug .label              { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: 700; line-height: 1;