Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged clock from svn trunk.

This commit is contained in:
FrozenCow 2010-12-27 12:24:03 +01:00
parent cbed5c3a01
commit 588e107dc8
5 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebServerRequest.java
View File

@ -71,7 +71,7 @@ public class WebServerRequest extends Thread {
sendHeader(out, 200, "text/plain", -1, System.currentTimeMillis());
StringBuilder sb = new StringBuilder();
sb.append(current + "\n");
sb.append(current + " " + etc.getServer().getRelativeTime() + "\n");
if (mgr.showPlayers) {
for(Player player : etc.getServer().getPlayerList()) {

BIN
web/clock_day.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 481 B

BIN
web/clock_night.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 490 B

21
web/map.js
View File

@ -569,6 +569,7 @@ function makeRequest(url, func, type, fail, post, contenttype)
var cavebtn;
var lstopen = true;
var oldplayerlst = '[Connecting]';
var servertime = 0;
function mapUpdate()
{
@ -579,9 +580,11 @@ function makeRequest(url, func, type, fail, post, contenttype)
var showSigns = document.getElementById('showSigns').checked;
var showHomes = document.getElementById('showHomes').checked;
var showSpawn = document.getElementById('showSpawn').checked;
lasttimestamp = rows[0];
var firstRow = rows[0].split(' ');
var lasttimestamp = firstRow[0];
servertime = firstRow[1];
delete rows[0];
var playerlst = ''
var playerlst = '';
var numwarps = 0;
var numsigns = 0;
var numhomes = 0;
@ -681,11 +684,25 @@ function makeRequest(url, func, type, fail, post, contenttype)
}
}
if (playerlst != '') playerlst += '<br>';
playerlst += '<img class="plicon" src="clock_' + (servertime > 12000 ? 'night' : 'day') + '.png"> <span id="servertime">...</span>';
if(playerlst != oldplayerlst) {
oldplayerlst = playerlst;
lst.innerHTML = playerlst;
}
var timelbl = document.getElementById('servertime');
var rem = 0;
if (servertime > 12000) {
rem = (24000 - servertime) / 20;
} else {
rem = (12000 - servertime) / 20;
}
var remMin = parseInt(rem / 60);
var remSec = parseInt(rem) - remMin * 60;
timelbl.innerHTML = remMin + (remSec < 10 ? ":0" : ":") + remSec;
for(var m in markers) {
if(!(m in loggedin)) {
markers[m].setMap(null);

3
web/style.css
View File

@ -74,3 +74,6 @@ a, a:visited {
background-color:#000;
border: 0px;
}
#servertime {
color: #dede90;
}