GUI -- "State" is now an icon on Link and Cluster node views. - Icon mapping has generic names to be reused between views - Fixed broken table unit tests - Other minor cleanup
Change-Id: I7136cba15ad4fd185095617d790940d55b9f968f
diff --git a/web/gui/src/main/webapp/app/fw/svg/icon.js b/web/gui/src/main/webapp/app/fw/svg/icon.js
index d5e2a38..e7e40f0 100644
--- a/web/gui/src/main/webapp/app/fw/svg/icon.js
+++ b/web/gui/src/main/webapp/app/fw/svg/icon.js
@@ -29,28 +29,27 @@
// Maps icon ID to the glyph ID it uses.
// NOTE: icon ID maps to a CSS class for styling that icon
var glyphMapping = {
- appActive: 'checkMark',
- appInactive: 'unknown',
- appPlus: 'plus',
- appMinus: 'minus',
- appPlay: 'play',
- appStop: 'stop',
+ active: 'checkMark',
+ inactive: 'xMark',
- deviceOnline: 'checkMark',
- deviceOffline: 'xMark',
+ plus: 'plus',
+ minus: 'minus',
+ play: 'play',
+ stop: 'stop',
+
+ upArrow: 'triangleUp',
+ downArrow: 'triangleDown',
+
+ appInactive: 'unknown',
+
devIcon_SWITCH: 'switch',
devIcon_ROADM: 'roadm',
hostIcon_endstation: 'endstation',
hostIcon_router: 'router',
- hostIcon_bgpSpeaker: 'bgpSpeaker',
-
- tableColSortAsc: 'triangleUp',
- tableColSortDesc: 'triangleDown'
+ hostIcon_bgpSpeaker: 'bgpSpeaker'
};
-
-
function ensureIconLibDefs() {
var body = d3.select('body'),
svg = body.select('svg#IconLibDefs'),
@@ -187,13 +186,13 @@
function createSortIcon() {
function sortAsc(div) {
div.style('display', 'inline-block');
- loadEmbeddedIcon(div, 'tableColSortAsc', 10);
+ loadEmbeddedIcon(div, 'upArrow', 10);
div.classed('tableColSort', true);
}
function sortDesc(div) {
div.style('display', 'inline-block');
- loadEmbeddedIcon(div, 'tableColSortDesc', 10);
+ loadEmbeddedIcon(div, 'downArrow', 10);
div.classed('tableColSort', true);
}