홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bri Prebilic Cole
bd0bc777 1 parent 585bed92

GUI -- Garbage can icon added to app view, fixed broken unit tests. 

Change-Id: I1efdf764b242cc020049d31d569e8956aed6719c
Inline Side-by-side
Showing 6 changed files with 22 additions and 6 deletions
...@@ -132,6 +132,18 @@ ...@@ -132,6 +132,18 @@
132 '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' + 132 '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' +
133 '-18L81.5,74.5z', 133 '-18L81.5,74.5z',
134 134
135 + garbage: 'M94.6,20.2c0,2.7-2.1,4.8-4.8,4.8H19.2c-2.7,0-4.8-2.1-' +
136 + '4.8-4.8s2.1-4.8,4.8-4.8h27.6c-0.8-0.7-1.4-1.7-1.4-2.9c0-2.1,1.7-' +
137 + '3.9,3.9-3.9h10.4c2.1,0,3.9,1.7,3.9,3.9c0,1.2-0.5,2.2-1.4,2.9h' +
138 + '27.6C92.5,15.4,94.6,17.6,94.6,20.2z M91,33.4v64.8c0,2-1.7,3.6-' +
139 + '3.8,3.6h-65c-2.1,0-3.8-1.6-3.8-3.6V33.4c0-2,1.7-3.6,3.8-3.6h65C' +
140 + '89.3,29.8,91,31.4,91,33.4z M31.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7' +
141 + 'c-1.5,0-2.7,1.7-2.7,3.8v55.9c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7' +
142 + '-1.7,2.7-3.8V37.7z M58.5,37.7c0-2.1-1.8-3.8-4-3.8h-1c-2.2,0-4,' +
143 + '1.7-4,3.8v55.9c0,2.1,1.8,3.8,4,3.8h1c2.2,0,4-1.7,4-3.8V37.7z M' +
144 + '83.5,37.7c0-2.1-1.2-3.8-2.7-3.8h-0.7c-1.5,0-2.7,1.7-2.7,3.8v55.9' +
145 + 'c0,2.1,1.2,3.8,2.7,3.8h0.7c1.5,0,2.7-1.7,2.7-3.8V37.7z',
146 +
135 // --- Navigation glyphs ------------------------------------ 147 // --- Navigation glyphs ------------------------------------
136 148
137 flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' + 149 flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' +
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
38 stop: 'stop', 38 stop: 'stop',
39 39
40 refresh: 'refresh', 40 refresh: 'refresh',
41 + garbage: 'garbage',
41 42
42 upArrow: 'triangleUp', 43 upArrow: 'triangleUp',
43 downArrow: 'triangleDown', 44 downArrow: 'triangleDown',
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <div id="app-install" icon icon-size="36" icon-id="plus" class="active"></div> 10 <div id="app-install" icon icon-size="36" icon-id="plus" class="active"></div>
11 <div id="app-activate" icon icon-size="36" icon-id="play"></div> 11 <div id="app-activate" icon icon-size="36" icon-id="play"></div>
12 <div id="app-deactivate" icon icon-size="36" icon-id="stop"></div> 12 <div id="app-deactivate" icon icon-size="36" icon-id="stop"></div>
13 - <div id="app-uninstall" icon icon-size="36" icon-id="minus"></div> 13 + <div id="app-uninstall" icon icon-size="36" icon-id="garbage"></div>
14 </div> 14 </div>
15 15
16 <form id="app-form" method="POST" action="rs/applications/upload" 16 <form id="app-form" method="POST" action="rs/applications/upload"
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 document.getElementById('app-form-response').onload = function () { 48 document.getElementById('app-form-response').onload = function () {
49 document.getElementById('app-form').reset(); 49 document.getElementById('app-form').reset();
50 $scope.refresh(); 50 $scope.refresh();
51 - } 51 + };
52 52
53 function appAction(action) { 53 function appAction(action) {
54 if (selection) { 54 if (selection) {
......
...@@ -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 = 41, 23 + var numBaseGlyphs = 42,
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',
...@@ -43,6 +43,7 @@ describe('factory: fw/svg/glyph.js', function() { ...@@ -43,6 +43,7 @@ describe('factory: fw/svg/glyph.js', function() {
43 lock: 'M79.4,48.6h', 43 lock: 'M79.4,48.6h',
44 topo: 'M97.2,76.3H86.6', 44 topo: 'M97.2,76.3H86.6',
45 refresh: 'M102.6,40.8L88.4', 45 refresh: 'M102.6,40.8L88.4',
46 + garbage: 'M94.6,20.2c',
46 47
47 // navigation specific glyphs 48 // navigation specific glyphs
48 flowTable: tablePrefix + 'M102.2,23.6H7.9v', 49 flowTable: tablePrefix + 'M102.2,23.6H7.9v',
...@@ -86,6 +87,7 @@ describe('factory: fw/svg/glyph.js', function() { ...@@ -86,6 +87,7 @@ describe('factory: fw/svg/glyph.js', function() {
86 glyphIds = [ 87 glyphIds = [
87 'unknown', 'node', 'switch', 'roadm', 'endstation', 'router', 88 'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
88 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh', 89 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
90 + 'garbage',
89 'flowTable', 'portTable', 'groupTable', 91 'flowTable', 'portTable', 'groupTable',
90 'summary', 'details', 'ports', 'map', 'cycleLabels', 92 'summary', 'details', 'ports', 'map', 'cycleLabels',
91 'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent', 93 'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 */ 19 */
20 20
21 describe('factory: fw/widget/tableBuilder.js', function () { 21 describe('factory: fw/widget/tableBuilder.js', function () {
22 - var $log, $rootScope, fs, tbs; 22 + var $log, $rootScope, fs, tbs, is;
23 23
24 var mockObj, 24 var mockObj,
25 mockWss = { 25 mockWss = {
...@@ -28,7 +28,7 @@ describe('factory: fw/widget/tableBuilder.js', function () { ...@@ -28,7 +28,7 @@ describe('factory: fw/widget/tableBuilder.js', function () {
28 unbindHandlers: function () {} 28 unbindHandlers: function () {}
29 }; 29 };
30 30
31 - beforeEach(module('onosWidget', 'onosUtil', 'onosRemote')); 31 + beforeEach(module('onosWidget', 'onosUtil', 'onosRemote', 'onosSvg'));
32 32
33 beforeEach(function () { 33 beforeEach(function () {
34 module(function ($provide) { 34 module(function ($provide) {
...@@ -37,11 +37,12 @@ describe('factory: fw/widget/tableBuilder.js', function () { ...@@ -37,11 +37,12 @@ describe('factory: fw/widget/tableBuilder.js', function () {
37 }); 37 });
38 38
39 beforeEach(inject(function (_$log_, _$rootScope_, 39 beforeEach(inject(function (_$log_, _$rootScope_,
40 - FnService, TableBuilderService) { 40 + FnService, TableBuilderService, IconService) {
41 $log = _$log_; 41 $log = _$log_;
42 $rootScope = _$rootScope_; 42 $rootScope = _$rootScope_;
43 fs = FnService; 43 fs = FnService;
44 tbs = TableBuilderService; 44 tbs = TableBuilderService;
45 + is = IconService;
45 })); 46 }));
46 47
47 function mockSelCb(event, sel) {} 48 function mockSelCb(event, sel) {}
......