Skip to content

Commit 5de6082

Browse files
sfan5sfan5
committedFeb 18, 2017
Design changes on the server list page
1 parent 5e12cb5 commit 5de6082

File tree

4 files changed

+42
-31
lines changed

4 files changed

+42
-31
lines changed
 

Diff for: ‎static/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Minetest server list</title>
6+
<style type="text/css">
7+
body { font-family: "Droid Sans", "Segoe UI", sans-serif; }
8+
</style>
69
</head>
710
<body>
811
<div id="server_list"></div>

Diff for: ‎static/list.js

+21-13
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@ if (!master.list) master.list = "list";
66
if (!master.list_root) master.list_root = master.root;
77
if (!master.list_url) master.list_url = master.list_root + master.list;
88

9+
// Utility functions used by the templating code
10+
911
function humanTime(seconds) {
1012
if (typeof(seconds) != "number") return '?';
1113
var conv = {
1214
y: 31536000,
1315
d: 86400,
1416
h: 3600,
1517
m: 60
16-
}
18+
};
1719
for (var i in conv) {
1820
if (seconds >= conv[i]) {
19-
return (seconds / conv[i]).toFixed(1) + i;
21+
return (seconds / conv[i]).toFixed(i=='y'?1:0) + i;
2022
}
2123
}
2224
return seconds + 's';
@@ -37,7 +39,7 @@ function addressString(server) {
3739
var str = '<span'
3840
if (shortStr.length > 25) {
3941
shortStr = shortStr.substr(0, 23) + "&hellip;";
40-
str += ' class="mts_tooltip" title="' + addrStr + '"'
42+
str += ' title="' + addrStr + '"'
4143
}
4244
if (server.port != 30000)
4345
shortStr += ':' + server.port;
@@ -46,19 +48,18 @@ function addressString(server) {
4648

4749
function tooltipString(str, maxLen) {
4850
str = escapeHTML(str);
49-
var shortStr = str;
50-
var ret = '<span';
51-
if (shortStr.length > maxLen) {
52-
shortStr = shortStr.substr(0, maxLen - 2) + "&hellip;";
53-
ret += ' class="mts_tooltip" title="' + str + '"';
51+
var ret = str;
52+
if (ret.length > maxLen) {
53+
ret = '<div class="mts_tooltip" style="width:' + maxLen + 'ch;"';
54+
ret += ' title="' + str + '">' + str + '</div>';
5455
}
55-
return ret + '>' + shortStr + '</span>';
56+
return ret;
5657
}
5758

5859
function hoverList(name, list) {
5960
if (!list || list.length == 0) return '';
6061
var str = '<div class="mts_hover_list">'
61-
str += name + ' (' + list.length + ')<br />';
62+
str += '<b>' + name + '</b> (' + list.length + ')<br />';
6263
for (var i in list) {
6364
str += escapeHTML(list[i]) + '<br />';
6465
}
@@ -67,12 +68,18 @@ function hoverList(name, list) {
6768

6869
function hoverString(name, string) {
6970
if (!string) return '';
70-
return '<div class="mts_hover_list">'
71-
+ name + ':<br />'
71+
return '<div class="mts_hover_list">'
72+
+ '<b>' + name + '</b>:<br />'
7273
+ escapeHTML(string) + '<br />'
7374
+ '</div>';
7475
}
7576

77+
function constantWidth(str, width) {
78+
return '<span class="mts_cwidth" style="width:' + width + 'em;">' + str + '</span>';
79+
}
80+
81+
// Code that fetches & displays the actual list
82+
7683
function draw(json) {
7784
var html = window.render.servers(json);
7885
jQuery(master.output).html(html);
@@ -89,13 +96,14 @@ function loaded(){
8996
get();
9097
}
9198

99+
92100
// https://github.com/pyrsmk/toast
93101
this.toast=function(){var e=document,t=e.getElementsByTagName("head")[0],n=this.setTimeout,r="createElement",i="appendChild",s="addEventListener",o="onreadystatechange",u="styleSheet",a=10,f=0,l=function(){--f},c,h=function(e,r,i,s){if(!t)n(function(){h(e)},a);else if(e.length){c=-1;while(i=e[++c]){if((s=typeof i)=="function"){r=function(){return i(),!0};break}if(s=="string")p(i);else if(i.pop){p(i[0]),r=i[1];break}}d(r,Array.prototype.slice.call(e,c+1))}},p=function(n,s){++f,/\.css$/.test(n)?(s=e[r]("link"),s.rel=u,s.href=n,t[i](s),v(s)):(s=e[r]("script"),s.src=n,t[i](s),s[o]===null?s[o]=m:s.onload=l)},d=function(e,t){if(!f)if(!e||e()){h(t);return}n(function(){d(e,t)},a)},v=function(e){if(e.sheet||e[u]){l();return}n(function(){v(e)},a)},m=function(){/ded|co/.test(this.readyState)&&l()};h(arguments)};
94102

95103
toast(master.root + 'style.css', master.root + 'servers.js', function() {
96104
if (typeof(jQuery) != 'undefined')
97105
return loaded();
98106
else
99-
toast('//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', loaded);
107+
toast('//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js', loaded);
100108
});
101109

Diff for: ‎static/servers.jst

+7-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<thead><tr>
99
{{? !master.no_address}}<th>Address[:Port]</th>{{?}}
1010
{{? !master.no_clients}}<th>Players / Max{{? !master.no_avgtop}}<br/>Average / Top{{?}}</th>{{?}}
11-
{{? !master.no_version}}<th>Version, Subgame, Mapgenerator</th>{{?}}
11+
{{? !master.no_version}}<th>Version, Subgame[, Mapgen]</th>{{?}}
1212
{{? !master.no_name}}<th>Name</th>{{?}}
1313
{{? !master.no_description}}<th>Description</th>{{?}}
1414
{{? !master.no_flags}}<th>Flags</th>{{?}}
@@ -26,13 +26,14 @@
2626
</td>{{?}}
2727
{{? !master.no_clients}}
2828
<td class="clients{{? server.clients_list && server.clients_list.length > 0}} mts_hover_list_text{{?}}">
29-
{{=server.clients}}/{{=server.clients_max}}{{? !master.no_avgtop}} &nbsp;&nbsp;{{=Math.floor(server.pop_v)}}/{{=server.clients_top}}{{?}}
29+
{{=constantWidth(server.clients + '/' + server.clients_max, 3.4)}}
30+
{{? !master.no_avgtop}} {{=constantWidth(Math.floor(server.pop_v) + '/' + server.clients_top, 3.4)}}{{?}}
3031
{{=hoverList("Clients", server.clients_list)}}
3132
</td>{{?}}
3233
{{? !master.no_version}}
3334
<td class="version{{? server.mods && server.mods.length > 0}} mts_hover_list_text{{?}}">
34-
{{=escapeHTML(server.version)}}, {{=escapeHTML(server.gameid)}},&nbsp;
35-
{{=escapeHTML(server.mapgen || '?')}}
35+
{{=escapeHTML(server.version)}}, {{=escapeHTML(server.gameid)}}
36+
{{? server.mapgen}}, {{=escapeHTML(server.mapgen)}}{{?}}
3637
{{=hoverList("Mods", server.mods)}}
3738
</td>{{?}}
3839
{{? !master.no_name}}
@@ -51,21 +52,19 @@
5152
<td class="flags {{? server.privs}} mts_hover_list_text{{?}}">
5253
{{=hoverString("Privs", server.privs)}}
5354
{{=server.creative ? 'Cre ' : ''}}
54-
{{=server.dedicated ? 'Ded ' : ''}}
5555
{{=server.damage ? 'Dmg ' : ''}}
56-
{{=server.liquid_finite ? 'Liq ' : ''}}
5756
{{=server.pvp ? 'PvP ' : ''}}
5857
{{=server.password ? 'Pwd ' : ''}}
5958
{{=server.rollback ? 'Rol ' : ''}}
6059
{{=server.can_see_far_names ? 'Far ' : ''}}
6160
</td>{{?}}
6261
{{? !master.no_uptime}}
6362
<td class="uptime">
64-
{{=humanTime(server.uptime)}}, {{=humanTime(server.game_time)}}
63+
{{=constantWidth(humanTime(server.uptime), 3.2)}} / {{=constantWidth(humanTime(server.game_time), 3.2)}}
6564
</td>{{?}}
6665
{{? !master.no_ping}}
6766
<td class="ping">
68-
{{=Math.floor(server.ping * 1000)}}{{? server.lag}}, {{= Math.floor(server.lag * 1000)}}{{?}}
67+
{{=constantWidth(Math.floor(server.ping * 1000), 1.8)}}{{? server.lag}} / {{=constantWidth(Math.floor(server.lag * 1000), 1.8)}}{{?}}
6968
</td>{{?}}
7069
</tr>
7170
{{~}}

Diff for: ‎static/style.css

+11-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
}
2121

2222
#server_list tbody tr:nth-child(even) {
23-
background-color: #EEE;
24-
}
25-
26-
#server_list tbody tr:hover {
27-
background-color: #CCC;
23+
background-color: #F1F1F1;
2824
}
2925

3026
.mts_hover_list {
@@ -41,13 +37,18 @@ td:hover .mts_hover_list {
4137
display: block;
4238
}
4339

44-
.mts_hover_list_text, .mts_tooltip {
45-
text-decoration: underline;
46-
text-decoration-style: dashed;
47-
}
48-
4940
.clickable {
5041
text-decoration: underline;
5142
cursor: pointer;
5243
}
5344

45+
.mts_tooltip {
46+
text-overflow: ellipsis;
47+
overflow: hidden;
48+
white-space: nowrap;
49+
}
50+
51+
.mts_cwidth {
52+
display: inline-block;
53+
text-align: center;
54+
}

0 commit comments

Comments
 (0)
Please sign in to comment.