From 7949db65ac38521e6d8afbf31f475ab7b8b48fe0 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Tue, 31 Jan 2023 20:20:08 +0100 Subject: [PATCH 01/35] Improving Switches on Config Server Page --- .../templates/panel/server_config.html | 147 +++++++++++------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index fb19ec05..3937e8d1 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -50,17 +50,17 @@
+ value="{{ data['server_stats']['server_id']['server_name'] }}" + placeholder="{{ translate('serverConfig', 'serverName', data['lang']) }}" required>
{% if data['super_user'] %}
{{ data['server_stats']['server_id']['path'] }} @@ -71,21 +71,21 @@ {% if data['server_stats']['server_type'] != "minecraft-bedrock" %}
+ value="{{ data['server_stats']['server_id']['log_path'] }}" + placeholder="{{ translate('serverConfig', 'serverLogLocation', data['lang']) }}" required>
{% end %}
+ value="{{ data['server_stats']['server_id']['executable'] }}" + placeholder="{{ translate('serverConfig', 'serverExecutable', data['lang']) }}" required>
{% end %} {% if data['server_stats']['server_type'] == "minecraft-java" %} @@ -95,7 +95,7 @@ }} + value="{{ data['server_stats']['server_id']['execution_command'] }}" + placeholder="{{ translate('serverConfig', 'serverExecutionCommand', data['lang']) }}" required>
{% else %} + value="{{ data['server_stats']['server_id']['executable_update_url'] }}" + placeholder="{{ translate('serverConfig', 'exeUpdateURL', data['lang']) }}">
{% end %}
+ value="{{ data['server_stats']['server_id']['server_ip'] }}" required>
+ value="{{ data['server_stats']['server_id']['server_port'] }}" step="1" max="65566" min="1" + required> " , + data-content="{{ translate('serverConfig', 'statsHint1' , data['lang'])}}

{{ translate('serverConfig', 'statsHint2', data['lang'])}}" , - data-placement="right"> + data-placement="right">
{% end %} @@ -181,8 +181,8 @@ 'timeoutExplain2', data['lang']) }} + value="{{ data['server_stats']['server_id']['shutdown_timeout'] }}" step="2" max="300" min="60" + required>
@@ -190,19 +190,20 @@ - {{ translate('serverConfig', 'removeOldLogsAfterDesc', data['lang']) }} + value="{{ data['server_stats']['server_id']['logs_delete_after'] }}" step="1" max="365" min="0" + required>
+ + +
+
+ {% if data['server_stats']['server_id']['auto_start'] %} + + + {% else %} + + + {% end %} +
+
+
+
+ {% if data['server_stats']['server_id']['crash_detection'] %} + + + {% else %} + + + {% end %} +
+
+
+
+ {% if data['super_user'] %} + {% if data['server_stats']['server_id']['show_status'] %} + + + {% else %} +   {{ translate('serverConfig', 'showStatus', data['lang']) }} + + {% end %} + {% end %} +
+
@@ -257,13 +295,13 @@ {% if data['server_stats']['running'] %} {% if data['server_stats']['updating'] %}   {% else %}   {% end %} {{ translate('serverConfig', 'deleteServer', data['lang']) @@ -273,13 +311,13 @@ {% if not data['failed'] %} {% if data['server_stats']['updating'] %}   {% else %}   {% end %} {% end %} @@ -305,18 +343,19 @@ From 137ae3041ffe689a34d8552bbf7bdd5d2626a157 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Thu, 2 Feb 2023 23:47:54 +0100 Subject: [PATCH 02/35] Improving Forms Displays for upload files and server creation --- .../templates/panel/custom_login.html | 52 +- .../templates/server/bedrock_wizard.html | 659 ++++++++---------- app/frontend/templates/server/wizard.html | 392 ++++++----- app/translations/en_EN.json | 2 + 4 files changed, 548 insertions(+), 557 deletions(-) diff --git a/app/frontend/templates/panel/custom_login.html b/app/frontend/templates/panel/custom_login.html index 018eb006..deb69210 100644 --- a/app/frontend/templates/panel/custom_login.html +++ b/app/frontend/templates/panel/custom_login.html @@ -51,16 +51,19 @@

{{ translate('customLogin', 'loginImage', data['lang']) }}

-
+ {% raw xsrf_form_html() %} -
- -
-
- +
+
+
+ + +
+
+ +
+
@@ -228,6 +231,34 @@
+ @@ -231,30 +227,6 @@
+ {% end %} {% raw xsrf_form_html() %}
@@ -72,12 +100,22 @@ data['lang']) }} + + {% if not data["server_api"] and data["online"] %} +
+

 {{ translate('error', 'bedrockError', data['lang']) }} {{ translate('error', 'craftyStatus', data['lang']) }} +  {{ translate('error', 'serverJars2', data['lang']) }}

+ {% end %} + {% if not data["online"] %} +
+

 {{ translate('error', 'noInternet', data['lang']) }}

+ {% end %}

- {% end %}
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 0a201cbb..5085ca90 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -17,7 +17,6 @@
- {% if data['online'] %}
@@ -27,21 +26,18 @@

- {% if data["server_api"] %} + {% if data["server_api"] and data["online"] %}
{% else %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/frontend/static/assets/images/serverjars/ICON.svg b/app/frontend/static/assets/images/serverjars/ICON.svg new file mode 100644 index 00000000..2adc4cff --- /dev/null +++ b/app/frontend/static/assets/images/serverjars/ICON.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 6a363816..85258431 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -20,6 +20,10 @@
+ {% if data["server_api"] and data["online"] %} + + {% end %}

{{ translate('serverWizard', 'newServer', data['lang']) }}


@@ -980,7 +984,7 @@ function wait_msg(importing) { bootbox.alert({ title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}', - message: importing ? ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}': ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}

Powered by serverjars.com', + message: importing ? ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}': ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}

Powered by serverjars.com', }); } From 9147fbb6f00ed1f20e084c49f08281d97912c74a Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 22 May 2023 16:58:02 -0400 Subject: [PATCH 15/35] Fix server terminal font spacing --- app/frontend/templates/panel/server_term.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html index 5fbc7d51..8e16462a 100644 --- a/app/frontend/templates/panel/server_term.html +++ b/app/frontend/templates/panel/server_term.html @@ -150,6 +150,8 @@ /* IE and Edge */ scrollbar-width: none; /* Firefox */ + font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; + white-space: pre-wrap; } From 6fb581a12dc56ff7bda0064dee552ae6a020c82c Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 22 May 2023 17:04:23 -0400 Subject: [PATCH 16/35] Cleanup JS --- .../templates/panel/server_schedules.html | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index 65d2478d..107b52f9 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -366,39 +366,6 @@ console.log("ready!"); }); - - function yesnoCheck(that) { - if (that.value == "command") { - document.getElementById("ifYes").style.display = "block"; - document.getElementById("command").required = true; - } else { - document.getElementById("ifYes").style.display = "none"; - document.getElementById("command").required = false; - } - } - function basicAdvanced(that) { - if (that.value == "advanced") { - document.getElementById("ifAdvanced").style.display = "block"; - document.getElementById("ifBasic").style.display = "none"; - document.getElementById("interval").required = false; - document.getElementById("time").required = false; - } else { - document.getElementById("ifAdvanced").style.display = "none"; - document.getElementById("ifBasic").style.display = "block"; - document.getElementById("interval").required = true; - document.getElementById("time").required = true; - } - } - function ifDays(that) { - if (that.value == "days") { - document.getElementById("ifDays").style.display = "block"; - document.getElementById("time").required = true; - } else { - document.getElementById("ifDays").style.display = "none"; - document.getElementById("time").required = false; - } - } - $(".del_button").click(function () { var sch_id = $(this).data('sch'); From eabe9575ae642a4f9895782a4dfb9824773ed62e Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 22 May 2023 17:10:37 -0400 Subject: [PATCH 17/35] Change execution command text size with viewport --- app/frontend/templates/panel/server_config.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index 36d71832..3ede09c7 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -100,7 +100,7 @@ {% else %}
From a6d30d7242e523d4861b40d3eb6b5327c0b5cfc8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 25 May 2023 00:23:15 -0400 Subject: [PATCH 28/35] Fix upload root files being hidden --- app/frontend/templates/server/wizard.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 4d3e20fb..ec251739 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -553,6 +553,7 @@
+
-