From 588e107dc886d16726de6318df2ea07fabda4571 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Mon, 27 Dec 2010 12:24:03 +0100
Subject: [PATCH] Merged clock from svn trunk.

---
 WebServerRequest.java |   2 +-
 web/clock_day.png     | Bin 0 -> 481 bytes
 web/clock_night.png   | Bin 0 -> 490 bytes
 web/map.js            |  21 +++++++++++++++++++--
 web/style.css         |   3 +++
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 web/clock_day.png
 create mode 100644 web/clock_night.png

diff --git a/WebServerRequest.java b/WebServerRequest.java
index 61ba8bad..13c71c66 100644
--- a/WebServerRequest.java
+++ b/WebServerRequest.java
@@ -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()) {
diff --git a/web/clock_day.png b/web/clock_day.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ea044b33174fe6098034006080c929c89c4646b
GIT binary patch
literal 481
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sCBfH0%q>A!YBLG}_)Usv{9Jc43M3~y~OegFzdmbgZgIOpf)
zrskC}I2WZRmZYXAlxLP?D7bt2281{Ai36>&@pN$vu{hm3*)Z#{fkf;4rs)Y@A6c!+
zUoA2;iL{w9DVl{zRc`hqpQSAh9%0VS>jgH5U)J>IST^~1o1Ww=?it%sI7MHnTn*Bh
zZ0^Zl>%YIwlZ9>PJ5~Mj*I(-gZS9+Jz@R4VPu>5OMkg*MGV(o}CnV5j)G^(;gKzr5
z>(jFt4&43Q{$<)@wW__+k)DUIFf+bRK9(eMbp0H2pWU-fW>j}9lGWH+nalcg)9K{c
zu)BGc|2U65y45wM;pvXf+hMQ&@9F1fX!w3)>OC{xsR7&#Ib6wx+cH;~_&DrZ9;3X}
z?0t#egWt+?7Awq1-2BsVnruhTqWAp*ESon!_;%5<_SBSHHCtz$64)#CaC<+WTE69`
zHx7RPn3kILFOvOM&F>kc!FYFF^Lq}in4dF`Fh}aF6REd2!|2ec&HP0{QC8#^Gk0q5
Viq1Fx)&m2Z!PC{xWt~$(697m1!M*?h

literal 0
HcmV?d00001

diff --git a/web/clock_night.png b/web/clock_night.png
new file mode 100644
index 0000000000000000000000000000000000000000..79b1af8c8cfaf6ce342eed1260050849635bea7c
GIT binary patch
literal 490
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sCBfH0%q>A!YBLG}_)Usv{9Jc42>99#GNa{&rTmbgZgIOpf)
zrskC}I2WZRmZYXAlxLP?D7bt2281{Ai36>2^>lFzu{hm3d4KjH2brVsO9H$!CdK|?
zx4I`MYgEFq^zJWlkM`F}99E*5OS|}-j6MFbDo%Se!?mmA)T=awf6NEPG(8TN?#h1m
zX|dgj0{zPQdt&x2U+6F`H1*}y_wTptdA?=Qg4f?v_g}5jVC^iB@QVPVy<wB}-mN}s
z^suDklH%eLjmkg~&k0_Evsb^aW;k&Bb@vnXlQM;Wm^l+7L!a%cH92eeFZi;|;m_9;
zT+)~F{+L}kSt;~XUYXVQjP3s3jOs6s{?2OM{XG9=HRFRr-&)Pz&gG0}__0joq|D`e
zzFZ%~gBD&=5L~p`?Xk?1vcevj^oFOOxE(iKKOz@!tMxHYAJ=SlW$RNdFLKPPg#@<p
zem~pXc)VY?DPeu;IVMG`&wEVGW_#<1ZDiSy%RFChNx{3sN6bc2SEt7BVr9^r!yVul
dlQrSBc-`)KyYto@`U(tn22WQ%mvv4FO#tdC$w>eJ

literal 0
HcmV?d00001

diff --git a/web/map.js b/web/map.js
index e843f232..446ad2ae 100644
--- a/web/map.js
+++ b/web/map.js
@@ -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);
diff --git a/web/style.css b/web/style.css
index 3d1fff04..5542b6de 100644
--- a/web/style.css
+++ b/web/style.css
@@ -74,3 +74,6 @@ a, a:visited {
 	background-color:#000;
 	border: 0px;
 }
+#servertime {
+	color: #dede90;
+}