Skip to content

Commit 4a8a50a

Browse files
prollerproller
committedNov 4, 2013
Masterserver show privs and js autoload
·
5.11.00.4.8
1 parent 0fd29b7 commit 4a8a50a

File tree

7 files changed

+35
-19
lines changed

7 files changed

+35
-19
lines changed
 

‎src/serverlist.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ void sendAnnounce(std::string action, const std::vector<std::string> & clients_n
222222

223223
if(server["action"] == "start") {
224224
server["dedicated"] = g_settings->get("server_dedicated");
225+
server["privs"] = g_settings->get("default_privs");
225226
server["rollback"] = g_settings->getBool("enable_rollback_recording");
226227
server["liquid_finite"] = g_settings->getBool("liquid_finite");
227228
server["mapgen"] = g_settings->get("mg_name");

‎util/master/README.md

+10
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,18 @@ Then install doT.js and it's dependencies:
1717
$ cd doT
1818
$ npm install
1919

20+
Or by npm:
21+
$ npm install dot commander mkdirp
22+
2023
And finally compile the template:
2124
$ cd ~/minetest/util/master
2225
$ ~/code/doT/bin/dot-packer -s . -d .
26+
or
27+
$ ./node_modules/dot/bin/dot-packer -s . -d .
28+
2329

30+
Embending to any page
31+
----------------------
2432

33+
<script>var master = {root: 'http://servers.minetest.net/', limit:10, clients_min:1, no_flags:1, no_ping:1, no_uptime:1};</script>
34+
<script src="http://servers.minetest.net/list.js"></script>

‎util/master/index.html

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Minetest server list</title>
6-
<link rel="stylesheet" href="style.css" />
7-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
8-
<script src="servers.js"></script>
9-
<script src="list.js"></script>
106
</head>
117
<body>
128
<div id="server_list"></div>
139
</body>
1410
</html>
15-
11+
<script src="list.js"></script>

‎util/master/list.js

+16-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function addressString(server) {
3535
var str = '<span'
3636
if (shortStr.length > 25) {
3737
shortStr = shortStr.substr(0, 23) + "&hellip;";
38-
str += ' class="tooltip" title="' + addrStr + '"'
38+
str += ' class="mts_tooltip" title="' + addrStr + '"'
3939
}
4040
if (server.port != 30000)
4141
shortStr += ':' + server.port;
@@ -48,14 +48,14 @@ function tooltipString(str, maxLen) {
4848
var ret = '<span';
4949
if (shortStr.length > maxLen) {
5050
shortStr = shortStr.substr(0, maxLen - 2) + "&hellip;";
51-
ret += ' class="tooltip" title="' + str + '"';
51+
ret += ' class="mts_tooltip" title="' + str + '"';
5252
}
5353
return ret + '>' + shortStr + '</span>';
5454
}
5555

5656
function hoverList(name, list) {
5757
if (!list || list.length == 0) return '';
58-
var str = '<div class="hover_list">'
58+
var str = '<div class="mts_hover_list">'
5959
str += name + '(' + list.length + ')<br />';
6060
for (var i in list) {
6161
str += escapeHTML(list[i]) + '<br />';
@@ -72,9 +72,19 @@ function get() {
7272
jQuery.getJSON(master.url, draw);
7373
}
7474

75-
if (!master.no_refresh) {
76-
setInterval(get, 60 * 1000);
75+
function loaded(){
76+
if (!master.no_refresh) {
77+
setInterval(get, 60 * 1000);
78+
}
79+
get();
7780
}
7881

79-
get();
82+
// https://github.com/pyrsmk/toast
83+
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)};
8084

85+
toast('style.css', 'servers.js', function() {
86+
if (typeof(jQuery)!='undefined')
87+
loaded();
88+
else
89+
toast('//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', loaded);
90+
});

‎util/master/master.cgi

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ sub request (;$) {
241241
$param->{clients_top} = $old->{clients_top} if $old->{clients_top} > $param->{clients};
242242
$param->{clients_top} ||= $param->{clients} || 0;
243243
# params reported once on start, must be same as src/serverlist.cpp:~221 if(server["action"] == "start") { ...
244-
for (qw(dedicated rollback liquid_finite mapgen mods)) {
244+
for (qw(dedicated rollback liquid_finite mapgen mods privs)) {
245245
$param->{$_} ||= $old->{$_} if $old->{$_} and !($param->{action} ~~ 'start');
246246
}
247247
$param->{pop_n} = $old->{pop_n} + 1;

‎util/master/servers.jst

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
{{=addressString(server)}}
2525
</td>{{?}}
2626
{{? !master.no_clients}}
27-
<td class="clients{{? server.clients_list && server.clients_list.length > 0}} hover_list_text{{?}}">
27+
<td class="clients{{? server.clients_list && server.clients_list.length > 0}} mts_hover_list_text{{?}}">
2828
{{=server.clients}}/{{=server.clients_max}} {{=server.clients_top}}
2929
{{=hoverList("Clients", server.clients_list)}}
3030
</td>{{?}}
3131
{{? !master.no_version}}
32-
<td class="version{{? server.mods && server.mods.length > 0}} hover_list_text{{?}}">
32+
<td class="version{{? server.mods && server.mods.length > 0}} mts_hover_list_text{{?}}">
3333
{{=escapeHTML(server.version)}}, {{=escapeHTML(server.gameid)}},&nbsp;
3434
{{=escapeHTML(server.mapgen || '?')}}
3535
{{=hoverList("Mods", server.mods)}}
@@ -47,7 +47,7 @@
4747
{{=tooltipString(server.description, 50)}}
4848
</td>{{?}}
4949
{{? !master.no_flags}}
50-
<td class="flags">
50+
<td class="flags" {{? server.privs}}title="{{=escapeHTML(server.privs)}}"{{?}}>
5151
{{=server.creative ? 'Cre ' : ''}}
5252
{{=server.dedicated ? 'Ded ' : ''}}
5353
{{=server.damage ? 'Dmg ' : ''}}

‎util/master/style.css

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
border: 1px solid gray;
1212
}
1313

14-
.hover_list{
14+
.mts_hover_list{
1515
visibility: hidden;
1616
border: gray solid 1px;
1717
position: absolute;
@@ -20,12 +20,11 @@
2020
padding: 0.5em;
2121
}
2222

23-
td:hover .hover_list {
23+
td:hover .mts_hover_list {
2424
visibility: visible;
2525
}
2626

27-
.hover_list_text, .tooltip {
27+
.mts_hover_list_text, .mts_tooltip {
2828
text-decoration: underline;
2929
text-decoration-style: dashed;
3030
}
31-

0 commit comments

Comments
 (0)
Please sign in to comment.