From e2c018a18d972679160220b6cf76fa1a337e0a08 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Mon, 21 Mar 2016 12:26:00 +0100 Subject: NMS: Fix distro --- include/nms/util.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/nms/util.pm b/include/nms/util.pm index 79598d7..d063bf2 100644 --- a/include/nms/util.pm +++ b/include/nms/util.pm @@ -114,7 +114,13 @@ sub guess_placement { $y = int(759 + 20.5 * $s); $xx = $x + 65; $yy = $y + 14; - + } elsif ($name =~ /^distro(\d)/) { + my $d = ($1); + $src = "distro"; + $x = 292 + $d * 165; + $y = 415; + $xx = $x + 130; + $yy = $y + 20; } else { # Fallback to have _some_ position $src = "random"; -- cgit v1.2.3 From de396b689bb2ad8241d19ddf8cb97197e7054bec Mon Sep 17 00:00:00 2001 From: Nicolai Tellefsen Date: Mon, 21 Mar 2016 14:15:29 +0100 Subject: NMS: Add click-toggle to switchInfo window --- web/nms.gathering.org/js/nms-info-box.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js index dc993a9..5f16ec2 100644 --- a/web/nms.gathering.org/js/nms-info-box.js +++ b/web/nms.gathering.org/js/nms-info-box.js @@ -22,6 +22,10 @@ var nmsInfoBox = nmsInfoBox || { * Shows a window from the _windowTypes list */ nmsInfoBox.showWindow = function (windowName,argument) { + if(windowName == "switchInfo" && argument != '' && argument == this._window.sw) { + nmsInfoBox.hide(); + return; + } nmsInfoBox.hide(); for(var win in this._windowTypes) { if(windowName == win) { -- cgit v1.2.3