From 50ea8601d588cbc5b2ab125c20510817c07f7b0a Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 2 Nov 2013 18:53:51 -0400 Subject: [PATCH] Use a doT.js template for the serverlist --- util/master/README.md | 24 +++++ util/master/index.html | 21 +++-- util/master/list.js | 194 +++++++++++++++------------------------- util/master/servers.jst | 68 ++++++++++++++ util/master/style.css | 43 +++++---- 5 files changed, 196 insertions(+), 154 deletions(-) create mode 100644 util/master/README.md create mode 100644 util/master/servers.jst diff --git a/util/master/README.md b/util/master/README.md new file mode 100644 index 000000000..4730dc269 --- /dev/null +++ b/util/master/README.md @@ -0,0 +1,24 @@ +Minetest server list +==================== + +Setting up the webpage +---------------------- +You will have to install node.js, doT.js and their dependencies to compile +the serverlist webpage template. + +First install node.js, eg: + # apt-get install nodejs + # pacman -S nodejs + # emerge nodejs + +Then install doT.js and it's dependencies: + $ cd ~/code + $ git clone https://github.com/olado/doT.git + $ cd doT + $ npm install + +And finally compile the template: + $ cd ~/minetest/util/master + $ ~/code/doT/bin/dot-packer -s . -d . + + diff --git a/util/master/index.html b/util/master/index.html index ad908fca8..339ebe565 100644 --- a/util/master/index.html +++ b/util/master/index.html @@ -1,12 +1,15 @@ - - - Minetest server list - - -
+ + + Minetest server list + + + + + + +
+ - - - + diff --git a/util/master/list.js b/util/master/list.js index 4e2104bc8..ee4568e24 100644 --- a/util/master/list.js +++ b/util/master/list.js @@ -1,132 +1,80 @@ -var master_root, output_to; var master; -if (!master) master = { - root: master_root, - output: output_to -}; - -function e(s) { - if (typeof s === "undefined") s = ''; - if (typeof s === "number") return s; - return s.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); //mc" +if (!master) { + master = { + url: "http://servers.minetest.net/list", + output: "#server_list" + }; } -function human_time(t, abs) { - var n = 's'; - if (!t || t < 0) t = 0; - var f = 0; - var s = parseInt(abs ? (t || 0) : (new Date().getTime() / 1000 - (t || 0))); - if (!s || s <= 0) s = 0; - if (s == 0) return 'now'; - if (s >= 60) { - s /= 60; - n = 'm'; - if (s >= 60) { - s /= 60; - n = 'h'; - f = 1; - if (s >= 24) { - s /= 24; - n = 'd'; - f = 1; - if (s >= 30) { - s /= 30; - n = 'M'; - f = 1; - if (s >= 12) { - s /= 12; - n = 'y'; - f = 1; - } - } - } - } - } - return ((f ? parseFloat(s).toFixed(1) : parseInt(s)) + n); +function humanTime(seconds) { + if (!seconds) return '?'; + var conv = { + y: 31536000, + d: 86400, + h: 3600, + m: 60 + } + for (var i in conv) { + if (seconds >= conv[i]) { + return (seconds / conv[i]).toFixed(1) + i; + } + } } -function success(r) { - if (!r || !r.list) return; - var h = ''; - if (!master.no_total && r.total && r.total_max) - h += '
Players: ' + r.total.clients + ('/' + r.total_max.clients) + ' servers: ' + r.total.servers + ('/' + r.total_max.servers) + '
'; - h += ''; - if (r.list.length) { - h += ''; - if (!master.no_address) h += ''; - if (!master.no_clients) h += ''; - if (!master.no_version) h += ''; - if (!master.no_name) h += ''; - if (!master.no_description) h += ''; - if (!master.no_flags) h += ''; - if (!master.no_uptime) h += ''; - if (!master.no_ping) h += ''; - h += ''; - } - var count = 0; - for (var i = 0; i < r.list.length; ++i) { - if (++count > master.limit && master.limit) break; - var s = r.list[i]; - if (!s) continue; - if (master.clients_min && s.clients < master.clients_min) continue; - if (/:/.test(s.address)) s.address = '[' + s.address + ']'; - h += ''; - if (!master.no_address) h += ''; - if (!master.no_clients) { - h += ''; - } - var mods = 0; - if (s.mods && jQuery.isArray(s.mods)) - mods = s.mods.length; - if (!master.no_version) { - h += ''; - } - if (!master.no_name) { - h += ''; - } - if (!master.no_description) h += ''; - if (!master.no_flags) { - h += ''; - } - if (!s.start || s.start < 0) s.start = 0; - if (!master.no_uptime) h += ''; - if (!master.no_ping) h += ''; - h += ''; - } - h += '
ip[:port]players/maxversion gameid mapgennamedescriptionflagsuptime ageping
' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + ''; - if (!master.no_clients_list && s.clients && s.clients_list) { - h += '
Players (' + e(s.clients) + '):
'; - for (var ii in s.clients_list) - h += e(s.clients_list[ii]) + '
'; - h += '
'; - } - h += e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + e(s.clients_top) : '') + '		' + e(s.version) + ' ' + e(s.gameid) + ' ' + e(s.mapgen); - if (!master.no_mods && mods) { - h += '
Mods (' + mods + '):
'; - for (var ii in s.mods) - h += e(s.mods[ii]) + '
'; - h += '
'; - } - h += '		'; - if (s.url) h += ''; - h += e(s.name || s.url); - if (s.url) h += ''; - h += '' + e(s.description) + '' + - (s.password ? 'Pwd ' : '') + - (s.creative ? 'Cre ' : '') + - (s.damage ? 'Dmg ' : '') + - (s.pvp ? 'Pvp ' : '') + - (s.dedicated ? 'Ded ' : '') + - (s.rollback ? 'Rol ' : '') + - (s.liquid_finite ? 'Liq ' : '') + - '' + (s.uptime ? human_time(s.uptime, 1) : s.start ? human_time(s.start) : '') + (s.game_time ? ' ' + human_time(s.game_time, 1) : '') + '' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + '
'; - if (master.clients_min || master.limit) - h += 'more...'; - jQuery(master.output || '#servers_table').html(h); +function escapeHTML(str) { + return str.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); } -function get(refresh) { - jQuery.getJSON((master.root || '') + 'list', success); - if (!refresh && !master.no_refresh) setTimeout(get, 60000); +function addressString(server) { + var isIPv6 = server.address.indexOf(":") != -1; + var addrStr = (isIPv6 ? '[' : '') + + escapeHTML(server.address) + + (isIPv6 ? ']' : ''); + var shortStr = addrStr; + addrStr += ':' + server.port; + var str = ' 25) { + shortStr = shortStr.substr(0, 23) + "…"; + str += ' class="tooltip" title="' + addrStr + '"' + } + if (server.port != 30000) + shortStr += ':' + server.port; + return str + '>' + shortStr + ''; } + +function tooltipString(str, maxLen) { + str = escapeHTML(str); + var shortStr = str; + var ret = ' maxLen) { + shortStr = shortStr.substr(0, maxLen - 2) + "…"; + ret += ' class="tooltip" title="' + str + '"'; + } + return ret + '>' + shortStr + ''; +} + +function hoverList(name, list) { + if (!list || list.length == 0) return ''; + var str = '
' + str += name + '(' + list.length + ')
'; + for (var i in list) { + str += escapeHTML(list[i]) + '
'; + } + return str + '
'; +} + +function draw(json) { + html = window.render.servers(json); + jQuery(master.output || '#server_list').html(html); +} + +function get() { + jQuery.getJSON(master.url, draw); +} + +if (!master.no_refresh) { + setInterval(get, 60 * 1000); +} + get(); + diff --git a/util/master/servers.jst b/util/master/servers.jst new file mode 100644 index 000000000..bbefe3062 --- /dev/null +++ b/util/master/servers.jst @@ -0,0 +1,68 @@ +{{? !master.no_total}} +
+ Players: {{=it.total.clients}}/{{=it.total_max.clients}}  + Servers: {{=it.total.servers}}/{{=it.total_max.servers}} +
+{{?}} + + + {{? !master.no_address}}{{?}} + {{? !master.no_clients}}{{?}} + {{? !master.no_version}}{{?}} + {{? !master.no_name}}{{?}} + {{? !master.no_description}}{{?}} + {{? !master.no_flags}}{{?}} + {{? !master.no_uptime}}{{?}} + {{? !master.no_ping}}{{?}} + + {{~it.list :server:index}} + {{ if (master.limit && index + 1 > master.limit) break;}} + + {{? !master.no_address}} + {{?}} + {{? !master.no_clients}} + {{?}} + {{? !master.no_version}} + {{?}} + {{? !master.no_name}} + {{?}} + {{? !master.no_description}} + {{?}} + {{? !master.no_flags}} + {{?}} + {{? !master.no_uptime}} + {{?}} + {{? !master.no_ping}} + {{?}} + + {{~}} +
IP[:Port]Players/MaxVersion, Gameid, MapGenNameDescriptionFlagsUptime, AgePing
+ {{=addressString(server)}} + + {{=server.clients}}/{{=server.clients_max}} {{=server.clients_top}} + {{=hoverList("Clients", server.clients_list)}} + + {{=escapeHTML(server.version)}}, {{=escapeHTML(server.gameid)}},  + {{=escapeHTML(server.mapgen || '?')}} + {{=hoverList("Mods", server.mods)}} + + {{? server.url}} + {{=tooltipString(server.name, 25)}} + {{??}} + {{=tooltipString(server.name, 25)}} + {{?}} + + {{=tooltipString(server.description, 50)}} + + {{=server.creative ? 'Cre ' : ''}} + {{=server.dedicated ? 'Ded ' : ''}} + {{=server.damage ? 'Dmg ' : ''}} + {{=server.liquid_finite ? 'Liq ' : ''}} + {{=server.pvp ? 'PvP ' : ''}} + {{=server.password ? 'Pwd ' : ''}} + {{=server.rollback ? 'Rol ' : ''}} + + {{=humanTime(server.uptime)}}, {{=humanTime(server.game_time)}} + + {{=Math.floor(server.ping * 1000)}} +
diff --git a/util/master/style.css b/util/master/style.css index cff041216..47d58029b 100644 --- a/util/master/style.css +++ b/util/master/style.css @@ -1,32 +1,31 @@ -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; +#server_list table { + max-width: 100%; + width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0; + font-size: small; } -td, th { - border: 1px solid gray; +#server_list td, #server_list th { + border: 1px solid gray; } -div#table table { - width: 100%; +.hover_list{ + visibility: hidden; + border: gray solid 1px; + position: absolute; + z-index: 100; + background-color: white; + padding: 0.5em; } -.mts_mods, .mts_clients_list { - visibility: hidden; - border:gray solid 1px; - position:absolute; - z-index:100; - background-color:white; - padding:.5em; +td:hover .hover_list { + visibility: visible; } -.mts_version:hover .mts_mods, .mts_clients:hover .mts_clients_list { - visibility: visible; +.hover_list_text, .tooltip { + text-decoration: underline; + text-decoration-style: dashed; } -.mts_version.mts_is_mods, .mts_clients.mts_is_clients { - text-decoration:underline; - text-decoration-style:dashed; -}