GUI -- Created new icon badges of up and down arrows for tables, and edited tests to account for new glyphs.
Change-Id: I609f45ad434b8a3f92ce605ba1a9056f9584b11f
diff --git a/web/gui/src/main/webapp/app/fw/svg/glyph.js b/web/gui/src/main/webapp/app/fw/svg/glyph.js
index af0ae38..83c8fba 100644
--- a/web/gui/src/main/webapp/app/fw/svg/glyph.js
+++ b/web/gui/src/main/webapp/app/fw/svg/glyph.js
@@ -130,7 +130,14 @@
"S3.8,0.2,2.9,0.7C1.9,1.1,2.3,2.3,2.3,2.3c0.3,1.1,0.8,2.1,1.4,2.9" +
"C2.5,6.4,1.3,7.4,1.3,7.4S0.8,7.8,0.8,8.1C0.9,8.3,0.9,9.6,2.4,9.1" +
"C3.1,8.8,4.1,7.9,5.1,7.0c1.3,1.3,2.5,1.9,2.5,1.9s0.5,0.5,1.4-0.2" +
- "C9.8,7.9,9.0,7.2,9.0,7.2z"
+ "C9.8,7.9,9.0,7.2,9.0,7.2z",
+
+ triangleUp: "M0.5,6.2c0,0,3.8-3.8,4.2-4.2C5,1.7,5.3,2,5.3,2l4.3," +
+ "4.3c0,0,0.4,0.4-0.1,0.4c-1.7,0-8.2,0-8.8,0C0,6.6,0.5,6.2,0.5,6.2z",
+
+ triangleDown: "M9.5,4.2c0,0-3.8,3.8-4.2,4.2c-0.3,0.3-0.5,0-0.5," +
+ "0L0.5,4.2c0,0-0.4-0.4,0.1-0.4c1.7,0,8.2,0,8.8,0C10,3.8,9.5,4.2," +
+ "9.5,4.2z"
};
// ----------------------------------------------------------------------
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 3cb00bb..45e77ce 100644
--- a/web/gui/src/main/webapp/app/fw/svg/icon.js
+++ b/web/gui/src/main/webapp/app/fw/svg/icon.js
@@ -30,7 +30,10 @@
// note: icon id maps to a CSS class for styling that icon
var glyphMapping = {
deviceOnline: 'checkMark',
- deviceOffline: 'xMark'
+ deviceOffline: 'xMark',
+ tableColSortAsc: 'triangleUp',
+ tableColSortDesc: 'triangleDown',
+ tableColSortNone: '-'
};
function ensureIconLibDefs() {
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
index a7179e3..47b1326 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
@@ -20,7 +20,7 @@
describe('factory: fw/svg/glyph.js', function() {
var $log, fs, gs, d3Elem, svg;
- var numBaseGlyphs = 13,
+ var numBaseGlyphs = 15,
vbBird = '352 224 113 112',
vbGlyph = '0 0 110 110',
vbBadge = '0 0 10 10',
@@ -38,6 +38,8 @@
uiAttached: 'M2,2.5a.5,.5',
checkMark: 'M2.6,4.5c0',
xMark: 'M9.0,7.2C8.2',
+ triangleUp: 'M0.5,6.2c0',
+ triangleDown: 'M9.5,4.2c0',
// our test ones..
triangle: 'M.5,.2',