From afe69a21c61e3a63af52eacdb7fdd8fc5af7273f Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Mon, 20 Aug 2018 04:02:27 -0400 Subject: [PATCH] Small changes and cleanup to Java related UI. The manual installation overlay now links to the Java Management wiki article. The Available Options for Java 8 href now links to the os-specific page (/windows for windows, /unix for macOS and Linux). The default config now uses the same value as max ram for min ram. --- app/assets/js/configmanager.js | 2 +- app/assets/js/scripts/landing.js | 4 ++-- app/settings.ejs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index de4756a..6593b2d 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -26,7 +26,7 @@ function resolveMaxRAM(){ } function resolveMinRAM(){ - return exports.getAbsoluteMinRAM() + 'G' + return resolveMaxRAM() } /** diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index a4f88b2..4f6d95c 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -298,8 +298,8 @@ function asyncSystemScan(launchAfter = true){ $('#overlayContent').fadeOut(250, () => { //$('#overlayDismiss').toggle(false) setOverlayContent( - 'Don\'t Forget!
Java is Required', - 'A valid x64 installation of Java 8 is required to launch. Downloads can be found on Oracle\'s website. Once installed, you will be able to connect to the server.

Please refer to our Troubleshooting Guide if you have any difficulty.', + 'Java is Required
to Launch', + 'A valid x64 installation of Java 8 is required to launch.

Please refer to our Java Management Guide for instructions on how to manually install Java.', 'I Understand', 'Go Back' ) diff --git a/app/settings.ejs b/app/settings.ejs index d4cf81d..ee754fe 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -218,7 +218,7 @@ -
Options to be provided to the JVM at runtime. -Xms and -Xmx should not be included.
Available Options for Java 8.
+
Options to be provided to the JVM at runtime. -Xms and -Xmx should not be included.
Available Options for Java 8.