diff options
| author | Magnus Kirø <magnuskiro@gmail.com> | 2016-03-21 16:26:54 +0100 |
|---|---|---|
| committer | Magnus Kirø <magnuskiro@gmail.com> | 2016-03-21 16:26:54 +0100 |
| commit | f6cdb328d98bfa5e66e0e4c4f1135e94889582e4 (patch) | |
| tree | 42bb7cda101e97c90d910e170c13d7f52fa9653f | |
| parent | 90632b710fa8798c0eeda1bb10ff25b328634e33 (diff) | |
| parent | be1d1a2ad44bc30993cfda339552b924f5018d72 (diff) | |
Merge branch 'master' of github.com:tech-server/tgmanage into dev
| -rw-r--r-- | include/nms/util.pm | 8 | ||||
| -rw-r--r-- | web/nms.gathering.org/js/nms-info-box.js | 4 |
2 files changed, 11 insertions, 1 deletions
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"; diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js index e93ab55..e0f9273 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) { |