Merge branch 'master' of github.com:tech-server/tgmanage

2 files changed, 19 insertions, 11 deletions

diff --git a/web/nms.gathering.org/index.html b/web/nms.gathering.org/index.html
index c919f2c..a10d1dc 100644
--- a/web/nms.gathering.org/index.html
+++ b/web/nms.gathering.org/index.html
@@ -26,16 +26,19 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
       <![endif]-->
       <style type="text/css">
-	canvas {
-	  -webkit-touch-callout: none;
-	  -webkit-user-select: none;
-	  -khtml-user-select: none;
-	  -moz-user-select: none;
-	  -ms-user-select: none;
-	  user-select: none;
-	  outline: none;
-	  -webkit-tap-highlight-color: rgba(255, 255, 255, 0); /* mobile webkit */
-	}   
+				canvas {
+					-webkit-touch-callout: none;
+					-webkit-user-select: none;
+					-khtml-user-select: none;
+					-moz-user-select: none;
+					-ms-user-select: none;
+					user-select: none;
+					outline: none;
+					-webkit-tap-highlight-color: rgba(255, 255, 255, 0); /* mobile webkit */
+				}
+				tr.mgmt_v4_addr {
+					font-weight: 700;
+				}
       </style>
   </head>
 
diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js
index 0b90d49..304a8d9 100644
--- a/web/nms.gathering.org/js/nms-info-box.js
+++ b/web/nms.gathering.org/js/nms-info-box.js
@@ -209,7 +209,7 @@ nmsInfoBox._windowTypes.switchInfo = {
 		}
 	},
   getTitle: function() {
-    return '<button type="button" class="edit btn btn-xs btn-warning" onclick="nmsInfoBox._windowTypes.switchInfo.showEdit(\'' + this.sw + '\');">Edit</button> <button type="button" class="comments btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showComments(\'' + this.sw + '\');">Comments</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'ports\');">Ports</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'misc\');">Misc</button> ' + this.sw + '';
+    return '<h4>' + this.sw + '</h4><button type="button" class="edit btn btn-xs btn-warning" onclick="nmsInfoBox._windowTypes.switchInfo.showEdit(\'' + this.sw + '\');">Edit</button> <button type="button" class="comments btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showComments(\'' + this.sw + '\');">Comments</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'ports\');">Ports</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'misc\');">Misc</button>';
   },
   getContent: function() {
     return this.content;
@@ -344,6 +344,10 @@ nmsInfoBox._windowTypes.switchInfo = {
       dataType: "text",
       data:myData,
       success: function (data, textStatus, jqXHR) {
+        var result = JSON.parse(data);
+        if(result.switches_updated.length > 0) { // FIXME unresolved variable switches_addded
+          nmsInfoBox.hide();
+        }
         nmsData.invalidate("switches");
         nmsData.invalidate("smanagement");
       }
@@ -383,6 +387,7 @@ nmsInfoBox._makeTable = function(content, caption) {
 	}
 	for (var v in content) { 
 		tr = table.insertRow(-1);
+		tr.className = content[v][0].toLowerCase();
 		td1 = tr.insertCell(0);
 		td2 = tr.insertCell(1);
 		td1.innerHTML = content[v][0];