@@ -95,4 +102,5 @@
+
Index: /binary-improvements/webserver/js/inventory_dialog.js
===================================================================
--- /binary-improvements/webserver/js/inventory_dialog.js (revision 248)
+++ /binary-improvements/webserver/js/inventory_dialog.js (revision 249)
@@ -57,4 +57,5 @@
$( "#playerInventoryDialog" ).css("z-index", "1010").dialog({
+ dialogClass: "playerInventoryDialog",
modal: true,
width: BAG_COLS*(INV_ITEM_WIDTH+14) + 3*(INV_ITEM_WIDTH+14) + 20,
Index: /binary-improvements/webserver/js/leaflet.control.gametime.js
===================================================================
--- /binary-improvements/webserver/js/leaflet.control.gametime.js (revision 249)
+++ /binary-improvements/webserver/js/leaflet.control.gametime.js (revision 249)
@@ -0,0 +1,47 @@
+L.Control.GameTime = L.Control.extend({
+ options: {
+ position: 'bottomright'
+ },
+
+ onAdd: function (map) {
+ var name = 'control-gametime',
+ container = L.DomUtil.create('div', name + ' webmap-control');
+
+ container.innerHTML = "Loading ..."
+ L.DomEvent.on (container, 'mousemove', L.DomEvent.stopPropagation);
+
+ this._map = map;
+ this._div = container;
+
+ window.setTimeout($.proxy(this._updateGameTimeEvent, this), 0);
+
+ return container;
+ },
+
+ onRemove: function (map) {
+ },
+
+ _updateGameTimeEvent: function() {
+ var div = this._div;
+ $.getJSON( "../api/getstats")
+ .done(function(data) {
+ var time = "Day " + data.gametime.days + ", ";
+ if (data.gametime.hours < 10)
+ time += "0";
+ time += data.gametime.hours;
+ time += ":";
+ if (data.gametime.minutes < 10)
+ time += "0";
+ time += data.gametime.minutes;
+ div.innerHTML = time;
+ })
+ .fail(function(jqxhr, textStatus, error) {
+ console.log("Error fetching game stats");
+ })
+ .always(function() {
+ });
+ window.setTimeout($.proxy(this._updateGameTimeEvent, this), 2000);
+ }
+
+});
+
Index: /binary-improvements/webserver/js/leaflet.control.login.js
===================================================================
--- /binary-improvements/webserver/js/leaflet.control.login.js (revision 249)
+++ /binary-improvements/webserver/js/leaflet.control.login.js (revision 249)
@@ -0,0 +1,35 @@
+L.Control.Login = L.Control.extend({
+ options: {
+ position: 'bottomleft'
+ },
+
+ onAdd: function (map) {
+ var name = 'control-login',
+ container = L.DomUtil.create('div', name + ' leaflet-bar');
+
+ this._map = map;
+ this._div = container;
+
+ if (userdata.loggedin == true) {
+ container.innerHTML =
+ "Logged in as: " + userdata.username + "
\
+ Sign out";
+ } else {
+ container.innerHTML =
+ "Not logged in
\
+ \
+ ![](\"img/steamlogin.png\" "\\"Sign") ";
+ }
+
+
+ return container;
+ },
+
+ onRemove: function (map) {
+ },
+
+ _onMouseMove: function (e) {
+ this._div.innerHTML = FormatCoord(e.latlng);
+ }
+});
+
Index: /binary-improvements/webserver/js/leaflet.control.reloadtiles.js
===================================================================
--- /binary-improvements/webserver/js/leaflet.control.reloadtiles.js (revision 248)
+++ /binary-improvements/webserver/js/leaflet.control.reloadtiles.js (revision 249)
@@ -2,4 +2,8 @@
options: {
position: 'bottomleft',
+ autoreload_enable: true,
+ autoreload_minInterval: 30,
+ autoreload_interval: 120,
+ autoreload_defaultOn: false,
layers: []
},
@@ -9,12 +13,58 @@
container = L.DomUtil.create('div', name + ' webmap-control');
- L.DomEvent.on (container, 'mousemove', L.DomEvent.stopPropagation);
+ var stop = L.DomEvent.stopPropagation;
+ L.DomEvent
+ .on (container, 'mousemove', stop)
+ .on (container, 'click', stop)
+ .on (container, 'mousedown', stop)
+ .on (container, 'dblclick', stop);
this._map = map;
+
+ this._reloadbutton = $("")
+ .addClass (name+"-btn")
+ .text ("Reload tiles now")
+ .attr ("href", "#")
+ .attr ("title", "Reload tiles now")
+ .on ("click.action", null, this, this._reload);
+ $(container).append (this._reloadbutton);
- this._reloadbutton = this._createButton(
- "Reload tiles", "Reload tiles",
- name + "-btn", container, this._reload, this);
+ if (this.options.autoreload_enable) {
+ $(container).append ("
");
+
+ this._autocheck = $("")
+ .addClass (name + "-chk")
+ .attr ("type", "checkbox")
+ .attr ("name", "map_reloadtiles_autoreload")
+ .attr ("id", "map_reloadtiles_autoreload")
+ .attr ("value", "1")
+ .on ("change", null, this, this._selectreload);
+ if (this.options.autoreload_defaultOn) {
+ this._autocheck.attr ("checked", "checked");
+ this._timeout = window.setTimeout ($.proxy (this._reloadTilesEvent, this), this.options.autoreload_interval*1000);
+ }
+ $(container).append (this._autocheck);
+
+ var label1 = $(" |