diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f823e3..bce5e02e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Tweaks - Spelling mistake fixed in German lang file ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/370)) - Backup failure warning (Tab text goes red) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/373)) +- - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/377)) - Rework server list on dashboard display for use on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/372)) - File handling enhancements ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/362))

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 7cb18be0..8f44749f 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -483,6 +483,14 @@ class PanelHandler(BaseHandler): if str(server_id) not in server_ids[:]: user_order.remove(server_id) page_data["servers"] = page_servers + for server in page_data["servers"]: + server_obj = self.controller.servers.get_server_instance_by_id( + server["server_data"]["server_id"] + ) + alert = False + if server_obj.last_backup_status(): + alert = True + server["alert"] = alert # num players is set to zero here. If we poll all servers while # dashboard is loading it takes FOREVER. We leave this to the diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index 0d081a68..b6eb09a2 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -60,12 +60,12 @@

+ title="{% raw translate('dashboard', 'cpuCores', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cores') }}
{% raw translate('dashboard', 'cpuCurFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cur_freq') }}
{% raw translate('dashboard', 'cpuMaxFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_max_freq') }}"> {{ translate('dashboard', 'cpuUsage', data['lang']) }}: {{ data.get('hosts_data').get('cpu_usage') }}

+ title="{{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_usage') }}"> {{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_percent') }}%

@@ -116,8 +116,8 @@ {% if len(data['servers']) > 0 %} {% if data['user_data']['hints'] %} + data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}" , + data-placement="top"> {% end %} {% end %}
  {{ @@ -154,26 +154,33 @@ + {% if server['alert'] %} + + {{ server['server_data']['server_name'] }}  + + {% else %} {{ server['server_data']['server_name'] }} + {% end %} {% if server['user_command_permission'] %} {% if server['stats']['running'] %} + title="{{ translate('dashboard', 'stop' , data['lang']) }}">   + title="{{ translate('dashboard', 'restart' , data['lang']) }}">   + title="{{ translate('dashboard', 'kill' , data['lang']) }}">   @@ -192,15 +199,15 @@ data['lang']) }} {% else %} + title="{{ translate('dashboard', 'start' , data['lang']) }}">   + title="{{ translate('dashboard', 'clone' , data['lang']) }}">   + title="{{ translate('dashboard', 'kill' , data['lang']) }}">   {% end %} @@ -209,7 +216,7 @@
+ title="{{server['stats']['cpu']}}">
+ aria-valuemin="0" aria-valuemax="100">
{{server['stats']['cpu']}}%
+ title="{{server['stats']['mem']}}">
+ aria-valuemin="0" aria-valuemax="100">
{{server['stats']['mem_percent']}}% - @@ -256,7 +263,7 @@ {% if server['stats']['desc'] != 'False' %}
{{ + style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">{{ server['stats']['desc'] }}

{% end %} @@ -280,7 +287,7 @@ {% end %} + data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"> {% end %} @@ -297,23 +304,35 @@

- + {% if server['alert'] %} + + {{ server['server_data']['server_name'] }}  + + {% else %} + {{ server['server_data']['server_name'] }} + {% end %}
-
- + {% if server['stats']['running'] %} {{ translate('dashboard', 'online', data['lang']) }} {% elif server['stats']['crashed'] %} - {{ translate('dashboard', + {{ + translate('dashboard', 'crashed', data['lang']) }} {% else %} @@ -328,20 +347,23 @@ {% if server['stats']['running'] %}
- +
- +
- +
@@ -350,7 +372,8 @@
- {{ translate('serverTerm', 'updating', + {{ + translate('serverTerm', 'updating', data['lang']) }}
@@ -366,27 +389,31 @@ {% elif server['stats']['downloading']%}
- + {{ translate('serverTerm', 'downloading', data['lang']) }}
{% else %}
- +
- +
- +
@@ -398,14 +425,15 @@

-
+
{{ translate('dashboard', 'cpuUsage', data['lang']) }}
+ title="{{server['stats']['cpu']}}">
+ " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" aria-valuemin="0" + aria-valuemax="100">
{{server['stats']['cpu']}}%
@@ -424,7 +452,7 @@
{{ translate('dashboard', 'memUsage', data['lang']) }}
+ title="{{server['stats']['mem']}}">
+ aria-valuemin="0" aria-valuemax="100">
{{server['stats']['mem_percent']}}% - @@ -464,7 +492,7 @@ {% if server['stats']['desc'] != 'False' %}
+ style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;"> {{ server['stats']['desc'] }}

{% end %} diff --git a/app/frontend/templates/panel/parts/m_server_controls_list.html b/app/frontend/templates/panel/parts/m_server_controls_list.html index a82d02ff..4a114b52 100644 --- a/app/frontend/templates/panel/parts/m_server_controls_list.html +++ b/app/frontend/templates/panel/parts/m_server_controls_list.html @@ -15,8 +15,12 @@ {{ translate('serverDetails', 'schedule', data['lang']) }} {% end %} {% if data['permissions']['Backup'] in data['user_permissions'] %} + {% if data['backup_failed'] %} + {{ translate('serverDetails', 'backup', data['lang']) }}  + {% else %} {{ translate('serverDetails', 'backup', data['lang']) }} {% end %} + {% end %} {% if data['permissions']['Files'] in data['user_permissions'] %} {{ translate('serverDetails', 'files', data['lang']) }} {% end %} diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index b2c02416..3c107d30 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -32,7 +32,12 @@
- {% include "parts/server_controls_list.html" %} + + {% include "parts/server_controls_list.html %} + + + {% include "parts/m_server_controls_list.html %} +
@@ -82,14 +87,15 @@ {% if data['server_stats']['server_type'] == "minecraft-java" %}
@@ -106,94 +112,94 @@
{% else %}
@@ -396,4 +402,4 @@ -{% end %} +{% end %} \ No newline at end of file diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html index 45e02ced..a48c522e 100644 --- a/app/frontend/templates/panel/server_files.html +++ b/app/frontend/templates/panel/server_files.html @@ -32,7 +32,12 @@
- {% include "parts/server_controls_list.html" %} + + {% include "parts/server_controls_list.html %} + + + {% include "parts/m_server_controls_list.html %} +
@@ -212,7 +217,9 @@ display: none; } - html, body, body > .container-scroller { + html, + body, + body>.container-scroller { overflow: initial; } @@ -285,7 +292,7 @@ mac: 'Command-S', sender: 'editor|cli' }, - exec: function(env, args, request) { + exec: function (env, args, request) { save() } }); @@ -1097,7 +1104,7 @@ if (handlerName == 'null') handlerName = null; editor.setKeyboardHandler(handlerName, () => { if (handlerName == 'ace/keyboard/vim') { - require("ace/keyboard/vim").Vim.defineEx('write', 'w', function() { + require("ace/keyboard/vim").Vim.defineEx('write', 'w', function () { save(); }); } @@ -1117,4 +1124,4 @@ -{% end %} +{% end %} \ No newline at end of file diff --git a/app/frontend/templates/panel/server_logs.html b/app/frontend/templates/panel/server_logs.html index c4b0aa89..0d2ebe2b 100644 --- a/app/frontend/templates/panel/server_logs.html +++ b/app/frontend/templates/panel/server_logs.html @@ -9,14 +9,15 @@
- +

- {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ data['server_stats']['server_id']['server_name'] }} -
- UUID: {{ data['server_stats']['server_id']['server_uuid'] }} + {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ + data['server_stats']['server_id']['server_name'] }} +
+ UUID: {{ data['server_stats']['server_id']['server_uuid'] }}

@@ -24,23 +25,30 @@
- {% include "parts/details_stats.html" %} + {% include "parts/details_stats.html" %}
- {% include "parts/server_controls_list.html" %} + + {% include "parts/server_controls_list.html %} + + + {% include "parts/m_server_controls_list.html %} + -
-
-
+
+
+
-
- -
+
+ + +
@@ -57,8 +65,8 @@ -{% end %} +{% end %} \ No newline at end of file