Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Append version string to all resource URLs (#1975) 

Co-authored-by: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
This commit is contained in:
KairuByte 2021-11-10 12:57:33 -06:00 committed by GitHub
parent 9c83f401f0
commit 364a407177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 149 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -204,3 +204,4 @@ $RECYCLE.BIN/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/.vs

1
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java
View File

@ -84,6 +84,7 @@ public class Contributors {
new Contributor("\u6d1b\u4f0a", LANG),
new Contributor("portlek", CODE),
new Contributor("mbax", CODE),
new Contributor("KairuByte", CODE),
new Contributor("rymiel", CODE),
new Contributor("Perchun_Pak", LANG),
new Contributor("HexedHero", CODE),

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ErrorMessagePage.java
View File

@ -67,7 +67,8 @@ public class ErrorMessagePage implements Page {
placeholders.put("title", icon.toHtml() + " " + errorTitle);
placeholders.put("titleText", errorTitle);
placeholders.put("paragraph", errorMsg);
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());
return UnaryChain.of(template)

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ErrorsPage.java
View File

@ -53,7 +53,8 @@ public class ErrorsPage implements Page {
placeholders.put("title", Icon.called("bug").build().toHtml() + " Error logs");
placeholders.put("titleText", "Error logs");
placeholders.put("paragraph", buildBody());
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());
return UnaryChain.of(template)

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/InternalErrorPage.java
View File

@ -52,7 +52,8 @@ public class InternalErrorPage implements Page {
placeholders.put("title", Icon.called("bug") + " 500 Internal Error occurred");
placeholders.put("titleText", "500 Internal Error occurred");
placeholders.put("paragraph", createContent());
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());
return placeholders.apply(template);

9
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/LoginPage.java
View File

@ -22,6 +22,8 @@ import com.djrapitops.plan.settings.locale.Locale;
import com.djrapitops.plan.settings.theme.Theme;
import com.djrapitops.plan.utilities.java.UnaryChain;
import com.djrapitops.plan.version.VersionChecker;
/**
* Html String generator for /login and /register page.
*
@ -34,22 +36,27 @@ public class LoginPage implements Page {
private final Locale locale;
private final Theme theme;
private final VersionChecker versionChecker;
LoginPage(
String htmlTemplate,
ServerInfo serverInfo,
Locale locale,
Theme theme
Theme theme,
VersionChecker versionChecker
) {
this.template = htmlTemplate;
this.serverInfo = serverInfo;
this.locale = locale;
this.theme = theme;
this.versionChecker = versionChecker;
}
@Override
public String toHtml() {
PlaceholderReplacer placeholders = new PlaceholderReplacer();
placeholders.put("command", getCommand());
placeholders.put("version", versionChecker.getCurrentVersion());
return UnaryChain.of(template)
.chain(theme::replaceThemeColors)
.chain(placeholders::apply)

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

@ -98,8 +98,9 @@ public class NetworkPage implements Page {
placeholders.put("minPingColor", theme.getValue(ThemeVal.GRAPH_MIN_PING));
placeholders.put("avgPingColor", theme.getValue(ThemeVal.GRAPH_AVG_PING));
placeholders.put("timeZone", config.getTimeZoneOffsetHours());
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());

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

@ -204,11 +204,11 @@ public class PageFactory {
}
public Page loginPage() throws IOException {
return new LoginPage(getResource("login.html"), serverInfo.get(), locale.get(), theme.get());
return new LoginPage(getResource("login.html"), serverInfo.get(), locale.get(), theme.get(), versionChecker.get());
}
public Page registerPage() throws IOException {
return new LoginPage(getResource("register.html"), serverInfo.get(), locale.get(), theme.get());
return new LoginPage(getResource("register.html"), serverInfo.get(), locale.get(), theme.get(), versionChecker.get());
}
public Page queryPage() throws IOException {

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java
View File

@ -94,7 +94,8 @@ public class PlayerPage implements Page {
placeholders.put("refresh", clockLongFormatter.apply(now));
placeholders.put("refreshFull", secondLongFormatter.apply(now));
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
String playerName = player.getValue(PlayerKeys.NAME).orElse(playerUUID.toString());

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayersPage.java
View File

@ -62,7 +62,8 @@ public class PlayersPage implements Page {
PlaceholderReplacer placeholders = new PlaceholderReplacer();
placeholders.put("refreshBarrier", config.get(WebserverSettings.REDUCED_REFRESH_BARRIER));
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());
if (serverInfo.getServer().isProxy()) {

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/QueryPage.java
View File

@ -49,7 +49,8 @@ public class QueryPage implements Page {
@Override
public String toHtml() {
PlaceholderReplacer placeholders = new PlaceholderReplacer();
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
placeholders.put("contributors", Contributors.generateContributorHtml());
return UnaryChain.of(template)

3
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPage.java
View File

@ -94,7 +94,8 @@ public class ServerPage implements Page {
placeholders.put("gmPieColors", theme.getValue(ThemeVal.GRAPH_GM_PIE));
placeholders.put("contributors", Contributors.generateContributorHtml());
placeholders.put("version", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("versionButton", versionChecker.getUpdateButton().orElse(versionChecker.getCurrentVersionButton()));
placeholders.put("version", versionChecker.getCurrentVersion());
placeholders.put("updateModal", versionChecker.getUpdateModal());
CachingSupplier<ServerPluginTabs> pluginTabs = new CachingSupplier<>(() -> {

14
Plan/common/src/main/resources/assets/plan/web/error.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -12,7 +12,7 @@
<title>${titleText}</title>
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
rel="stylesheet">
@ -20,8 +20,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
crossorigin="anonymous">
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<link href="css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="css/style.css?v=${version}" rel="stylesheet">
</head>
@ -59,7 +59,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -236,8 +236,8 @@
crossorigin="anonymous"></script>
<!-- Custom scripts for all pages-->
<script src="js/sb-admin-2.js"></script>
<script src="js/color-selector.js"></script>
<script src="js/sb-admin-2.js?v=${version}"></script>
<script src="js/color-selector.js?v=${version}"></script>
<script id="mainScript"></script>

14
Plan/common/src/main/resources/assets/plan/web/login.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -12,7 +12,7 @@
<title>Plan | Login</title>
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<link href="vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet" type="text/css">
<link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
rel="stylesheet">
@ -20,8 +20,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
crossorigin="anonymous">
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<link href="css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="css/style.css?v=${version}" rel="stylesheet">
</head>
@ -218,10 +218,10 @@
crossorigin="anonymous"></script>
<!-- Custom scripts for all pages-->
<script src="js/xmlhttprequests.js"></script>
<script src="js/color-selector.js"></script>
<script src="js/xmlhttprequests.js?v=${version}"></script>
<script src="js/color-selector.js?v=${version}"></script>
<script src="js/logonsine.js"></script>
<script src="js/logonsine.js?v=${version}"></script>
<script id="mainScript">
drawSine("decoration");
document.getElementById('login-button').addEventListener('click', event => {

48
Plan/common/src/main/resources/assets/plan/web/network.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -13,18 +13,16 @@
<title>Plan | Network</title>
<!-- Custom fonts for this template-->
<link href="./vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="./vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous"
href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
rel="stylesheet">
<!-- Custom styles for this template-->
<link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
rel="stylesheet">
<link href="./css/sb-admin-2.css" rel="stylesheet">
<link href="./css/style.css" rel="stylesheet">
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" rel="stylesheet">
<link href="./css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="./css/style.css?v=${version}" rel="stylesheet">
</head>
<body>
@ -140,7 +138,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -1054,27 +1052,27 @@
src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js"></script>
<!-- Page level plugins -->
<script src="./vendor/datatables/datatables.min.js"></script>
<link href='./vendor/datatables/datatables.min.css' rel='stylesheet'/>
<script src="./vendor/highcharts/highcharts.js"></script>
<script src="./vendor/highcharts/modules/stock.js"></script>
<script src="./vendor/highcharts/modules/map.js"></script>
<script src="./vendor/highcharts/mapdata/world.js"></script>
<script src="./vendor/highcharts/modules/drilldown.js"></script>
<script src="./vendor/highcharts/modules/no-data-to-display.js"></script>
<script src="./vendor/masonry/masonry.pkgd.min.js"></script>
<script src="./vendor/datatables/datatables.min.js?v=${version}"></script>
<link href='./vendor/datatables/datatables.min.css?v=${version}' rel='stylesheet'/>
<script src="./vendor/highcharts/highcharts.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/stock.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/map.js?v=${version}"></script>
<script src="./vendor/highcharts/mapdata/world.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/drilldown.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/no-data-to-display.js?v=${version}"></script>
<script src="./vendor/masonry/masonry.pkgd.min.js?v=${version}"></script>
<!-- Custom scripts for all pages-->
<script src="./js/domUtils.js"></script>
<script src="./js/sb-admin-2.js"></script>
<script src="./js/xmlhttprequests.js"></script>
<script src="./js/color-selector.js"></script>
<script src="./js/domUtils.js?v=${version}"></script>
<script src="./js/sb-admin-2.js?v=${version}"></script>
<script src="./js/xmlhttprequests.js?v=${version}"></script>
<script src="./js/color-selector.js?v=${version}"></script>
<!-- Page level custom scripts -->
<script src="./js/sessionAccordion.js"></script>
<script src="./js/pingTable.js"></script>
<script src="./js/graphs.js"></script>
<script src="./js/network-values.js"></script>
<script src="./js/sessionAccordion.js?v=${version}"></script>
<script src="./js/pingTable.js?v=${version}"></script>
<script src="./js/graphs.js?v=${version}"></script>
<script src="./js/network-values.js?v=${version}"></script>
<script id="mainScript">
// HighCharts Series

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

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -13,18 +13,16 @@
<title>Plan | ${playerName}</title>
<!-- Custom fonts for this template-->
<link href="../vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="../vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous"
href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
rel="stylesheet">
<!-- Custom styles for this template-->
<link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
rel="stylesheet">
<link href="../css/sb-admin-2.css" rel="stylesheet">
<link href="../css/style.css" rel="stylesheet">
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" rel="stylesheet">
<link href="../css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="../css/style.css?v=${version}" rel="stylesheet">
</head>
<body>
@ -107,7 +105,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -694,26 +692,26 @@
src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js"></script>
<!-- Page level plugins -->
<script src="../vendor/datatables/datatables.min.js"></script>
<link href='../vendor/datatables/datatables.min.css' rel='stylesheet'/>
<script src="../vendor/highcharts/highcharts.js"></script>
<script src="../vendor/highcharts/modules/stock.js"></script>
<script src="../vendor/highcharts/modules/drilldown.js"></script>
<script src="../vendor/highcharts/modules/no-data-to-display.js"></script>
<link href='../vendor/fullcalendar/fullcalendar.min.css' rel='stylesheet'/>
<script src='../vendor/momentjs/moment.js'></script>
<script src='../vendor/fullcalendar/fullcalendar.min.js'></script>
<script src="../vendor/masonry/masonry.pkgd.min.js"></script>
<script src="../vendor/datatables/datatables.min.js?v=${version}"></script>
<link href='../vendor/datatables/datatables.min.css?v=${version}' rel='stylesheet'/>
<script src="../vendor/highcharts/highcharts.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/stock.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/drilldown.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/no-data-to-display.js?v=${version}"></script>
<link href='../vendor/fullcalendar/fullcalendar.min.css?v=${version}' rel='stylesheet'/>
<script src='../vendor/momentjs/moment.js?v=${version}'></script>
<script src='../vendor/fullcalendar/fullcalendar.min.js?v=${version}'></script>
<script src="../vendor/masonry/masonry.pkgd.min.js?v=${version}"></script>
<!-- Custom scripts for all pages-->
<script src="../js/sb-admin-2.js"></script>
<script src="../js/xmlhttprequests.js"></script>
<script src="../js/color-selector.js"></script>
<script src="../js/sb-admin-2.js?v=${version}"></script>
<script src="../js/xmlhttprequests.js?v=${version}"></script>
<script src="../js/color-selector.js?v=${version}"></script>
<!-- Page level custom scripts -->
<script src="../js/sessionAccordion.js"></script>
<script src="../js/graphs.js"></script>
<script src="../js/player-values.js"></script>
<script src="../js/sessionAccordion.js?v=${version}"></script>
<script src="../js/graphs.js?v=${version}"></script>
<script src="../js/player-values.js?v=${version}"></script>
<script id="mainScript">
try {

18
Plan/common/src/main/resources/assets/plan/web/players.html
View File

@ -12,7 +12,7 @@
<title>Plan | Players</title>
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
rel="stylesheet">
@ -20,8 +20,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
crossorigin="anonymous">
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<link href="css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="css/style.css?v=${version}" rel="stylesheet">
</head>
@ -72,7 +72,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -264,13 +264,13 @@
crossorigin="anonymous"></script>
<!-- Page level plugins -->
<script src="vendor/datatables/datatables.min.js"></script>
<link href='vendor/datatables/datatables.min.css' rel='stylesheet'/>
<script src="vendor/datatables/datatables.min.js?v=${version}"></script>
<link href='vendor/datatables/datatables.min.css?v=${version}' rel='stylesheet'/>
<!-- Custom scripts for all pages-->
<script src="js/sb-admin-2.js"></script>
<script src="js/xmlhttprequests.js"></script>
<script src="js/color-selector.js"></script>
<script src="js/sb-admin-2.js?v=${version}"></script>
<script src="js/xmlhttprequests.js?v=${version}"></script>
<script src="js/color-selector.js?v=${version}"></script>
<script id="mainScript">
refreshBarrierMs = ${refreshBarrier};

41
Plan/common/src/main/resources/assets/plan/web/query.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -11,16 +11,15 @@
<title>Plan | Query</title>
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
rel="stylesheet">
<!-- Custom styles for this template-->
<link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
rel="stylesheet">
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" rel="stylesheet">
<link href="css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="css/style.css?v=${version}" rel="stylesheet">
</head>
@ -64,7 +63,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -324,24 +323,24 @@
src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js"></script>
<!-- Page level plugins -->
<script src="./vendor/datatables/datatables.min.js"></script>
<link href='./vendor/datatables/datatables.min.css' rel='stylesheet'/>
<script src="./vendor/highcharts/highcharts.js"></script>
<script src="./vendor/highcharts/modules/stock.js"></script>
<script src="./vendor/highcharts/modules/map.js"></script>
<script src="./vendor/highcharts/modules/no-data-to-display.js"></script>
<script src="./vendor/highcharts/mapdata/world.js"></script>
<script src="./vendor/datatables/datatables.min.js?v=${version}"></script>
<link href='./vendor/datatables/datatables.min.css?v=${version}' rel='stylesheet'/>
<script src="./vendor/highcharts/highcharts.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/stock.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/map.js?v=${version}"></script>
<script src="./vendor/highcharts/modules/no-data-to-display.js?v=${version}"></script>
<script src="./vendor/highcharts/mapdata/world.js?v=${version}"></script>
<!-- Custom scripts for all pages-->
<script src="./js/sb-admin-2.js"></script>
<script src="./js/xmlhttprequests.js"></script>
<script src="./js/color-selector.js"></script>
<script src="./js/domUtils.js"></script>
<script src="./js/sb-admin-2.js?v=${version}"></script>
<script src="./js/xmlhttprequests.js?v=${version}"></script>
<script src="./js/color-selector.js?v=${version}"></script>
<script src="./js/domUtils.js?v=${version}"></script>
<!-- Page level custom scripts -->
<script src="./js/graphs.js"></script>
<script src='./js/filters.js'></script>
<script src='./js/query.js'></script>
<script src="./js/graphs.js?v=${version}"></script>
<script src='./js/filters.js?v=${version}'></script>
<script src='./js/query.js?v=${version}'></script>
<script id="mainScript">
if (location.search.includes("error=")) {

12
Plan/common/src/main/resources/assets/plan/web/register.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -12,7 +12,7 @@
<title>Plan | Register</title>
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<link href="vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet" type="text/css">
<link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
rel="stylesheet">
@ -20,8 +20,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
crossorigin="anonymous">
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<link href="css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="css/style.css?v=${version}" rel="stylesheet">
</head>
@ -180,8 +180,8 @@
crossorigin="anonymous"></script>
<!-- Custom scripts for all pages-->
<script src="js/xmlhttprequests.js"></script>
<script src="js/color-selector.js"></script>
<script src="js/xmlhttprequests.js?v=${version}"></script>
<script src="js/color-selector.js?v=${version}"></script>
<script id="mainScript">
const errorElement = document.getElementById("fail-msg");

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

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@ -12,17 +12,16 @@
<title>Plan | Server Analysis</title>
<!-- Custom fonts for this template-->
<link href="../vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
<link href="../vendor/fontawesome-free/css/all.min.css?v=${version}" rel="stylesheet">
<link crossorigin="anonymous"
href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
rel="stylesheet">
<!-- Custom styles for this template-->
<link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA="
rel="stylesheet">
<link href="../css/sb-admin-2.css" rel="stylesheet">
<link href="../css/style.css" rel="stylesheet">
integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" rel="stylesheet">
<link href="../css/sb-admin-2.css?v=${version}" rel="stylesheet">
<link href="../css/style.css?v=${version}" rel="stylesheet">
</head>
<body>
@ -144,7 +143,7 @@
</a>
</div>
<div class="ms-md-3 text-center text-md-start">
${version}
${versionButton}
</div>
</ul>
<!-- End of Sidebar -->
@ -1334,30 +1333,30 @@
src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js"></script>
<!-- Page level plugins -->
<script src="../vendor/datatables/datatables.min.js"></script>
<link href='../vendor/datatables/datatables.min.css' rel='stylesheet'/>
<script src="../vendor/highcharts/highcharts.js"></script>
<script src="../vendor/highcharts/modules/stock.js"></script>
<script src="../vendor/highcharts/modules/map.js"></script>
<script src="../vendor/highcharts/mapdata/world.js"></script>
<script src="../vendor/highcharts/modules/drilldown.js"></script>
<script src="../vendor/highcharts/modules/no-data-to-display.js"></script>
<link href='../vendor/fullcalendar/fullcalendar.min.css' rel='stylesheet'/>
<script src='../vendor/momentjs/moment.js'></script>
<script src='../vendor/fullcalendar/fullcalendar.min.js'></script>
<script src="../vendor/masonry/masonry.pkgd.min.js"></script>
<script src="../vendor/datatables/datatables.min.js?v=${version}"></script>
<link href='../vendor/datatables/datatables.min.css?v=${version}' rel='stylesheet'/>
<script src="../vendor/highcharts/highcharts.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/stock.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/map.js?v=${version}"></script>
<script src="../vendor/highcharts/mapdata/world.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/drilldown.js?v=${version}"></script>
<script src="../vendor/highcharts/modules/no-data-to-display.js?v=${version}"></script>
<link href='../vendor/fullcalendar/fullcalendar.min.css?v=${version}' rel='stylesheet'/>
<script src='../vendor/momentjs/moment.js?v=${version}'></script>
<script src='../vendor/fullcalendar/fullcalendar.min.js?v=${version}'></script>
<script src="../vendor/masonry/masonry.pkgd.min.js?v=${version}"></script>
<!-- Custom scripts for all pages-->
<script src="../js/domUtils.js"></script>
<script src="../js/sb-admin-2.js"></script>
<script src="../js/xmlhttprequests.js"></script>
<script src="../js/color-selector.js"></script>
<script src="../js/domUtils.js?v=${version}"></script>
<script src="../js/sb-admin-2.js?v=${version}"></script>
<script src="../js/xmlhttprequests.js?v=${version}"></script>
<script src="../js/color-selector.js?v=${version}"></script>
<!-- Page level custom scripts -->
<script src="../js/sessionAccordion.js"></script>
<script src="../js/pingTable.js"></script>
<script src="../js/graphs.js"></script>
<script src="../js/server-values.js"></script>
<script src="../js/sessionAccordion.js?v=${version}"></script>
<script src="../js/pingTable.js?v=${version}"></script>
<script src="../js/graphs.js?v=${version}"></script>
<script src="../js/server-values.js?v=${version}"></script>
<script id="mainScript">
refreshBarrierMs = ${refreshBarrier};