commit a36f03bf8f17c0c7c2d7d87b08f50dab9894cd40
author Simon Hunt <simon@onlab.us> Wed Apr 01 15:22:49 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Apr 02 00:06:51 2015 +0000
tree 91dbc7cc26f7c5554819525a27de2e389bf36e23
parent 08d08d4a1d3813d010c84613e7ae1587f4a937c4

GUI -- Augmented the link details display.

Change-Id: Ic5fc65cffe5c61cb14251454c7f6d9baca263445

web/gui/src/main/webapp/app/view/topo/topoPanel.js

diff --git a/web/gui/src/main/webapp/app/view/topo/topoPanel.js b/web/gui/src/main/webapp/app/view/topo/topoPanel.js
index e5a4eef..2b3e760 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoPanel.js
@@ -52,7 +52,7 @@
         var tr = tbody.append('tr');
 
         function addCell(cls, txt) {
-            tr.append('td').attr('class', cls).text(txt);
+            tr.append('td').attr('class', cls).html(txt);
         }
         addCell('label', label + ' :');
         addCell('value', value);
@@ -132,6 +132,21 @@
             .on('click', cb);
     }
 
+    var friendlyIndex = {
+        device: 1,
+        host: 0
+    };
+
+    function friendly(d) {
+        var i = friendlyIndex[d.class] || 0;
+        return (d.labels && d.labels[i]) || '';
+    }
+
+    function linkSummary(d) {
+        var o = d && d.online ? 'online' : 'offline';
+        return d ? d.type + ' / ' + o : '-';
+    }
+
     function displayLink(data) {
         detailPanel.empty();
 
@@ -142,18 +157,32 @@
 
         gs.addGlyph(svg, 'ports', 40);
         title.text('Link');
+
+        var order = [
+            'Type', '-',
+            'A_type', 'A_id', 'A_label', 'A_port', '-',
+            'B_type', 'B_id', 'B_label', 'B_port', '-'
+        ];
+
         listProps(tbody, {
-            propOrder: [
-                'type', '-', 'src', 'srcPort', '-', 'tgt', 'tgtPort'
-            ],
+            propOrder: order,
             props: {
-                type: data.type(),
-                src: data.source.id,
-                srcPort: data.srcPort,
-                tgt: data.target.id,
-                tgtPort: data.tgtPort
+                Type: data.type(),
+
+                A_type: data.source.class,
+                A_id: data.source.id,
+                A_label: friendly(data.source),
+                A_port: data.srcPort,
+
+                B_type: data.target.class,
+                B_id: data.target.id,
+                B_label: friendly(data.target),
+                B_port: data.tgtPort
             }
         });
+
+        addProp(tbody, 'A → B', linkSummary(data.fromSource));
+        addProp(tbody, 'B → A', linkSummary(data.fromTarget));
     }
 
     function displayNothing() {