GUI -- Added user feedback "flash" message function.
- flash hover mode when H key pressed.
- additional cleanup.
Change-Id: I14dd47c41842c3f6cb68d2c9fbe3ee96ad23ae86
diff --git a/web/gui/src/main/webapp/topo2.js b/web/gui/src/main/webapp/topo2.js
index 58c1167..4013ade 100644
--- a/web/gui/src/main/webapp/topo2.js
+++ b/web/gui/src/main/webapp/topo2.js
@@ -233,7 +233,8 @@
// Key Callbacks
function testMe(view) {
- view.alert('Theme is ' + view.theme());
+ //view.alert('Theme is ' + view.theme());
+ //view.flash('This is some text');
}
function abortIfLive() {
@@ -325,7 +326,7 @@
if (hoverMode === hoverModes.length) {
hoverMode = 0;
}
- console.log('Hover Mode:' + hoverMode + ': ' + hoverModes[hoverMode]);
+ view.flash('Hover Mode: ' + hoverModes[hoverMode]);
}
function togglePorts(view) {
@@ -1504,8 +1505,8 @@
node.append('rect')
.attr({
- 'rx': 5,
- 'ry': 5
+ rx: 5,
+ ry: 5
});
node.append('text')
@@ -1513,12 +1514,8 @@
.attr('dy', '1.1em');
box = adjustRectToFitText(node);
-
- node.select('rect')
- .attr(box);
-
+ node.select('rect').attr(box);
addDeviceIcon(node, box, noLabel, iconGlyphUrl(d));
-
});
// TODO: better place for this configuration state
@@ -1930,9 +1927,9 @@
function populateMultiSelect() {
detailPane.empty();
- var title = detailPane.append("h2"),
- table = detailPane.append("table"),
- tbody = table.append("tbody");
+ var title = detailPane.append('h3'),
+ table = detailPane.append('table'),
+ tbody = table.append('tbody');
title.text('Selected Nodes');
@@ -1949,9 +1946,9 @@
var svg = detailPane.append('svg'),
iid = iconGlyphUrl(data);
- var title = detailPane.append("h2"),
- table = detailPane.append("table"),
- tbody = table.append("tbody");
+ var title = detailPane.append('h2'),
+ table = detailPane.append('table'),
+ tbody = table.append('tbody');
appendGlyph(svg, 0, 0, 40, iid);
title.text(data.id);
@@ -2063,9 +2060,7 @@
// TODO: toggle button (and other widgets in the masthead) should be provided
// by the framework; not generated by the view.
- var showInstances,
- doPanZoom,
- showTrafficOnHover;
+ var showInstances;
function addButtonBar(view) {
var bb = d3.select('#mast')