From 4e17c1ea5eade9135bd41f3d18fd1a36abc037d1 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 19 Nov 2022 15:45:29 -0500 Subject: [PATCH] Add installing status --- app/frontend/templates/panel/dashboard.html | 7 ++++++- app/frontend/templates/panel/server_term.html | 16 +++++++++++++++- app/translations/en_EN.json | 6 ++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index fbeb3fca..9d91e156 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -168,7 +168,12 @@ {% if server['user_command_permission'] %} - {% if server['stats']['updating']%} + {% if server['stats']['importing'] and server['stats']['running'] %} + +  {{ translate('serverTerm', 'installing', + data['lang']) }} + {% elif server['stats']['updating']%}  {{ translate('serverTerm', 'updating', diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html index c4ebacb5..54ac127a 100644 --- a/app/frontend/templates/panel/server_term.html +++ b/app/frontend/templates/panel/server_term.html @@ -62,7 +62,21 @@ {% if data['permissions']['Commands'] in data['user_permissions'] %} - {% if data['server_stats']['updating']%} + {% if data['importing'] and data['server_stats']['running']%} +
+ + + +
+ {% elif data['server_stats']['updating']%}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 4309b28a..e66091f5 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -97,7 +97,8 @@ "status": "Status", "stop": "Stop", "version": "Version", - "welcome": "Welcome to Crafty Controller" + "welcome": "Welcome to Crafty Controller", + "installing": "Installing..." }, "datatables": { "i18n": { @@ -481,7 +482,8 @@ "starting": "Delayed-Start", "stop": "Stop", "stopScroll": "Stop Auto Scrolling", - "updating": "Updating..." + "updating": "Updating...", + "installing": "Installing..." }, "serverMetrics": { "resetZoom": "Reset Zoom",