Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-07-23 20:55:05 +02:00
Code Issues Projects Releases Wiki Activity

Back button to /server and /player

Browse Source
This commit is contained in:
Rsl1122 2019-08-24 11:16:12 +03:00
parent 1dc3e294b5
commit 5bba175558
8 changed files with 37 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/Html.java
View File

@ -47,7 +47,20 @@ public enum Html {
SPAN("${0}</span>"),
LINK("<a class=\"link\" href=\"${0}\">${1}</a>"),
LINK_EXTERNAL("<a class=\"link\" rel=\"noopener noreferrer\" target=\"_blank\" href=\"${0}\">${1}</a>");
LINK_EXTERNAL("<a class=\"link\" rel=\"noopener noreferrer\" target=\"_blank\" href=\"${0}\">${1}</a>"),
BACK_BUTTON_NETWORK("<a class=\"btn bg-plan btn-icon-split\" href=\"../network\">" +
"<span class=\"icon text-white-50\">" +
"<i class=\"fas fa-fw fa-arrow-left\"></i><i class=\"fas fa-fw fa-cloud\"></i>" +
"</span>" +
"<span class=\"text\">Network page</span>" +
"</a>"),
BACK_BUTTON_SERVER("<a class=\"btn bg-plan btn-icon-split\" href=\"../server\">" +
"<span class=\"icon text-white-50\">" +
"<i class=\"fas fa-fw fa-arrow-left\"></i><i class=\"fas fa-fw fa-server\"></i>" +
"</span>" +
"<span class=\"text\">Server page</span>" +
"</a>");
private final String html;

1
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java
View File

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

7
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPage.java
View File

@ -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", "<li><a title=\"to Network page\" href=\"/network\"><i class=\"material-icons\">arrow_back</i><i class=\"material-icons\">cloud</i></a></li>");
} else {
placeholders.put("backButton", "<li><a title=\"to Server page\" href=\"/server\"><i class=\"material-icons\">arrow_back</i><i class=\"material-icons\">storage</i></a></li>");
}
placeholders.put("backButton", (serverInfo.getServer().isProxy() ? Html.BACK_BUTTON_NETWORK : Html.BACK_BUTTON_SERVER).parse());
PlayerPluginTab pluginTabs = pageFactory.inspectPluginTabs(playerUUID);

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayerPluginTab.java
View File

@ -129,7 +129,7 @@ public class PlayerPluginTab implements Comparable<PlayerPluginTab> {
return "<div class=\"tab\"><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>${playerName} &middot; " + serverName + " Plugins</h1>" +
"<h1 class=\"h3 mb-0 text-gray-800\"><i class=\"sidebar-toggler fa fa-fw fa-bars\"></i>${playerName} &middot; " + serverName + " Plugins</h1>${backButton}" +
"</div>" +
// End Page heading
"<div class=\"card-columns\">" + content + "</div></div></div>";

11
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPage.java
View File

@ -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", "<li><a title=\"to Network page\" href=\"/network\"><i class=\"material-icons\">arrow_back</i><i class=\"material-icons\">cloud</i></a></li>");
} 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());

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/ServerPluginTabs.java
View File

@ -129,7 +129,7 @@ public class ServerPluginTabs {
return "<div class=\"tab\"><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>" +
"<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}" +
"</div>" +
// End Page heading
"<div class=\"card-columns\">" + content + "</div></div></div>";

28
Plan/common/src/main/resources/assets/plan/web/player.html
View File

@ -129,12 +129,7 @@
<h1 class="h3 mb-0 text-gray-800"><i
class="sidebar-toggler fa fa-fw fa-bars"></i>${playerName}
&middot; Player Overview</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -324,12 +319,7 @@
<h1 class="h3 mb-0 text-gray-800"><i
class="sidebar-toggler fa fa-fw fa-bars"></i>${playerName}
&middot; Sessions</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -391,12 +381,7 @@
<h1 class="h3 mb-0 text-gray-800"><i
class="sidebar-toggler fa fa-fw fa-bars"></i>${playerName}
&middot; PvP & PvE</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -524,12 +509,7 @@
<h1 class="h3 mb-0 text-gray-800"><i
class="sidebar-toggler fa fa-fw fa-bars"></i>${playerName}
&middot; Servers Overview</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">

56
Plan/common/src/main/resources/assets/plan/web/server.html
View File

@ -146,12 +146,7 @@
<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>${serverDisplayName}
&middot; Server Overview</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -324,12 +319,7 @@
<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>${serverDisplayName}
&middot; Online Activity Overview</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -510,12 +500,7 @@
<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>${serverDisplayName}
&middot; Sessions</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -589,12 +574,7 @@
<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>${serverDisplayName}
&middot; PvP & PvE</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -707,12 +687,7 @@
<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>${serverDisplayName}
&middot; Playerbase Overview</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -860,12 +835,7 @@
<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>${serverDisplayName}
&middot; Player List</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -897,12 +867,7 @@
<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>${serverDisplayName}
&middot; Geolocations</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">
@ -959,12 +924,7 @@
<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>${serverDisplayName}
&middot; Performance</h1>
<a class="btn bg-plan btn-icon-split" href="network">
<span class="icon text-white-50">
<i class="fas fa-fw fa-arrow-left"></i><i class="fas fa-fw fa-cloud"></i>
</span>
<span class="text">Network page</span>
</a>
${backButton}
</div>
<div class="row">