홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bri Prebilic Cole
1dc32e64 1 parent 0cd4de84

GUI -- Created new icon badges of up and down arrows for tables, and edited test… 

…s to account for new glyphs.

Change-Id: I609f45ad434b8a3f92ce605ba1a9056f9584b11f
Inline Side-by-side
Showing 3 changed files with 15 additions and 3 deletions
...@@ -130,7 +130,14 @@ ...@@ -130,7 +130,14 @@
130 "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" + 130 "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" +
131 "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" + 131 "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" +
132 "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" + 132 "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" +
133 - "C9.8,7.9,9.0,7.2,9.0,7.2z" 133 + "C9.8,7.9,9.0,7.2,9.0,7.2z",
134 +
135 + triangleUp: "M0.5,6.2c0,0,3.8-3.8,4.2-4.2C5,1.7,5.3,2,5.3,2l4.3," +
136 + "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",
137 +
138 + triangleDown: "M9.5,4.2c0,0-3.8,3.8-4.2,4.2c-0.3,0.3-0.5,0-0.5," +
139 + "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," +
140 + "9.5,4.2z"
134 }; 141 };
135 142
136 // ---------------------------------------------------------------------- 143 // ----------------------------------------------------------------------
......
...@@ -30,7 +30,10 @@ ...@@ -30,7 +30,10 @@
30 // note: icon id maps to a CSS class for styling that icon 30 // note: icon id maps to a CSS class for styling that icon
31 var glyphMapping = { 31 var glyphMapping = {
32 deviceOnline: 'checkMark', 32 deviceOnline: 'checkMark',
33 - deviceOffline: 'xMark' 33 + deviceOffline: 'xMark',
34 + tableColSortAsc: 'triangleUp',
35 + tableColSortDesc: 'triangleDown',
36 + tableColSortNone: '-'
34 }; 37 };
35 38
36 function ensureIconLibDefs() { 39 function ensureIconLibDefs() {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 describe('factory: fw/svg/glyph.js', function() { 20 describe('factory: fw/svg/glyph.js', function() {
21 var $log, fs, gs, d3Elem, svg; 21 var $log, fs, gs, d3Elem, svg;
22 22
23 - var numBaseGlyphs = 13, 23 + var numBaseGlyphs = 15,
24 vbBird = '352 224 113 112', 24 vbBird = '352 224 113 112',
25 vbGlyph = '0 0 110 110', 25 vbGlyph = '0 0 110 110',
26 vbBadge = '0 0 10 10', 26 vbBadge = '0 0 10 10',
...@@ -38,6 +38,8 @@ describe('factory: fw/svg/glyph.js', function() { ...@@ -38,6 +38,8 @@ describe('factory: fw/svg/glyph.js', function() {
38 uiAttached: 'M2,2.5a.5,.5', 38 uiAttached: 'M2,2.5a.5,.5',
39 checkMark: 'M2.6,4.5c0', 39 checkMark: 'M2.6,4.5c0',
40 xMark: 'M9.0,7.2C8.2', 40 xMark: 'M9.0,7.2C8.2',
41 + triangleUp: 'M0.5,6.2c0',
42 + triangleDown: 'M9.5,4.2c0',
41 43
42 // our test ones.. 44 // our test ones..
43 triangle: 'M.5,.2', 45 triangle: 'M.5,.2',
......