From 50948c7a65699a64a2f889cc5da7c7be51bb8431 Mon Sep 17 00:00:00 2001
From: Rsl1122 <24460436+Rsl1122@users.noreply.github.com>
Date: Sun, 12 Jan 2020 17:24:32 +0200
Subject: [PATCH] Fixed Plugin tab names

Tab name was not being used, instead every plugin would show "Plugins Overview"
The server name was also missing on server & network page
---
 .../plan/delivery/rendering/pages/NetworkPage.java          | 1 +
 .../plan/delivery/rendering/pages/PlayerPluginTab.java      | 4 ++--
 .../plan/delivery/rendering/pages/ServerPluginTabs.java     | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java
index 8d6534b83..5160bff34 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java
@@ -78,6 +78,7 @@ public class NetworkPage implements Page {
 
             UUID serverUUID = serverInfo.getServerUUID();
             placeholders.put("networkDisplayName", config.get(ProxySettings.NETWORK_NAME));
+            placeholders.put("serverName", config.get(ProxySettings.NETWORK_NAME));
             placeholders.put("serverUUID", serverUUID.toString());
 
             placeholders.put("gmPieColors", theme.getValue(ThemeVal.GRAPH_GM_PIE));
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java
index 56907b247..24f6f99f6 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java
@@ -123,8 +123,8 @@ public class PlayerPluginTab implements Comparable<PlayerPluginTab> {
         return wrapInTab(serverName, tabBuilder.toString());
     }
 
-    private String wrapInTab(String tabName, String content) {
-        return "<div class=\"tab\" id=\"" + new Format(tabName).justLetters().lowerCase() + "\"><div class=\"container-fluid mt-4\">" +
+    private String wrapInTab(String serverName, String content) {
+        return "<div class=\"tab\" id=\"plugins-" + new Format(serverName).justLetters().lowerCase() + "\"><div class=\"container-fluid mt-4\">" +
                 // Page heading
                 "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
                 "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>" + serverName + " &middot; Plugins Overview</h1>${backButton}" +
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java
index ef6b55119..eb1e0cb5a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java
@@ -152,14 +152,14 @@ public class ServerPluginTabs {
             tabBuilder.append(wrapInContainer(extensionInformation, tabsElement));
         }
 
-        return wrapInTab("Overview", tabBuilder.toString());
+        return wrapInTab("Plugins Overview", tabBuilder.toString());
     }
 
     private String wrapInTab(String tabName, String content) {
-        return "<div class=\"tab\" id=\"" + new Format(tabName).justLetters().lowerCase() + "\"><div class=\"container-fluid mt-4\">" +
+        return "<div class=\"tab\" id=\"plugins-" + new Format(tabName).justLetters().lowerCase() + "\"><div class=\"container-fluid mt-4\">" +
                 // Page heading
                 "<div class=\"d-sm-flex align-items-center justify-content-between mb-4\">" +
-                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i><span class=\"server-name\"></span> &middot; Plugins Overview</h1>${backButton}" +
+                "<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>${serverName} &middot; " + tabName + "</h1>${backButton}" +
                 "</div>" +
                 // End Page heading
                 "<div class=\"card-columns\">" + content + "</div></div></div>";