diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index 7dc4c892..5403dbbb 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -175,7 +175,7 @@ class Controller: tempZipStorage += '.zip' websocket_helper.broadcast_user(exec_user['user_id'], 'send_logs_bootbox', { }) - + self.users.set_support_path(exec_user['user_id'], tempZipStorage) @staticmethod @@ -287,9 +287,9 @@ class Controller: return False if helper.is_os_windows(): - server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem), + server_command = 'java -Xms{}M -Xmx{}M -jar "{}" nogui'.format(helper.float_to_string(min_mem), helper.float_to_string(max_mem), - '"'+full_jar_path+'"') + full_jar_path) else: server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem), helper.float_to_string(max_mem), @@ -471,7 +471,7 @@ class Controller: if helper.check_path_exists(self.servers.get_server_data_by_id(server_id)['backup_path']): shutil.rmtree(helper.get_os_understandable_path(self.servers.get_server_data_by_id(server_id)['backup_path'])) - + #Cleanup scheduled tasks try: helpers_management.delete_scheduled_task_by_server(server_id) diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py index d35379ea..810703d3 100644 --- a/app/classes/shared/tasks.py +++ b/app/classes/shared/tasks.py @@ -1,4 +1,5 @@ from datetime import timedelta +from http import server import os import sys import json @@ -80,7 +81,7 @@ class TasksManager: logger.info("Reload from DB called. Current enabled schedules: ") for item in jobs: logger.info("JOB: {}".format(item)) - + def command_watcher(self): while True: # select any commands waiting to be processed @@ -285,8 +286,7 @@ class TasksManager: logger.info("Scheduling Serverjars.com cache refresh service every 12 hours") self.scheduler.add_job(server_jar_obj.refresh_cache, 'interval', hours=12, id="serverjars") - @staticmethod - def realtime(): + def realtime(self): loop = asyncio.new_event_loop() asyncio.set_event_loop(loop) @@ -311,7 +311,69 @@ class TasksManager: 'mem_percent': host_stats.get('mem_percent'), 'mem_usage': host_stats.get('mem_usage') }) - time.sleep(4) + + servers = self.controller.servers_list + servers_ping = [] + for srv in servers: + server_data = srv.get('server_data_obj', False) + if server_data: + server_id = server_data.get('server_id', False) + srv['raw_ping_result'] = self.controller.stats.get_raw_server_stats(server_id) + if ("{}".format(srv['raw_ping_result'].get('icon')) == "b''"): + srv['raw_ping_result']['icon'] = False + + servers_ping.append({ + 'id': srv['raw_ping_result'].get('id'), + 'started': srv['raw_ping_result'].get('started'), + 'running': srv['raw_ping_result'].get('running'), + 'cpu': srv['raw_ping_result'].get('cpu'), + 'mem': srv['raw_ping_result'].get('mem'), + 'mem_percent': srv['raw_ping_result'].get('mem_percent'), + 'world_name': srv['raw_ping_result'].get('world_name'), + 'world_size': srv['raw_ping_result'].get('world_size'), + 'server_port': srv['raw_ping_result'].get('server_port'), + 'int_ping_results': srv['raw_ping_result'].get('int_ping_results'), + 'online': srv['raw_ping_result'].get('online'), + 'max': srv['raw_ping_result'].get('max'), + 'players': srv['raw_ping_result'].get('players'), + 'desc': srv['raw_ping_result'].get('desc'), + 'version': srv['raw_ping_result'].get('version'), + 'icon': srv['raw_ping_result'].get('icon') + }) + if (len(websocket_helper.clients) > 0): + websocket_helper.broadcast_page_params( + '/panel/server_detail', + { + 'id': str(server_id) + }, + 'update_server_details', + { + 'id': srv['raw_ping_result'].get('id'), + 'started': srv['raw_ping_result'].get('started'), + 'running': srv['raw_ping_result'].get('running'), + 'cpu': srv['raw_ping_result'].get('cpu'), + 'mem': srv['raw_ping_result'].get('mem'), + 'mem_percent': srv['raw_ping_result'].get('mem_percent'), + 'world_name': srv['raw_ping_result'].get('world_name'), + 'world_size': srv['raw_ping_result'].get('world_size'), + 'server_port': srv['raw_ping_result'].get('server_port'), + 'int_ping_results': srv['raw_ping_result'].get('int_ping_results'), + 'online': srv['raw_ping_result'].get('online'), + 'max': srv['raw_ping_result'].get('max'), + 'players': srv['raw_ping_result'].get('players'), + 'desc': srv['raw_ping_result'].get('desc'), + 'version': srv['raw_ping_result'].get('version'), + 'icon': srv['raw_ping_result'].get('icon') + } + ) + + if (len(servers_ping) > 0) & (len(websocket_helper.clients) > 0): + try: + websocket_helper.broadcast_page('/panel/dashboard', 'update_server_status', servers_ping) + websocket_helper.broadcast_page('/status', 'update_server_status', servers_ping) + except: + console.warning("Can't broadcast server status to websocket") + time.sleep(5) def log_watcher(self): self.controller.servers.check_for_old_logs() diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index ab6d5656..b70091b4 100644 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -1,153 +1,162 @@ - - - - - {% block meta %}{% end %} - {% block title %}{{ _('Default') }}{% end %} - - - - - - - - - + + + + + {% block meta %}{% end %} + {% block title %}{{ _('Default') }}{% end %} - + + + + + + + + + - - - - + - - - + + + + - - - + + + - + + + - -
- - + + {% include main_menu.html %} + +
+ +
+ +
+ + {% block content %} + {% end %} + + {% include footer.html %} +
+ + +
+ + - -
+ +
- - - - - - + + + + + + + - - + {% block js %} + + + {% end %} - {% block js %} - - - {% end %} + - \ No newline at end of file diff --git a/app/frontend/templates/blank_page_template.html b/app/frontend/templates/blank_page_template.html index c3ddab33..26e22ecf 100644 --- a/app/frontend/templates/blank_page_template.html +++ b/app/frontend/templates/blank_page_template.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - Blank Page{% end %} diff --git a/app/frontend/templates/panel/activity_logs.html b/app/frontend/templates/panel/activity_logs.html index 547ef620..c8717f38 100644 --- a/app/frontend/templates/panel/activity_logs.html +++ b/app/frontend/templates/panel/activity_logs.html @@ -1,8 +1,6 @@ {% extends ../base.html %} {% block meta %} - - {% end %} {% block title %}Crafty Controller - Activity Logs{% end %} @@ -93,7 +91,7 @@ $( document ).ready(function() { if($(window).width() < 1000){ $('.too_small').popover("show"); } - + }); $(window).ready(function(){ $('body').click(function(){ diff --git a/app/frontend/templates/panel/contribute.html b/app/frontend/templates/panel/contribute.html index 5ca38c6b..94efdcba 100644 --- a/app/frontend/templates/panel/contribute.html +++ b/app/frontend/templates/panel/contribute.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - Contribute{% end %} @@ -73,7 +72,7 @@

- Thank you for your interest in contributing to Aracdia Technology's Crafty Controller. + Thank you for your interest in contributing to Aracdia Technology's Crafty Controller. We are always thinking of new ways for our community to contribute to this awesome project.

If you don't see a contribution method that peaks your interest now please check back soon.

diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index e35abd34..fb5a4ad2 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - Credits{% end %} diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index 0b584423..80da1deb 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - {{ translate('dashboard', 'dashboard', data['lang']) }}{% end %} @@ -10,7 +9,7 @@
- +
@@ -29,16 +28,21 @@
-
{{ translate('dashboard', 'host', data['lang']) }}
+
{{ translate('dashboard', 'host', data['lang']) }} +

-

- {{ translate('dashboard', 'cpuUsage', data['lang']) }}: {{ data.get('hosts_data').get('cpu_usage') }} +

+ {{ translate('dashboard', 'cpuUsage', data['lang']) }}: {{ + data.get('hosts_data').get('cpu_usage') }}

-

- {{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_percent') }}% +

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

@@ -46,20 +50,24 @@
-
{{ translate('dashboard', 'servers', data['lang']) }}
+
{{ translate('dashboard', 'servers', data['lang']) }} +

{{ data['server_stats']['total'] }}

-

{{ data['server_stats']['running'] }} {{ translate('dashboard', 'online', data['lang']).lower() }}

-

{{ data['server_stats']['stopped'] }} {{ translate('dashboard', 'offline', data['lang']).lower() }}

+

{{ data['server_stats']['running'] }} {{ translate('dashboard', 'online', + data['lang']).lower() }}

+

{{ data['server_stats']['stopped'] }} {{ translate('dashboard', + 'offline', data['lang']).lower() }}

-
{{ translate('dashboard', 'players', data['lang']) }}
+
{{ translate('dashboard', 'players', data['lang']) }} +

{{ data['num_players'] }}

@@ -79,24 +87,29 @@
-

 {{ translate('dashboard', 'allServers', data['lang']) }}

+

 {{ translate('dashboard', 'allServers', + data['lang']) }}

{% if len(data['servers']) > 0 %} - + {% end %} - +
- {% if len(data['servers']) == 0%} -
-

{{ translate('dashboard', 'welcome', data['lang']) }}

-
- {{ translate('dashboard', 'no-servers', data['lang']) }} {{ translate('dashboard', 'newServer', data['lang']) }}. -
- - {% end %} - {% if len(data['servers']) > 0 %} + {% if len(data['servers']) == 0%} +
+

{{ translate('dashboard', 'welcome', data['lang']) }}

+
+ {{ translate('dashboard', 'no-servers', data['lang']) }} {{ translate('dashboard', 'newServer', + data['lang']) }}. +
+ + {% end %} + {% if len(data['servers']) > 0 %} @@ -121,24 +134,37 @@ - - - - - @@ -212,192 +244,303 @@ {% end %} {% block js %} + + {% end %} \ No newline at end of file diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html index 80df0eba..957a5e3d 100644 --- a/app/frontend/templates/panel/panel_config.html +++ b/app/frontend/templates/panel/panel_config.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - {{ translate('panelConfig', 'pageTitle', data['lang']) }}{% end %} diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html index fa2e1b52..e97e081f 100644 --- a/app/frontend/templates/panel/panel_edit_role.html +++ b/app/frontend/templates/panel/panel_edit_role.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - {{ translate('rolesConfig', 'pageTitle', data['lang']) }}{% end %} @@ -58,7 +57,7 @@ {% raw xsrf_form_html() %} - +

{{ translate('rolesConfig', 'roleTitle', data['lang']) }}

@@ -70,7 +69,7 @@
- +

{{ translate('rolesConfig', 'roleServers', data['lang']) }} {{ translate('rolesConfig', 'serversDesc', data['lang']) }}

@@ -105,12 +104,12 @@
- +

{{ translate('rolesConfig', 'rolePerms', data['lang']) }} - {{ translate('rolesConfig', 'permsServer', data['lang']) }}

-
+
{% if server['user_command_permission'] %} - {% if server['stats']['running'] %} -   -   -   - {% elif server['stats']['updating']%} - {{ translate('serverTerm', 'updating', data['lang']) }} - {% elif server['stats']['waiting_start']%} - {{ translate('dashboard', 'starting', data['lang']) }} - {% else %} -   -   -   - {% end %} + {% if server['stats']['running'] %} +   + +   +   + {% elif server['stats']['updating']%} + {{ translate('serverTerm', 'updating', + data['lang']) }} + {% elif server['stats']['waiting_start']%} + {{ translate('dashboard', 'starting', + data['lang']) }} + {% else %} +   +   +   + {% end %} {% end %} -
+
+
+ " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" + aria-valuemin="0" aria-valuemax="100">
{{server['stats']['cpu']}}% 		-
+
+
+ " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0" + aria-valuemin="0" aria-valuemax="100">
{{server['stats']['mem_percent']}}% - {% if server['stats']['mem'] == 0 %} - 0 MB + 0 MB {% else %} - {{server['stats']['mem']}} + {{server['stats']['mem']}} {% end %} 		+ {{ server['stats']['world_name'] }} : {{ server['stats']['world_size'] }} + {% if server['stats']['int_ping_results'] %} - {{ server['stats']['online'] }} / {{ server['stats']['max'] }} {{ translate('dashboard', 'max', data['lang']) }}
+ {{ server['stats']['online'] }} / {{ server['stats']['max'] }} {{ translate('dashboard', 'max', + data['lang']) }}
- {% if server['stats']['desc'] != 'False' %} - {{ server['stats']['desc'] }}
- {% end %} + {% if server['stats']['desc'] != 'False' %} + {{ server['stats']['desc'] }}
+ {% end %} - {% if server['stats']['version'] != 'False' %} - {{ server['stats']['version'] }} - {% end %} + {% if server['stats']['version'] != 'False' %} + {{ server['stats']['version'] }} + {% end %} {% end %} 		+ {% if server['stats']['running'] %} - {{ translate('dashboard', 'online', data['lang']) }} + {{ translate('dashboard', 'online', + data['lang']) }} {% else %} - {{ translate('dashboard', 'offline', data['lang']) }} + {{ translate('dashboard', 'offline', + data['lang']) }} {% end %}
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html index af472a3e..40d58065 100644 --- a/app/frontend/templates/panel/panel_edit_user.html +++ b/app/frontend/templates/panel/panel_edit_user.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - Edit User{% end %} diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html index d9fa48c2..d0d650b5 100644 --- a/app/frontend/templates/panel/panel_edit_user_apikeys.html +++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - Edit User API Keys{% end %} diff --git a/app/frontend/templates/panel/parts/details_stats.html b/app/frontend/templates/panel/parts/details_stats.html index 3fcdc650..b3a3f883 100644 --- a/app/frontend/templates/panel/parts/details_stats.html +++ b/app/frontend/templates/panel/parts/details_stats.html @@ -1,56 +1,52 @@
-
-
-
-
-
- {% if data['server_stats']['running'] %} - {{ translate('serverStats', 'serverStatus', data['lang']) }}: {{ translate('serverStats', 'online', data['lang']) }}
- {{ translate('serverStats', 'serverStarted', data['lang']) }}: {{ data['server_stats']['started'] }} ({{ translate('serverStats', 'serverTime', data['lang']) }})
- {{ translate('serverStats', 'serverUptime', data['lang']) }}: {{ translate('serverStats', 'errorCalculatingUptime', data['lang']) }} - {% else %} - {{ translate('serverStats', 'serverStatus', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }}
- {{ translate('serverStats', 'serverStarted', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }}
- {{ translate('serverStats', 'serverUptime', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }} - {% end %} -
- {{ translate('serverStats', 'serverTimeZone', data['lang']) }}: {{ data['serverTZ'] }} -
- -
- {{ translate('serverStats', 'cpuUsage', data['lang']) }}: {{ data['server_stats']['cpu'] }}%
- {{ translate('serverStats', 'memUsage', data['lang']) }}: {{ data['server_stats']['mem'] }}
- {% if data['server_stats']['int_ping_results'] %} - {{ translate('serverStats', 'players', data['lang']) }}: {{ data['server_stats']['online'] }} / {{ data['server_stats']['max'] }}
- {% else %} - {{ translate('serverStats', 'players', data['lang']) }}: 0/0
- {% end %} -
- -
- {% if data['server_stats']['version'] != 'False' %} - {{ translate('serverStats', 'version', data['lang']) }}: {{ data['server_stats']['version'] }}
- {{ translate('serverStats', 'description', data['lang']) }}: {{ data['server_stats']['desc'] }}
- {% else %} - {{ translate('serverStats', 'version', data['lang']) }}: {{ translate('serverStats', 'unableToConnect', data['lang']) }}
- {{ translate('serverStats', 'description', data['lang']) }}: {{ translate('serverStats', 'unableToConnect', data['lang']) }}
- {% end %} -
- -
+
+
+
+
+
+ {% if data['server_stats']['running'] %} + {{ translate('serverStats', 'serverStatus', data['lang']) }}: {{ translate('serverStats', 'online', data['lang']) }}
+ {{ translate('serverStats', 'serverStarted', data['lang']) }}: {{ data['server_stats']['started'] }} ({{ translate('serverStats', 'serverTime', data['lang']) }})
+ {{ translate('serverStats', 'serverUptime', data['lang']) }}: {{ translate('serverStats', 'errorCalculatingUptime', data['lang']) }} + {% else %} + {{ translate('serverStats', 'serverStatus', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }}
+ {{ translate('serverStats', 'serverStarted', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }}
+ {{ translate('serverStats', 'serverUptime', data['lang']) }}: {{ translate('serverStats', 'offline', data['lang']) }} + {% end %} +
+ {{ translate('serverStats', 'serverTimeZone', data['lang']) }}: {{ data['serverTZ'] }}
+
+ {{ translate('serverStats', 'cpuUsage', data['lang']) }}: {{ data['server_stats']['cpu'] }}%
+ {{ translate('serverStats', 'memUsage', data['lang']) }}: {{ data['server_stats']['mem'] }}
+ {% if data['server_stats']['int_ping_results'] %} + {{ translate('serverStats', 'players', data['lang']) }}: {{ data['server_stats']['online'] }} / {{ data['server_stats']['max'] }}
+ {% else %} + {{ translate('serverStats', 'players', data['lang']) }}: 0/0
+ {% end %} +
+ +
+ {% if data['server_stats']['version'] != 'False' %} + {{ translate('serverStats', 'version', data['lang']) }}: {{ data['server_stats']['version'] }}
+ {{ translate('serverStats', 'description', data['lang']) }}: {{ data['server_stats']['desc'] }}
+ {% else %} + {{ translate('serverStats', 'version', data['lang']) }}: {{ translate('serverStats', 'unableToConnect', data['lang']) }}
+ {{ translate('serverStats', 'description', data['lang']) }}: {{ translate('serverStats', 'unableToConnect', data['lang']) }}
+ {% end %} +
- +
+
+ - \ No newline at end of file diff --git a/app/frontend/templates/panel/server_admin_controls.html b/app/frontend/templates/panel/server_admin_controls.html index bd997898..b742094f 100644 --- a/app/frontend/templates/panel/server_admin_controls.html +++ b/app/frontend/templates/panel/server_admin_controls.html @@ -1,7 +1,6 @@ {% extends ../base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - {{ translate('serverDetails', 'serverDetails', data['lang']) }}{% end %} @@ -33,7 +32,7 @@
{% include "parts/server_controls_list.html %} - +
@@ -93,188 +93,182 @@ {% block js %} diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html index 8f1f2363..fd4ec1ab 100644 --- a/app/frontend/templates/public/status.html +++ b/app/frontend/templates/public/status.html @@ -1,7 +1,6 @@ {% extends ../public_base.html %} {% block meta %} - {% end %} {% block title %}Crafty Controller - {{ translate('dashboard', 'dashboard', data['lang']) }}{% end %} @@ -24,40 +23,49 @@
{% for server in data['servers'] %} - - {% if server['stats']['int_ping_results'] != 'False' %} - - - + + icon {% end %} - + + {% else %} + + + + {% end %} + @@ -73,14 +81,83 @@ {% block js %} - - + + {% end %} \ No newline at end of file diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html index fdaf1d24..3c9fa176 100644 --- a/app/frontend/templates/public_base.html +++ b/app/frontend/templates/public_base.html @@ -1,60 +1,118 @@ - - - - - {% block meta %}{% end %} - {% block title %}{{ _('Default') }}{% end %} - - - - - - - - - - - - - - - - - -
-
-
-
-
-
- {% block content %} - {% end %} -
+ + + + + + {% block meta %}{% end %} + {% block title %}{{ _('Default') }}{% end %} + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ {% block content %} + {% end %}
-
- +
- - - - - - - - - - - - - {% block js %} - - - {% end %} - - + +
+ + + + + + + + + + + + + {% block js %} + + + {% end %} + + + \ No newline at end of file diff --git a/app/translations/de_DE.json b/app/translations/de_DE.json index fa71f47b..8c1f8714 100644 --- a/app/translations/de_DE.json +++ b/app/translations/de_DE.json @@ -122,6 +122,7 @@ "serverStats": { "online": "Online", "offline": "Offline", + "starting": "Verzögerter Start", "serverStatus": "Server Status", "serverStarted": "Server gestartet", "serverUptime": "Server-Betriebszeit", diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 58dd568e..df724cc8 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -129,6 +129,7 @@ "serverStats": { "online": "Online", "offline": "Offline", + "starting": "Delayed-Start", "serverStatus": "Server Status", "serverStarted": "Server Started", "serverUptime": "Server Uptime", diff --git a/app/translations/es_ES.json b/app/translations/es_ES.json index 6d0c2a5b..3ece4d8c 100644 --- a/app/translations/es_ES.json +++ b/app/translations/es_ES.json @@ -123,6 +123,7 @@ "serverStats": { "online": "En línea", "offline": "Desconectado", + "starting": "Inicio-retrasado", "serverStatus": "Estado del Servidor", "serverStarted": "Servidor Iniciado", "serverUptime": "Actividad del Servidor", diff --git a/app/translations/fi_FI.json b/app/translations/fi_FI.json index 1a9d85ef..b61a46cb 100644 --- a/app/translations/fi_FI.json +++ b/app/translations/fi_FI.json @@ -133,6 +133,7 @@ "serverStats": { "online": "Päällä", "offline": "Pois päältä", + "starting": "Myöhästynyt lähtö", "serverStatus": "Palvelimen tila", "serverStarted": "Palvelin käynnistyi", "serverUptime": "Palvelimen käyttöaika", diff --git a/app/translations/fr_FR.json b/app/translations/fr_FR.json index 1144eb8b..b2419cc0 100644 --- a/app/translations/fr_FR.json +++ b/app/translations/fr_FR.json @@ -123,6 +123,7 @@ "serverStats": { "online": "En Ligne", "offline": "Hors Ligne", + "starting": "Démarrage en cours", "serverStatus": "Statut du Serveur", "serverStarted": "Serveur Démarré", "serverUptime": "Serveur Disponible depuis", diff --git a/app/translations/hr_HR.json b/app/translations/hr_HR.json index cc8a37e2..b6e8a972 100644 --- a/app/translations/hr_HR.json +++ b/app/translations/hr_HR.json @@ -122,6 +122,7 @@ "serverStats": { "online": "Na mreži", "offline": "Izvan mreže", + "starting": "Odgođeno pokretanje", "serverStatus": "Status poslužitelja", "serverStarted": "Poslužitelj pokrenut", "serverUptime": "Vrijeme rada poslužitelja", diff --git a/app/translations/it_IT.json b/app/translations/it_IT.json index cdf8dc65..dc49f6cf 100644 --- a/app/translations/it_IT.json +++ b/app/translations/it_IT.json @@ -122,6 +122,7 @@ "serverStats": { "online": "Online", "offline": "Offline", + "starting": "Avvio ritardato", "serverStatus": "Stato del server", "serverStarted": "Server Avviato", "serverUptime": "Tempo di esecuzione", diff --git a/app/translations/lol_EN.json b/app/translations/lol_EN.json index 373cd230..7dd3666c 100644 --- a/app/translations/lol_EN.json +++ b/app/translations/lol_EN.json @@ -123,6 +123,7 @@ "serverStats": { "online": "Turnd on", "offline": "Turnd off", + "starting": "I waitz b4 I start", "serverStatus": "Servr Status", "serverStarted": "Servr Started", "serverUptime": "How longz servr been awaek", diff --git a/app/translations/nl_BE.json b/app/translations/nl_BE.json index b54fc542..fb83cf6f 100644 --- a/app/translations/nl_BE.json +++ b/app/translations/nl_BE.json @@ -122,6 +122,7 @@ "serverStats": { "online": "Online", "offline": "Offline", + "starting": "Vertraagde start", "serverStatus": "Server Status", "serverStarted": "Server gestart", "serverUptime": "Server Uptime", diff --git a/app/translations/zh_CN.json b/app/translations/zh_CN.json index ba86fa0b..d7bdfc85 100644 --- a/app/translations/zh_CN.json +++ b/app/translations/zh_CN.json @@ -123,6 +123,7 @@ "serverStats": { "online": "运行中", "offline": "已停止", + "starting": "延迟启动", "serverStatus": "服务器状态", "serverStarted": "服务器已启动", "serverUptime": "服务器正常运行时间",
+ - {{ server['server_data']['server_name'] }} + {{ server['server_data']['server_name'] }} - {{ server['stats']['online'] }} / {{ server['stats']['max'] }} {{ translate('dashboard', 'max', data['lang']) }}
- 		- {% if server['stats']['desc'] != 'False' %} - {% if server['raw_ping_result']['icon'] %} - icon - {% else %} - icon - {% end %} - {{ server['stats']['desc'] }}
- {% end %} - 		- {% if server['stats']['version'] != 'False' %} - {{ server['stats']['version'] }} - {% end %} + {% if server['stats']['int_ping_results'] != 'False' %} + + {{ server['stats']['online'] }} / {{ server['stats']['max'] }} {{ translate('dashboard', 'max', + data['lang']) }}
 + {% if server['stats']['desc'] != 'False' %} + {% if server['raw_ping_result']['icon'] %} + icon {% else %} - - - Crafty can't get infos from this Server - + {{ + server['stats']['desc'] }}
+ {% end %} + 		+ {% if server['stats']['version'] != 'False' %} + {{ server['stats']['version'] }} + {% end %} + + + + Crafty can't get infos from this Server + + + {% if server['stats']['running'] %} - {{ translate('dashboard', 'online', data['lang']) }} + {{ translate('dashboard', 'online', data['lang']) + }} {% else %} - {{ translate('dashboard', 'offline', data['lang']) }} + {{ translate('dashboard', 'offline', data['lang']) + }} {% end %}