From: proller <proller@github.com>
Date: Fri, 12 Jul 2013 20:37:28 +0000 (+0400)
Subject: Better masterserver html
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=0a2de78da418c7cdeb1cf9b898d049100804fb29;p=zefram%2Fminetest%2Fminetest_engine.git

Better masterserver html
---

diff --git a/util/master/list.js b/util/master/list.js
index c414a92b..9e033b60 100644
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -49,8 +49,12 @@ function success(r) {
         h += '<tr class="mts_row">';
         h += '<td class="mts_address">' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + '</td>';
         h += '<td class="mts_clients">' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + s.clients_top : '') + '</td>';
-        h += '<td class="mts_version">' + e(s.version) + ' ' + e(s.gameid);
+        var mods;
         if (s.mods && jQuery.isArray(s.mods)) {
+            mods = 1;
+        }
+        h += '<td class="mts_version' + (mods ? ' mts_ismods' : '') + '">' + e(s.version) + ' ' + e(s.gameid);
+        if (mods) {
             h += '<div class="mts_mods">Mods:<br/>';
             for (m in s.mods) {
                 h += s.mods[m] + '<br/>';
diff --git a/util/master/master.cgi b/util/master/master.cgi
index e283fe3a..975fa94e 100755
--- a/util/master/master.cgi
+++ b/util/master/master.cgi
@@ -152,7 +152,6 @@ sub float {
     return ($_[0] < 8 and $_[0] - int($_[0]))
       ? sprintf('%.' . ($_[0] < 1 ? 3 : ($_[0] < 3 ? 2 : 1)) . 'f', $_[0])
       : int($_[0]);
-
 }
 
 sub mineping ($$) {
@@ -236,7 +235,7 @@ sub request (;$) {
             $param->{first} ||= $old->{first} || $old->{time} || $param->{time};
             $param->{clients_top} = $old->{clients_top} if $old->{clients_top} > $param->{clients};
             $param->{clients_top} ||= $param->{clients} || 0;
-            $param->{mods} ||= $old->{mods};
+            $param->{mods} ||= $old->{mods} unless $param->{action} ~~ 'start';
             delete $param->{action};
             $listk->{$param->{key}} = $param;
             #printlog Dumper $param;
diff --git a/util/master/style.css b/util/master/style.css
index a8379404..c92c56f6 100644
--- a/util/master/style.css
+++ b/util/master/style.css
@@ -13,6 +13,20 @@ div#table table {
   width: 100%;
 }
 
-.mts_mods {visibility: hidden; border:gray solid 1px; position:absolute; z-index:100; background-color:white; padding:.5em;}
-.mts_version:hover .mts_mods {visibility: visible;}
-.mts_version {text-decoration:underline; text-decoration-style:dashed;}
\ No newline at end of file
+.mts_mods {
+  visibility: hidden; 
+  border:gray solid 1px; 
+  position:absolute; 
+  z-index:100; 
+  background-color:white; 
+  padding:.5em;
+}
+
+.mts_version:hover .mts_mods {
+  visibility: visible;
+}
+
+.mts_version.mts_ismods {
+  text-decoration:underline; 
+  text-decoration-style:dashed;
+}