diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea2f7e2ec96dfa8d3144d37e6084a6425b70829..c89095e3d9fe7b2d2119f1c81841578d9692296e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Fix annoucements not showing after `4.4.10` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/872)) - Fix use of 'Enter' Key on Username Form ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/876)) - Disable player stats collection when servers are offline ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/875)) +- Fix display issues of local zip import modal following CSS refactor ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/874)) ### Tweaks TBD ### Lang diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js index aa5ce6f15ed1d6ec20c870e86787c6c5ec1aeb20..ad69ebce611022dc5aa3ede7670c3552ac69871c 100644 --- a/app/frontend/static/assets/js/shared/root-dir.js +++ b/app/frontend/static/assets/js/shared/root-dir.js @@ -40,7 +40,6 @@ async function getTreeView(path, unzip = false, upload = false) { }); let responseData = await res.json(); if (responseData.status === "ok") { - console.log(responseData); process_tree_response(responseData, unzip); let x = document.querySelector('.bootbox'); if (x) { @@ -62,9 +61,10 @@ async function getTreeView(path, unzip = false, upload = false) { } function process_tree_response(response, unzip) { - const styles = window.getComputedStyle(document.getElementById("lower_half")); //If this value is still hidden we know the user is executing a zip import and not an upload - if (styles.visibility === "hidden") { + console.log(`LOWER HALF: ${$("#lower_half").classList}`) + if ($("#lower_half").hasClass("d-none")) { + console.log("In IF") document.getElementById('zip_submit').disabled = false; } else { document.getElementById('upload_submit').disabled = false; diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index c8e2c241031c0332712697d17d7ad4d5cab92ebb..ad6da88ee8a36f78d50af27854de35df9b27da6e 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -39,7 +39,8 @@
- {% for s in data['server_types'] %} {% if data['server_types'][s].get("enabled", False) %} @@ -50,7 +51,8 @@ {% if data['super_user'] %}
- +
{% end %}
@@ -60,7 +62,8 @@
-
@@ -74,17 +77,22 @@
- +
- +

-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}

+

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) + }}


@@ -92,7 +100,8 @@
- +
@@ -100,7 +109,8 @@
- +
@@ -108,7 +118,8 @@
- +
@@ -117,7 +128,12 @@ }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} - {% for r in data['roles'] %}

-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', +

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}


@@ -203,7 +224,8 @@
- +
@@ -211,7 +233,8 @@
- +
@@ -219,7 +242,8 @@
- +
@@ -228,7 +252,12 @@ }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} - {% for r in data['roles'] %}
@@ -294,7 +325,8 @@
- +
@@ -303,7 +335,8 @@
-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', +

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}


@@ -311,7 +344,8 @@
- +
@@ -319,7 +353,8 @@
- +

@@ -327,7 +362,8 @@
- +
@@ -337,7 +373,12 @@ }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} - {% for r in data['roles'] %}