Masterserver uptime fix

diff --git a/util/master/list.js b/util/master/list.js
index 2a831a2686651649944412282e3ab9dd08029daf..59c12cd9e39f4f8c77046c004d40fc0658b3f615 100644 (file)
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -19,6 +19,7 @@ function humanTime(seconds) {
                        return (seconds / conv[i]).toFixed(1) + i;
                }
        }
+       return seconds + 's';
 }
 
 function escapeHTML(str) {

diff --git a/util/master/servers.jst b/util/master/servers.jst
index bf4a4bf54065b1f7a31926bd51b46f6b80f49a96..3db07d05a49d08b222539ff95e8c35650ce6d62c 100644 (file)
--- a/util/master/servers.jst
+++ b/util/master/servers.jst
@@ -7,7 +7,7 @@
 <table>
        <tr>
                {{? !master.no_address}}<th>IP[:Port]</th>{{?}}
-               {{? !master.no_clients}}<th>Players/Max</th>{{?}}
+               {{? !master.no_clients}}<th>Players/Max{{? !master.no_avgtop}}<br/>Avg/Top{{?}}</th>{{?}}
                {{? !master.no_version}}<th>Version, Gameid, MapGen</th>{{?}}
                {{? !master.no_name}}<th>Name</th>{{?}}
                {{? !master.no_description}}<th>Description</th>{{?}}
@@ -25,7 +25,7 @@
                </td>{{?}}
                {{? !master.no_clients}}
                <td class="clients{{? server.clients_list && server.clients_list.length > 0}} mts_hover_list_text{{?}}">
-                       {{=server.clients}}/{{=server.clients_max}} {{=server.clients_top}}
+                       {{=server.clients}}/{{=server.clients_max}}{{? !master.no_avgtop}} &nbsp;&nbsp;{{=Math.floor(server.pop_v)}}/{{=server.clients_top}}{{?}}
                        {{=hoverList("Clients", server.clients_list)}}
                </td>{{?}}
                {{? !master.no_version}}