From 99ddd90df81e8999b9454db83ed2e75236f4680b Mon Sep 17 00:00:00 2001
From: AuroraLS3 <AuroraLS3@users.noreply.github.com>
Date: Sat, 18 Sep 2021 19:53:28 +0000
Subject: [PATCH] 5.4.1445

---
 Plan/src/main/resources/assets/plan/plan/web/js/graphs.js | 8 +++++---
 .../main/resources/assets/plan/plan/web/js/loadErrors.js  | 4 ++--
 .../resources/assets/plan/plan/web/js/player-values.js    | 4 ++--
 .../resources/assets/plan/plan/web/js/sessionAccordion.js | 4 ++--
 Plan/src/main/resources/assets/plan/plan/web/network.html | 4 ++--
 Plan/src/main/resources/assets/plan/plan/web/player.html  | 2 +-
 Plan/src/main/resources/assets/plan/plan/web/server.html  | 4 ++--
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/graphs.js b/Plan/src/main/resources/assets/plan/plan/web/js/graphs.js
index 225900a42..fdcfd0f11 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/graphs.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/graphs.js
@@ -339,7 +339,7 @@ function playersChart(id, playersOnlineSeries, sel) {
             type: s.type.spline,
             tooltip: s.tooltip.zeroDecimals,
             data: averageGroupPoints(groupByInterval, minDate),
-            color: "#1E90FF",
+            color: "#02458d",
             yAxis: 0
         };
     }
@@ -360,7 +360,7 @@ function playersChart(id, playersOnlineSeries, sel) {
         type: s.type.spline,
         tooltip: s.tooltip.zeroDecimals,
         data: [],
-        color: "#1E90FF",
+        color: "#02458d",
         yAxis: 0
     };
 
@@ -373,18 +373,20 @@ function playersChart(id, playersOnlineSeries, sel) {
             softMax: 2,
             softMin: 0
         },
+        /* Average online players graph Disabled
         xAxis: {
             events: {
                 afterSetExtremes: updateAveragePlayers
             }
         },
+        */
         title: {text: ''},
         plotOptions: {
             areaspline: {
                 fillOpacity: 0.4
             }
         },
-        series: [playersOnlineSeries, emptyAveragePlayersSeries]
+        series: [playersOnlineSeries, /*emptyAveragePlayersSeries*/]
     }));
 }
 
diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/loadErrors.js b/Plan/src/main/resources/assets/plan/plan/web/js/loadErrors.js
index 4eccba4ed..6d23b6b01 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/loadErrors.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/loadErrors.js
@@ -8,14 +8,14 @@ function createErrorAccordionTitle(i, errorLog) {
     let style = 'bg-amber-outline';
     const tagLine = errorLog.contents[0];
     return `<tr id="error_h_${i}" aria-controls="error_t_${i}" aria-expanded="false" 
-                class="clickable collapsed ${style}" data-target="#error_t_${i}" data-toggle="collapse">
+                class="clickable collapsed ${style}" data-bs-target="#error_t_${i}" data-bs-toggle="collapse">
                 <td>${errorLog.fileName}</td>
                 <td>${tagLine}</td>
             </tr>`
 }
 
 function createErrorAccordionBody(i, errorLog) {
-    return `<tr class="collapse" data-parent="#tableAccordion" id="error_t_${i}">
+    return `<tr class="collapse" data-bs-parent="#tableAccordion" id="error_t_${i}">
                 <td colspan="2">
                     <pre class="pre-scrollable" style="overflow-x: scroll">${errorLog.contents.join('\n')}</pre>
                 </td>
diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js b/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
index 7c1af3aae..690641892 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
@@ -210,9 +210,9 @@ function createserverAccordionTitle(i, server) {
 // Lowercase due to locale translation: Server
 function createserverAccordionBody(i, server) {
 
-    return `<tr class="collapse" data-parent="#tableSAccordion" id="server_t_` + i + `">` +
+    return `<tr class="collapse" data-bs-parent="#tableSAccordion" id="server_t_` + i + `">` +
         `<td colspan="4">` +
-        `<div class="collapse row" data-parent="#tableSAccordion" id="server_t_` + i + `">` +
+        `<div class="collapse row" data-bs-parent="#tableSAccordion" id="server_t_` + i + `">` +
         `<div class="col-xs-12  col-sm-12 col-md-6 col-lg-6">` +
         (server.operator ? `<p><i class="col-blue fab fa-fw fa-superpowers"></i> Operator</p>` : ``) +
         (server.banned ? `<p><i class="col-red fas fa-fw fa-gavel"></i> Banned</p>` : ``) +
diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/sessionAccordion.js b/Plan/src/main/resources/assets/plan/plan/web/js/sessionAccordion.js
index e6f1a8928..1bedea23c 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/sessionAccordion.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/sessionAccordion.js
@@ -75,9 +75,9 @@ function createAccordionTitle(i, session) {
 }
 
 function createAccordionBody(i, session) {
-    return `<tr class="collapse" data-parent="#tableAccordion" id="session_t_${i}">
+    return `<tr class="collapse" data-bs-parent="#tableAccordion" id="session_t_${i}">
                 <td colspan="4">
-                    <div class="collapse row" data-parent="#tableAccordion" id="session_t_${i}">
+                    <div class="collapse row" data-bs-parent="#tableAccordion" id="session_t_${i}">
                         <div class="col-xs-12  col-sm-12 col-md-6 col-lg-6">
                             <p><i class="col-teal far fa-fw fa-clock"></i> Ended<span class="float-end"><b>${session.end}</b></span></p>
                             <p><i class="col-green far fa-fw fa-clock"></i> Length<span class="float-end"><b>${session.length}</b></span></p>
diff --git a/Plan/src/main/resources/assets/plan/plan/web/network.html b/Plan/src/main/resources/assets/plan/plan/web/network.html
index bf257dcb9..d579b739d 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/network.html
+++ b/Plan/src/main/resources/assets/plan/plan/web/network.html
@@ -67,7 +67,7 @@
                 <i class="fas fa-fw fa-server"></i>
                 <span>Servers</span>
             </a>
-            <div aria-labelledby="headingPages" class="collapse" data-parent="#accordionSidebar" id="serverPages">
+            <div aria-labelledby="headingPages" class="collapse" data-bs-parent="#accordionSidebar" id="serverPages">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item nav-button" href="#tab-servers"><i
                             class="fas fa-fw fa-network-wired"></i>
@@ -92,7 +92,7 @@
                 <i class="fas fa-fw fa-users"></i>
                 <span>Playerbase</span>
             </a>
-            <div aria-labelledby="headingPages" class="collapse" data-parent="#accordionSidebar"
+            <div aria-labelledby="headingPages" class="collapse" data-bs-parent="#accordionSidebar"
                  id="playerbasePages">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item nav-button" href="#tab-playerbase-overview"><i
diff --git a/Plan/src/main/resources/assets/plan/plan/web/player.html b/Plan/src/main/resources/assets/plan/plan/web/player.html
index 77cb38e2f..f39bf45b0 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/player.html
+++ b/Plan/src/main/resources/assets/plan/plan/web/player.html
@@ -86,7 +86,7 @@
                 <i class="fas fa-fw fa-cubes"></i>
                 <span>Plugins</span>
             </a>
-            <div aria-labelledby="headingPages" class="collapse" data-parent="#accordionSidebar" id="pluginsPages">
+            <div aria-labelledby="headingPages" class="collapse" data-bs-parent="#accordionSidebar" id="pluginsPages">
                 <div class="bg-white py-2 collapse-inner rounded">
                     ${navPluginsTabs}
                 </div>
diff --git a/Plan/src/main/resources/assets/plan/plan/web/server.html b/Plan/src/main/resources/assets/plan/plan/web/server.html
index 2308c9344..f1366f135 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/server.html
+++ b/Plan/src/main/resources/assets/plan/plan/web/server.html
@@ -67,7 +67,7 @@
                 <i class="fas fa-fw fa-chart-area"></i>
                 <span>Online Activity</span>
             </a>
-            <div aria-labelledby="headingPages" class="collapse" data-parent="#accordionSidebar"
+            <div aria-labelledby="headingPages" class="collapse" data-bs-parent="#accordionSidebar"
                  id="onlineActivityPages">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item nav-button" href="#tab-online-activity-overview"><i
@@ -90,7 +90,7 @@
                 <i class="fas fa-fw fa-users"></i>
                 <span>Playerbase</span>
             </a>
-            <div aria-labelledby="headingPages" class="collapse" data-parent="#accordionSidebar"
+            <div aria-labelledby="headingPages" class="collapse" data-bs-parent="#accordionSidebar"
                  id="playerbasePages">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item nav-button" href="#tab-playerbase-overview"><i