From 5bba175558862cd6410e4cb11f8aac00a3ff083f Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 24 Aug 2019 11:16:12 +0300 Subject: [PATCH] Back button to /server and /player --- .../djrapitops/plan/utilities/html/Html.java | 15 ++++- .../utilities/html/pages/PageFactory.java | 1 + .../plan/utilities/html/pages/PlayerPage.java | 7 +-- .../utilities/html/pages/PlayerPluginTab.java | 2 +- .../plan/utilities/html/pages/ServerPage.java | 11 ++-- .../html/pages/ServerPluginTabs.java | 2 +- .../resources/assets/plan/web/player.html | 28 ++-------- .../resources/assets/plan/web/server.html | 56 +++---------------- 8 files changed, 37 insertions(+), 85 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/Html.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/Html.java index 59666bbdd..48be23edb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/Html.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/Html.java @@ -47,7 +47,20 @@ public enum Html { SPAN("${0}"), LINK("${1}"), - LINK_EXTERNAL("${1}"); + LINK_EXTERNAL("${1}"), + + BACK_BUTTON_NETWORK("" + + "" + + "" + + "" + + "Network page" + + ""), + BACK_BUTTON_SERVER("" + + "" + + "" + + "" + + "Server page" + + ""); private final String html; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java index cbba6408e..bee69b8b9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java @@ -110,6 +110,7 @@ public class PageFactory { versionCheckSystem.get(), fileSystem.get(), dbSystem.get(), + serverInfo.get(), formatters.get() )).orElseThrow(() -> new NotFoundException("Server not found in the database")); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPage.java index 69b4b77e1..7a928db1a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPage.java @@ -28,6 +28,7 @@ import com.djrapitops.plan.system.update.VersionCheckSystem; import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; +import com.djrapitops.plan.utilities.html.Html; import java.io.IOException; import java.util.UUID; @@ -106,11 +107,7 @@ public class PlayerPage implements Page { placeholders.put("serverPieColors", theme.getValue(ThemeVal.GRAPH_SERVER_PREF_PIE)); placeholders.put("firstDay", 1); - if (serverInfo.getServer().isProxy()) { - placeholders.put("backButton", "
  • arrow_backcloud
    • "); - } else { - placeholders.put("backButton", "
  • arrow_backstorage
    • "); - } + placeholders.put("backButton", (serverInfo.getServer().isProxy() ? Html.BACK_BUTTON_NETWORK : Html.BACK_BUTTON_SERVER).parse()); PlayerPluginTab pluginTabs = pageFactory.inspectPluginTabs(playerUUID); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java index a61aac4a9..48b9fe9f0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java @@ -129,7 +129,7 @@ public class PlayerPluginTab implements Comparable { return "
    " + // Page heading "
    " + - "

    ${playerName} · " + serverName + " Plugins

    " + + "

    ${playerName} · " + serverName + " Plugins

    ${backButton}" + "
    " + // End Page heading "
    " + content + "
    "; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java index 9c3db5926..ee39261e9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java @@ -25,6 +25,7 @@ import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionSer import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.server.Server; +import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.paths.DisplaySettings; import com.djrapitops.plan.system.settings.theme.Theme; @@ -32,6 +33,7 @@ import com.djrapitops.plan.system.settings.theme.ThemeVal; import com.djrapitops.plan.system.update.VersionCheckSystem; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; +import com.djrapitops.plan.utilities.html.Html; import java.io.IOException; import java.util.List; @@ -51,6 +53,7 @@ public class ServerPage implements Page { private final VersionCheckSystem versionCheckSystem; private final PlanFiles files; private final DBSystem dbSystem; + private final ServerInfo serverInfo; private Formatters formatters; ServerPage( @@ -60,6 +63,7 @@ public class ServerPage implements Page { VersionCheckSystem versionCheckSystem, PlanFiles files, DBSystem dbSystem, + ServerInfo serverInfo, Formatters formatters ) { this.server = server; @@ -68,6 +72,7 @@ public class ServerPage implements Page { this.versionCheckSystem = versionCheckSystem; this.files = files; this.dbSystem = dbSystem; + this.serverInfo = serverInfo; this.formatters = formatters; } @@ -113,11 +118,7 @@ public class ServerPage implements Page { AVG_PING_COLOR, MAX_PING_COLOR, MIN_PING_COLOR ); - if (server.isProxy()) { - placeholders.put("backButton", "
  • arrow_backcloud
    • "); - } else { - placeholders.put("backButton", ""); - } + placeholders.put("backButton", serverInfo.getServer().isProxy() ? Html.BACK_BUTTON_NETWORK.parse() : ""); placeholders.put("version", versionCheckSystem.getUpdateButton().orElse(versionCheckSystem.getCurrentVersionButton())); placeholders.put("updateModal", versionCheckSystem.getUpdateModal()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java index 57258c8b8..0992b8208 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java @@ -129,7 +129,7 @@ public class ServerPluginTabs { return "
    " + // Page heading "
    " + - "

    · Plugins Overview

    " + + "

    · Plugins Overview

    ${backButton}" + "
    " + // End Page heading "
    " + content + "
    "; diff --git a/Plan/common/src/main/resources/assets/plan/web/player.html b/Plan/common/src/main/resources/assets/plan/web/player.html index c66bc2783..e63b490dc 100644 --- a/Plan/common/src/main/resources/assets/plan/web/player.html +++ b/Plan/common/src/main/resources/assets/plan/web/player.html @@ -129,12 +129,7 @@

    ${playerName} · Player Overview

    - - - - - Network page - + ${backButton}
    @@ -324,12 +319,7 @@

    ${playerName} · Sessions

    - - - - - Network page - + ${backButton}
    @@ -391,12 +381,7 @@

    ${playerName} · PvP & PvE

    - - - - - Network page - + ${backButton}
    @@ -524,12 +509,7 @@

    ${playerName} · Servers Overview

    - - - - - Network page - + ${backButton}
    diff --git a/Plan/common/src/main/resources/assets/plan/web/server.html b/Plan/common/src/main/resources/assets/plan/web/server.html index a83230294..8b4ffc8be 100644 --- a/Plan/common/src/main/resources/assets/plan/web/server.html +++ b/Plan/common/src/main/resources/assets/plan/web/server.html @@ -146,12 +146,7 @@

    ${serverDisplayName} · Server Overview

    - - - - - Network page - + ${backButton}
    @@ -324,12 +319,7 @@

    ${serverDisplayName} · Online Activity Overview

    - - - - - Network page - + ${backButton}
    @@ -510,12 +500,7 @@

    ${serverDisplayName} · Sessions

    - - - - - Network page - + ${backButton}
    @@ -589,12 +574,7 @@

    ${serverDisplayName} · PvP & PvE

    - - - - - Network page - + ${backButton}
    @@ -707,12 +687,7 @@

    ${serverDisplayName} · Playerbase Overview

    - - - - - Network page - + ${backButton}
    @@ -860,12 +835,7 @@

    ${serverDisplayName} · Player List

    - - - - - Network page - + ${backButton}
    @@ -897,12 +867,7 @@

    ${serverDisplayName} · Geolocations

    - - - - - Network page - + ${backButton}
    @@ -959,12 +924,7 @@

    ${serverDisplayName} · Performance

    - - - - - Network page - + ${backButton}