From 95a802b56f5ddb6c9304bfda020f0f8b4ba5a873 Mon Sep 17 00:00:00 2001 From: Wruczek Date: Fri, 20 Jan 2017 03:03:27 +0100 Subject: [PATCH] Changed OS's names to icons in server status That fixes a problem with long translation names pushing the labels with long version and OS name. For example: "3.0.12.4 on Linux" will work fine while "3.0.12.4 on Windows" will be pushed to the new line due to a long text in label --- css/style.css | 2 +- js/status.js | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/css/style.css b/css/style.css index 0d9f1ca..c06084a 100644 --- a/css/style.css +++ b/css/style.css @@ -36,7 +36,7 @@ p, a { /* STATUS */ /* ****** */ -.serverstatus p { +.serverstatus p, .serverstatus .label .fa { margin: 0 } diff --git a/js/status.js b/js/status.js index fa85c78..a7feb78 100644 --- a/js/status.js +++ b/js/status.js @@ -1,11 +1,10 @@ $(document).ready(function () { - checkStatus(); var intervalid = setInterval(function () { checkStatus(); }, 10 * 1000); -}) +}); function checkStatus() { @@ -27,10 +26,27 @@ function checkStatus() { var averagePacketloss = Math.round(json.averagePacketloss * 100) / 100; var averagePing = Math.round(json.averagePing * 100) / 100; + var platformIcon = ''; + + switch (platform.toLowerCase()) { + case "windows": + platformIcon = platformIcon.replace(/%s/, 'fa-windows'); + break; + case "linux": + platformIcon = platformIcon.replace(/%s/, 'fa-linux'); + break; + case "os x": + case "macos": + platformIcon = platformIcon.replace(/%s/, 'fa-apple'); + break; + default: + platformIcon = platform; + } + result = '

' + statusOnline + ': ' + clientsonline + ' / ' + maxclients + ' (' + clientsprecent + '%)

' + '

' + statusUptime + ': ' + uptime + '

' + - '

' + statusVersion + ': ' + version + ' @ ' + platform + '

' + + '

' + statusVersion + ': ' + version + ' on ' + platformIcon + '

' + '

' + statusAvgping + ': ' + averagePing + ' ms

' + '

' + statusAvgpl + ': ' + averagePacketloss + '%

'; } else {