From 76dfad931175a2ae0bb00f33d5f332ff8780f962 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 6 Mar 2020 14:18:57 -0800
Subject: [PATCH] Admin-UI: Fix for $adminMenu attribute 'modal-caption' not
 functioning. Use 'modal'=>true to enable first.

---
 e107_tests/tests/unit/e_user_providerTest.php |  2 +-
 e107_themes/bootstrap3/admin_template.php     | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/e107_tests/tests/unit/e_user_providerTest.php b/e107_tests/tests/unit/e_user_providerTest.php
index 263ae0e4e..658278758 100644
--- a/e107_tests/tests/unit/e_user_providerTest.php
+++ b/e107_tests/tests/unit/e_user_providerTest.php
@@ -34,7 +34,7 @@ class e_user_providerTest extends \Codeception\Test\Unit
 		$this->assertIsArray($result);
 		$this->assertContains("Facebook", $result);
 		$this->assertContains("Twitter", $result);
-		$this->assertCount(42, $result,
+		$this->assertCount(45, $result,
 			"The number of Hybridauth providers has changed! If this is intentional, note the change " .
 			"in Hybridauth providers in the release changelog and update the count in this test."
 		);
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index d5b0454be..888b566a2 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -54,7 +54,7 @@ $E_ADMIN_NAVIGATION['button_enav_home'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
 		 {LINK_IMAGE} {LINK_TEXT} 
-		 </a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		 </a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px;" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 <b class="caret"></b>
 		</a>
 		{SUB_MENU}
@@ -100,10 +100,10 @@ $E_ADMIN_NAVIGATION['button_enav_logout'] = '
 $E_ADMIN_NAVIGATION['button_pm'] = '
 	<li class="dropdown">
 		<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
-		<i class="icon-envelope" class="active"></i> 3
+		<i class="icon-envelope active"></i> 3
 		<b class="caret"></b>
 		</a> 
-		<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
+		<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px;">
 		    <ul class="nav-list">
 	    <li class="dropdown-header nav-header">Unread Messages</li>
 	    <li><a href="#">Incoming Message Number 1</a></li>
@@ -174,7 +174,7 @@ $ADMIN_MODAL = '
 				<p>'.LAN_LOADING.'</p>
 			</div>
 			<div class="modal-footer">
-				<button type="button" id="e-modal-submit" class="btn btn-success" style="display:none" data-loading-icon="fa-spinner"><!-- placeholder --></button>
+				<button type="button" id="e-modal-submit" class="btn btn-success" style="display:none;" data-loading-icon="fa-spinner"><!-- placeholder --></button>
 				<button type="button" class="btn btn-primary" data-dismiss="modal">'.LAN_CLOSE.'</button>
 			</div>
 		</div>
@@ -289,19 +289,19 @@ $E_ADMIN_MENU['start'] = '
 
 $E_ADMIN_MENU['button'] = '
 	<li>
-		<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
+		<a class="link{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
 		{SUB_MENU}
 	</li>
 ';
 $E_ADMIN_MENU['button_active'] = '
 	<li class="active">
-		<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
+		<a class="link-active{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
 		{SUB_MENU}
 	</li>
 ';
 
 $E_ADMIN_MENU['start_sub'] = '
-		<ul class="plugin-navigation-sub{SUB_CLASS}"{SUB_ID}>
+		<ul class="plugin-navigation-sub{SUB_CLASS}" {SUB_ID}>
 ';
 
 $E_ADMIN_MENU['button_sub'] = '
@@ -329,4 +329,3 @@ $E_ADMIN_MENU['end'] = '
 $E_ADMIN_MENU['divider'] = '<li role="separator" class="divider"></li>';
 
 
-?>
\ No newline at end of file