Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-08-07 21:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Fixed Plugin tab names

Browse Source 
Tab name was not being used, instead every plugin would show "Plugins Overview"
The server name was also missing on server & network page
This commit is contained in:
Rsl1122 2020-01-12 17:24:32 +02:00
parent 7c0f4450a7
commit 50948c7a65
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java
View File

@ -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));

4
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java
View File

@ -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}" +

6
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java
View File

@ -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>";