From e5e5d529ae0ee765383d04c597038b21401038d2 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 19 Jun 2023 20:28:36 -0400
Subject: [PATCH 1/2] Fix text for public status page

---
 .../templates/panel/server_config.html        | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index a3c0b4a8..913a2000 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -166,48 +166,6 @@
                     <input type="number" class="form-control" name="logs_delete_after" id="logs_delete_after" value="{{ data['server_stats']['server_id']['logs_delete_after']  }}" step="1" max="365" min="0" required>
                   </div>
 
-                  <!--
-                  <div class="form-check-flat">
-                    <label for="auto_start" class="form-check-label ml-4 mb-4">
-                      {% if data['server_stats']['server_id']['auto_start'] %}
-                      <input type="checkbox" class="form-check-input" id="auto_start" name="auto_start" checked=""
-                             data-toggle="toggle" value="1">&nbsp;&nbsp;{{ translate('serverConfig', 'serverAutoStart',
-                      data['lang']) }}
-                      {% else %}
-                      <input type="checkbox" class="form-check-input" id="auto_start" name="auto_start" value="1"
-                             data-toggle="toggle">&nbsp;&nbsp;{{
-                      translate('serverConfig', 'serverAutoStart', data['lang']) }}
-                      {% end %}
-                    </label>
-
-                    <label for="crash_detection" class="form-check-label ml-4 mb-4">
-                      {% if data['server_stats']['server_id']['crash_detection'] %}
-                      <input type="checkbox" class="form-check-input" id="crash_detection" name="crash_detection"
-                             data-toggle="toggle" checked="" value="1">&nbsp;&nbsp;{{ translate('serverConfig',
-                      'serverCrashDetection', data['lang']) }}
-                      {% else %}
-                      <input type="checkbox" class="form-check-input" id="crash_detection" name="crash_detection"
-                             data-toggle="toggle" value="1">&nbsp;&nbsp;{{ translate('serverConfig', 'serverCrashDetection',
-                      data['lang']) }}
-                      {% end %}
-                    </label>
-
-                    {% if data['super_user'] %}
-                    <label for="show_status" class="form-check-label ml-4 mb-4">
-                      {% if data['server_stats']['server_id']['show_status'] %}
-                      <input type="checkbox" class="form-check-input" id="show_status" name="show_status"
-                             data-toggle="toggle" checked="" value="1">&nbsp;&nbsp;{{ translate('serverConfig', 'showStatus',
-                      data['lang']) }}
-                      {% else %}
-                      <input type="checkbox" class="form-check-input" id="show_status" name="show_status"
-                             data-toggle="toggle" value="1">&nbsp;&nbsp;{{ translate('serverConfig', 'showStatus',
-                      data['lang']) }}
-                      {% end %}
-                    </label>
-                    {% end %}
-                  </div>
-                -->
-
                   <div class="form-group">
                     <div class="custom-control custom-switch">
                       {% if data['server_stats']['server_id']['auto_start'] %}
@@ -237,7 +195,7 @@
                       <input type="checkbox" class="custom-control-input" id="show_status" name="show_status" checked="" value="1">
                       <label class="custom-control-label" for="show_status">&nbsp;&nbsp;{{ translate('serverConfig', 'showStatus', data['lang']) }}</label>
                       {% else %}
-                      <input type="checkbox" class="custom-control-input" id="show_status" name="show_status" value="1">&nbsp;&nbsp;{{ translate('serverConfig', 'showStatus', data['lang']) }}
+                      <input type="checkbox" class="custom-control-input" id="show_status" name="show_status" value="1">&nbsp;&nbsp;
                       <label class="custom-control-label" for="show_status">&nbsp;&nbsp;{{ translate('serverConfig', 'showStatus', data['lang']) }}</label>
                       {% end %}
                       {% end %}

From 8af726cd7972b3ea59a03b16a692509cd7f5f629 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 1 Jul 2023 13:22:19 +0100
Subject: [PATCH 2/2] Update changelog !602

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c1b814a..4814ca39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 TBD
 ### Bug fixes
 - Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604))
+- Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602))
 ### Tweaks
 TBD
 ### Lang