diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fdde3ec..33d211d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,5 @@
# Changelog
-## --- [4.0.18] - 2022/TBD
-### New features
-TBD
-### Bug fixes
-TBD
-### Tweaks
-TBD
-### Lang
-TBD
-
-
-## --- [4.0.17] - 2022/11/30
+## --- [4.0.17/4.0.18] - 2022/11/30
### New features
- Automate forge install process through Crafty server creation for Forge server version 1.16 and greater. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/495))
- Tooltip for server port on dashboard. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/496))
@@ -18,8 +7,10 @@ TBD
### Bug fixes
- Fix no port on bedrock server creation. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/493))
### Tweaks
-- Docker🐋 | Update image base to Ubuntu 22.04 Jammy ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/497))
+- Docker🐋 | Update image base to Ubuntu 22.04 Jammy. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/497))
*(OpenJDK16 Removed, no jammy backport)*
+### Hotfix (4.0.18)
+- Apply custom login backgrounds on all public pages. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/499))
## --- [4.0.16] - 2022/10/23
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index bb31248f..7f3f0c26 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -39,6 +39,7 @@ class PublicHandler(BaseHandler):
"lang": self.helper.get_setting("language"),
"lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
"query": "",
+ "background": self.controller.cached_login,
}
if self.request.query:
@@ -48,7 +49,6 @@ class PublicHandler(BaseHandler):
template = "public/404.html"
if page == "login":
- page_data["background"] = self.controller.cached_login
template = "public/login.html"
elif page == 404:
diff --git a/app/classes/web/status_handler.py b/app/classes/web/status_handler.py
index 6e73cdcb..410e3a36 100644
--- a/app/classes/web/status_handler.py
+++ b/app/classes/web/status_handler.py
@@ -7,7 +7,7 @@ logger = logging.getLogger(__name__)
class StatusHandler(BaseHandler):
def get(self):
- page_data = {}
+ page_data = {"background": self.controller.cached_login}
page_data["lang"] = self.helper.get_setting("language")
page_data["lang_page"] = self.helper.get_lang_page(
self.helper.get_setting("language")
diff --git a/app/frontend/templates/public/404.html b/app/frontend/templates/public/404.html
index fa301d26..480fe5cf 100644
--- a/app/frontend/templates/public/404.html
+++ b/app/frontend/templates/public/404.html
@@ -1,70 +1,81 @@
-