Merge pull request #175 from mikeprimm/master

Add 'sidebaropened' option flat, to allow menu sidebar to be always opened

configuration.txt

@@ -95,6 +95,9 @@ updaterate: 2000
 
 showplayerfacesinmenu: true
 
+# Set sidebaropened: true to pin menu sidebar opened
+#sidebaropened: true
+
 joinmessage: "%playername% joined"
 quitmessage: "%playername% quit"
 spammessage: "You may only chat once every %interval% seconds."

src/main/java/org/dynmap/ClientConfigurationComponent.java

@@ -20,6 +20,7 @@ public class ClientConfigurationComponent extends Component {
                 s(t, "quitmessage", c.getString("quitmessage", "%playername% quit"));
                 s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds."));
                 s(t, "defaultzoom", c.getInteger("defaultzoom", 0));
+                s(t, "sidebaropened", c.getBoolean("sidebaropened", false));
                 
                 DynmapWorld defaultWorld = null;
                 for(DynmapWorld world : plugin.mapManager.getWorlds()) {

web/js/map.js

@@ -165,21 +165,35 @@ DynMap.prototype = {
 		*/
 
 		// Sidebar
-		var sidebar = me.sidebar = $('<div/>')
+        var panel;
+        var sidebar;
+        var pinbutton;
+        if(!me.options.sidebaropened) {
+            sidebar = me.sidebar = $('<div/>')
                 .addClass('sidebar')
                 .appendTo(container);
 		
-		var panel = $('<div/>')
+            panel = $('<div/>')
                 .addClass('panel')
                 .appendTo(sidebar);
 		
             // Pin button.
-		var pinbutton = $('<div/>')
+            pinbutton = $('<div/>')
                 .addClass('pin')
                 .click(function() {
                     sidebar.toggleClass('pinned');
                 })
                 .appendTo(panel);
+		}
+        else {
+            sidebar = me.sidebar = $('<div/>')
+                .addClass('sidebar pinned')
+                .appendTo(container);
+		
+            panel = $('<div/>')
+                .addClass('panel')
+                .appendTo(sidebar);
+        }
         
 		// Worlds
 		var worldlist;
@@ -275,10 +289,11 @@ DynMap.prototype = {
 			.append(link=$('<input type="text" />'))
 			.data('link', link)
 			.appendTo(container);*/
-		
+        if(!me.options.sidebaropened) {
             $('<div/>')
                 .addClass('hitbar')
                 .appendTo(panel);
+		}
         
 		var alertbox = me.alertbox = $('<div/>')
 			.addClass('alertbox')
@@ -378,15 +393,6 @@ DynMap.prototype = {
                     me.serverday = true;
                 else
                     me.serverday = false;
-                if(me.serverday != oldday) {
-                    var mtid = me.map.mapTypeId;
-                    if(me.map.mapTypes[mtid].nightandday) {
-                        me.map.setMapTypeId('none');
-                        window.setTimeout(function() {
-                            me.map.setMapTypeId(mtid);
-                        }, 1);
-                    }
-                }
                     
 				var newplayers = {};
 				$.each(update.players, function(index, playerUpdate) {
@@ -430,6 +436,16 @@ DynMap.prototype = {
 					//divs.filter(function(i){return parseInt(divs[i].attr('rel')) > timestamp+me.options.messagettl;}).remove();
 				});
 
+                if(me.serverday != oldday) {
+                    var mtid = me.map.mapTypeId;
+                    if(me.map.mapTypes[mtid].nightandday) {
+                        me.map.setMapTypeId('none');
+                        window.setTimeout(function() {
+                            me.map.setMapTypeId(mtid);
+                        }, 1);
+                    }
+                }
+				
 				$(me).trigger('worldupdated', [ update ]);
 				
 				me.lasttimestamp = update.timestamp;