nms: Make NMS great again

Or: Move nms2 to root

24 files changed, 10 insertions, 5 deletions

diff --git a/web/nms.gathering.org/nms2/css/bootstrap-theme.css b/web/nms.gathering.org/css/bootstrap-theme.css
index b0fdfcb..b0fdfcb 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap-theme.css
+++ b/web/nms.gathering.org/css/bootstrap-theme.css
diff --git a/web/nms.gathering.org/nms2/css/bootstrap-theme.css.map b/web/nms.gathering.org/css/bootstrap-theme.css.map
index 5a12d63..5a12d63 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap-theme.css.map
+++ b/web/nms.gathering.org/css/bootstrap-theme.css.map
diff --git a/web/nms.gathering.org/nms2/css/bootstrap-theme.min.css b/web/nms.gathering.org/css/bootstrap-theme.min.css
index cefa3d1..cefa3d1 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap-theme.min.css
+++ b/web/nms.gathering.org/css/bootstrap-theme.min.css
diff --git a/web/nms.gathering.org/nms2/css/bootstrap.css b/web/nms.gathering.org/css/bootstrap.css
index fb15e3d..fb15e3d 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap.css
+++ b/web/nms.gathering.org/css/bootstrap.css
diff --git a/web/nms.gathering.org/nms2/css/bootstrap.css.map b/web/nms.gathering.org/css/bootstrap.css.map
index 2fd84f3..2fd84f3 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap.css.map
+++ b/web/nms.gathering.org/css/bootstrap.css.map
diff --git a/web/nms.gathering.org/nms2/css/bootstrap.min.css b/web/nms.gathering.org/css/bootstrap.min.css
index cd1c616..cd1c616 100644
--- a/web/nms.gathering.org/nms2/css/bootstrap.min.css
+++ b/web/nms.gathering.org/css/bootstrap.min.css
diff --git a/web/nms.gathering.org/nms2/css/navbar-static-top.css b/web/nms.gathering.org/css/navbar-static-top.css
index bf6b28e..bf6b28e 100644
--- a/web/nms.gathering.org/nms2/css/navbar-static-top.css
+++ b/web/nms.gathering.org/css/navbar-static-top.css
diff --git a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.eot b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.eot
index b93a495..b93a495 100644
--- a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.eot
+++ b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.eot
diff --git a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.svg b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.svg
index 94fb549..94fb549 100644
--- a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.svg
+++ b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.svg
diff --git a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.ttf b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.ttf
index 1413fc6..1413fc6 100644
--- a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.ttf
+++ b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.ttf
diff --git a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.woff b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.woff
index 9e61285..9e61285 100644
--- a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.woff
+++ b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.woff
diff --git a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.woff2 b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.woff2
index 64539b5..64539b5 100644
--- a/web/nms.gathering.org/nms2/fonts/glyphicons-halflings-regular.woff2
+++ b/web/nms.gathering.org/fonts/glyphicons-halflings-regular.woff2
diff --git a/web/nms.gathering.org/nms2/index.html b/web/nms.gathering.org/index.html
index 111dd52..111dd52 100644
--- a/web/nms.gathering.org/nms2/index.html
+++ b/web/nms.gathering.org/index.html
diff --git a/web/nms.gathering.org/nms2/js/bootstrap.js b/web/nms.gathering.org/js/bootstrap.js
index 1c88b71..1c88b71 100644
--- a/web/nms.gathering.org/nms2/js/bootstrap.js
+++ b/web/nms.gathering.org/js/bootstrap.js
diff --git a/web/nms.gathering.org/nms2/js/bootstrap.min.js b/web/nms.gathering.org/js/bootstrap.min.js
index c8f82e5..c8f82e5 100644
--- a/web/nms.gathering.org/nms2/js/bootstrap.min.js
+++ b/web/nms.gathering.org/js/bootstrap.min.js
diff --git a/web/nms.gathering.org/nms2/js/jquery.min.js b/web/nms.gathering.org/js/jquery.min.js
index e6a051d..e6a051d 100644
--- a/web/nms.gathering.org/nms2/js/jquery.min.js
+++ b/web/nms.gathering.org/js/jquery.min.js
diff --git a/web/nms.gathering.org/nms2/js/nms-color-util.js b/web/nms.gathering.org/js/nms-color-util.js
index 72d6f61..72d6f61 100644
--- a/web/nms.gathering.org/nms2/js/nms-color-util.js
+++ b/web/nms.gathering.org/js/nms-color-util.js
diff --git a/web/nms.gathering.org/nms2/js/nms-map-handlers.js b/web/nms.gathering.org/js/nms-map-handlers.js
index ddb50a1..ddb50a1 100644
--- a/web/nms.gathering.org/nms2/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/js/nms-map-handlers.js
diff --git a/web/nms.gathering.org/nms2/js/nms.js b/web/nms.gathering.org/js/nms.js
index 27e4684..90532e6 100644
--- a/web/nms.gathering.org/nms2/js/nms.js
+++ b/web/nms.gathering.org/js/nms.js
@@ -725,7 +725,7 @@ function updatePing()
 	nms.outstandingAjaxRequests++;
 	$.ajax({
 		type: "GET",
-		url: "/ping-json2.pl" + now,
+		url: "/ping.pl" + now,
 		dataType: "text",
 		success: function (data, textStatus, jqXHR) {
 			nms.ping_data = JSON.parse(data);
@@ -791,7 +791,7 @@ function addComment(sw,comment)
 	};
 	$.ajax({
 		type: "POST",
-		url: "/switch-comment.pl",
+		url: "/comment-add.pl",
 		dataType: "text",
 		data:myData,
 		success: function (data, textStatus, jqXHR) {
@@ -839,12 +839,12 @@ function updatePorts()
 	});
 	now="";
 	if (nms.now != false)
-		now = "&now=" + nms.now;
+		now = "?now=" + nms.now;
 	nms.outstandingAjaxRequests++;
 	updateAjaxInfo();
 	$.ajax({
 		type: "GET",
-		url: "/port-state.pl?time=5m" + now,
+		url: "/port-state.pl" + now,
 		dataType: "text",
 		success: function (data, textStatus, jqXHR) {
 			var  switchdata = JSON.parse(data);
@@ -1688,7 +1688,12 @@ function saveSettings()
 
 function restoreSettings()
 {
-	var retrieve = JSON.parse(atob(getCookie("nms")));
+	try {
+		var retrieve = JSON.parse(atob(getCookie("nms")));
+	} catch(e) { 
+		console.log("nothing saved");
+	}
+
 	for (var v in retrieve) {
 		nms[v] = retrieve[v];
 	}
diff --git a/web/nms.gathering.org/nms2/js/npm.js b/web/nms.gathering.org/js/npm.js
index bf6aa80..bf6aa80 100644
--- a/web/nms.gathering.org/nms2/js/npm.js
+++ b/web/nms.gathering.org/js/npm.js
diff --git a/web/nms.gathering.org/nms2/img/tg15-salkart-clean-big.png b/web/nms.gathering.org/nms2/img/tg15-salkart-clean-big.png
deleted file mode 100644
index 8d647a3..0000000
--- a/web/nms.gathering.org/nms2/img/tg15-salkart-clean-big.png
+++ /dev/null
diff --git a/web/nms.gathering.org/nms2/img/tg15-salkart-full.png b/web/nms.gathering.org/nms2/img/tg15-salkart-full.png
deleted file mode 100644
index 9e22d40..0000000
--- a/web/nms.gathering.org/nms2/img/tg15-salkart-full.png
+++ /dev/null
diff --git a/web/nms.gathering.org/nms2/img/tg15-salkart.png b/web/nms.gathering.org/nms2/img/tg15-salkart.png
deleted file mode 100644
index dce49b5..0000000
--- a/web/nms.gathering.org/nms2/img/tg15-salkart.png
+++ /dev/null
diff --git a/web/nms.gathering.org/ping-json2.pl b/web/nms.gathering.org/ping.pl
index 2ffe650..2ffe650 100755
--- a/web/nms.gathering.org/ping-json2.pl
+++ b/web/nms.gathering.org/ping.pl