1 files changed, 45 insertions, 10 deletions

diff --git a/web/js/nms.js b/web/js/nms.js
index e1d9283..0422f00 100644
--- a/web/js/nms.js
+++ b/web/js/nms.js
@@ -29,6 +29,7 @@ var nms = {
 	},
 
 	menuShowing:true,
+	oplogShowing:true,
 	get uptime() {
 		return (Date.now() - this._startTime)/1000;
 	},
@@ -60,6 +61,7 @@ var nms = {
 		'menuShowing',
 		'vertical',
 		'interval',
+		'oplogShowing',
 		'user'
 	],
 	keyBindings:{
@@ -75,12 +77,15 @@ var nms = {
 		'8':setMapModeFromN,
 		'9':setMapModeFromN,
 		'c':toggleConnect,
+		'H':moveTimeFromKey,
 		'h':moveTimeFromKey,
 		'j':moveTimeFromKey,
 		'k':moveTimeFromKey,
 		'l':moveTimeFromKey,
+		'L':moveTimeFromKey,
 		'p':moveTimeFromKey,
 		'r':moveTimeFromKey,
+		'o':toggleOplog,
 		'Escape':hideWindow,
 		'?':toggleHelp
 	},
@@ -134,7 +139,7 @@ function nmsTimer(handler, interval, name, description) {
 function byteCount(bytes,precision) {
 	if (precision ==undefined)
 		precision = 1;
-	var units = ['', 'K', 'M', 'G', 'T', 'P'];
+	var units = ['', 'K', 'M', 'G', 'T', 'P', 'E','Z'];
 	var i = 0;
 	while (bytes > 1024) {
 		bytes = bytes / 1024;
@@ -356,6 +361,7 @@ function getInitialConfig() {
 			} else {
 				nms._public = false;
 				document.body.classList.add("gondul-private");
+				nmsTemplate.getTemplates();
 			}
 		}
 	});
@@ -414,7 +420,7 @@ function detectHandler() {
 	var views = document.location.hash.slice(1);
 	var interval = nms.interval;
 	if (views == undefined || views == "")
-		views = "ping";
+		views = "health";
 	views = views.split(",");
 
 	if (views.length > 1) {
@@ -444,6 +450,11 @@ function setMenu()
 	var nav = document.getElementsByTagName("nav")[0];
 	nav.style.display = nms.menuShowing ? '' : 'none';
 }
+function setOplog()
+{
+	var nav = document.getElementById("oplog-parent-mini");
+	nav.style.display = nms.oplogShowing ? '' : 'none';
+}
 
 function toggleMenu()
 {
@@ -451,6 +462,12 @@ function toggleMenu()
 	setMenu();
 	saveSettings();
 }
+function toggleOplog()
+{
+	nms.oplogShowing = ! nms.oplogShowing;
+	setOplog();
+	saveSettings();
+}
 function hideWindow(e,key)
 {
 	nmsInfoBox.hide();
@@ -499,6 +516,9 @@ function setMapModeFromN(e,key)
 function moveTimeFromKey(e,key)
 {
 	switch(key) {
+		case 'H':
+			nmsTime.stepKey(-1440);
+			break;
 		case 'h':
 			nmsTime.stepKey(-60);
 			break;
@@ -511,6 +531,9 @@ function moveTimeFromKey(e,key)
 		case 'l':
 			nmsTime.stepKey(60);
 			break;
+		case 'L':
+			nmsTime.stepKey(1440);
+			break;
 		case 'p':
 			nmsTime.togglePause();
 			break;
@@ -616,6 +639,7 @@ function restoreSettings()
 		nms[v] = retrieve[v];
 	}
 	setMenu();
+	setOplog();
 }
 
 /*
@@ -642,14 +666,25 @@ function nmsUpdateNavbarGraph() {
  * 	do stuff with nmsData.snmp.snmp[sw].misc
  * }
  *
+ * New: setTree(root, array, default):
+ * same thing, but instead of just returing true/false, return the value found
+ * or the provided default.
  */
-function testTree(root, ar) {
-	if (ar == undefined || root == undefined)
-		return false;
-	for (var i in ar) {
-		root = root[ar[i]];
-		if (root == undefined)
-			return false;
+function setTree(root, ar, def) {
+	if (ar == undefined || root == undefined) {
+		return def;
+	} else {
+		for (var i in ar) {
+			root = root[ar[i]];
+			if (root == undefined)
+				return def;
+		}
 	}
-	return true;
+	return root;
 }
+function testTree(root, ar) {
+	var x = setTree(root,ar,false);
+	if (x != false)
+		return true;
+}
+