Committed by
Gerrit Code Review
Close the topo2 instance panel on navigation
topo and topo2 instance panel css seperated Change-Id: I4460471d424100f942cc6f19c964437b649d01b2
Showing
4 changed files
with
33 additions
and
21 deletions
| ... | @@ -56,80 +56,80 @@ | ... | @@ -56,80 +56,80 @@ |
| 56 | background-color: #cccccc; | 56 | background-color: #cccccc; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | -#topo-p-detail svg { | 59 | +#topo2-p-detail svg { |
| 60 | background: none; | 60 | background: none; |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | -#topo-p-detail .header svg .glyph { | 63 | +#topo2-p-detail .header svg .glyph { |
| 64 | fill: #c0242b; | 64 | fill: #c0242b; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | /* --- Topo Instance Panel --- */ | 68 | /* --- Topo Instance Panel --- */ |
| 69 | 69 | ||
| 70 | -#topo-p-instance svg rect { | 70 | +#topo2-p-instance svg rect { |
| 71 | stroke-width: 0; | 71 | stroke-width: 0; |
| 72 | fill: #fbfbfb; | 72 | fill: #fbfbfb; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | /* body of an instance */ | 75 | /* body of an instance */ |
| 76 | -#topo-p-instance .online svg rect { | 76 | +#topo2-p-instance .online svg rect { |
| 77 | opacity: 1; | 77 | opacity: 1; |
| 78 | fill: #fbfbfb; | 78 | fill: #fbfbfb; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | -#topo-p-instance svg .glyph { | 81 | +#topo2-p-instance svg .glyph { |
| 82 | fill: #fff; | 82 | fill: #fff; |
| 83 | } | 83 | } |
| 84 | -#topo-p-instance .online svg .glyph { | 84 | +#topo2-p-instance .online svg .glyph { |
| 85 | fill: #fff; | 85 | fill: #fff; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | 88 | ||
| 89 | /* offline */ | 89 | /* offline */ |
| 90 | -#topo-p-instance svg .badgeIcon { | 90 | +#topo2-p-instance svg .badgeIcon { |
| 91 | opacity: 0.4; | 91 | opacity: 0.4; |
| 92 | fill: #939598; | 92 | fill: #939598; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | /* online */ | 95 | /* online */ |
| 96 | -#topo-p-instance .online svg .badgeIcon { | 96 | +#topo2-p-instance .online svg .badgeIcon { |
| 97 | opacity: 1.0; | 97 | opacity: 1.0; |
| 98 | fill: #939598; | 98 | fill: #939598; |
| 99 | } | 99 | } |
| 100 | -#topo-p-instance .online svg .badgeIcon.bird { | 100 | +#topo2-p-instance .online svg .badgeIcon.bird { |
| 101 | fill: #ffffff; | 101 | fill: #ffffff; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | -#topo-p-instance svg .readyBadge { | 104 | +#topo2-p-instance svg .readyBadge { |
| 105 | visibility: hidden; | 105 | visibility: hidden; |
| 106 | } | 106 | } |
| 107 | -#topo-p-instance .ready svg .readyBadge { | 107 | +#topo2-p-instance .ready svg .readyBadge { |
| 108 | visibility: visible; | 108 | visibility: visible; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | -#topo-p-instance svg text { | 111 | +#topo2-p-instance svg text { |
| 112 | text-anchor: left; | 112 | text-anchor: left; |
| 113 | opacity: 0.5; | 113 | opacity: 0.5; |
| 114 | fill: #3c3a3a; | 114 | fill: #3c3a3a; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | -#topo-p-instance .online svg text { | 117 | +#topo2-p-instance .online svg text { |
| 118 | opacity: 1.0; | 118 | opacity: 1.0; |
| 119 | fill: #3c3a3a; | 119 | fill: #3c3a3a; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | -#topo-p-instance .onosInst.mastership { | 122 | +#topo2-p-instance .onosInst.mastership { |
| 123 | opacity: 0.3; | 123 | opacity: 0.3; |
| 124 | } | 124 | } |
| 125 | -#topo-p-instance .onosInst.mastership.affinity { | 125 | +#topo2-p-instance .onosInst.mastership.affinity { |
| 126 | opacity: 1.0; | 126 | opacity: 1.0; |
| 127 | } | 127 | } |
| 128 | -#topo-p-instance .onosInst.mastership.affinity svg rect { | 128 | +#topo2-p-instance .onosInst.mastership.affinity svg rect { |
| 129 | filter: url(#blue-glow); | 129 | filter: url(#blue-glow); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | -.firefox #topo-p-instance .onosInst.mastership.affinity svg rect { | 132 | +.firefox #topo2-p-instance .onosInst.mastership.affinity svg rect { |
| 133 | filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"blue-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#blue-glow"); | 133 | filter: url("data:image/svg+xml;utf8, <svg xmlns = \'http://www.w3.org/2000/svg\'><filter x=\"-50%\" y=\"-50%\" width=\"200%\" height=\"200%\" id=\"blue-glow\"><feColorMatrix type=\"matrix\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0 0 0 1 0 \"></feColorMatrix><feGaussianBlur stdDeviation=\"3\" result=\"coloredBlur\"></feGaussianBlur><feMerge><feMergeNode in=\"coloredBlur\"></feMergeNode><feMergeNode in=\"SourceGraphic\"></feMergeNode></feMerge></filter></svg>#blue-glow"); |
| 134 | } | 134 | } |
| 135 | 135 | ... | ... |
| ... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
| 63 | margin-right: 20px; | 63 | margin-right: 20px; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | -.floatpanel { | 66 | +#topo2-p-instance.floatpanel { |
| 67 | top: 104px; | 67 | top: 104px; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| ... | @@ -72,4 +72,4 @@ | ... | @@ -72,4 +72,4 @@ |
| 72 | #ov-topo2 svg .node { | 72 | #ov-topo2 svg .node { |
| 73 | cursor: pointer; | 73 | cursor: pointer; |
| 74 | fill-rule: evenodd; | 74 | fill-rule: evenodd; |
| 75 | -} | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 75 | +} | ... | ... |
| ... | @@ -152,6 +152,7 @@ | ... | @@ -152,6 +152,7 @@ |
| 152 | t2es.stop(); | 152 | t2es.stop(); |
| 153 | ks.unbindKeys(); | 153 | ks.unbindKeys(); |
| 154 | t2fs.destroy(); | 154 | t2fs.destroy(); |
| 155 | + t2is.destroy(); | ||
| 155 | }); | 156 | }); |
| 156 | 157 | ||
| 157 | // svg layer and initialization of components | 158 | // svg layer and initialization of components | ... | ... |
| ... | @@ -9,7 +9,7 @@ | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | ||
| 10 | // configuration | 10 | // configuration |
| 11 | var showLogicErrors = true, | 11 | var showLogicErrors = true, |
| 12 | - idIns = 'topo-p-instance', | 12 | + idIns = 'topo2-p-instance', |
| 13 | instOpts = { | 13 | instOpts = { |
| 14 | edge: 'left', | 14 | edge: 'left', |
| 15 | width: 20 | 15 | width: 20 |
| ... | @@ -238,6 +238,16 @@ | ... | @@ -238,6 +238,16 @@ |
| 238 | }); | 238 | }); |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | + function destroy() { | ||
| 242 | + ts.removeListener(updateInstances); | ||
| 243 | + | ||
| 244 | + ps.destroyPanel(idIns); | ||
| 245 | + oiBox = null; | ||
| 246 | + | ||
| 247 | + onosInstances = {}; | ||
| 248 | + onosOrder = []; | ||
| 249 | + } | ||
| 250 | + | ||
| 241 | angular.module('ovTopo2') | 251 | angular.module('ovTopo2') |
| 242 | .factory('Topo2InstanceService', | 252 | .factory('Topo2InstanceService', |
| 243 | ['$log', 'PanelService', 'SvgUtilService', 'GlyphService', | 253 | ['$log', 'PanelService', 'SvgUtilService', 'GlyphService', |
| ... | @@ -252,7 +262,8 @@ | ... | @@ -252,7 +262,8 @@ |
| 252 | 262 | ||
| 253 | return { | 263 | return { |
| 254 | initInst: initInst, | 264 | initInst: initInst, |
| 255 | - allInstances: allInstances | 265 | + allInstances: allInstances, |
| 266 | + destroy: destroy | ||
| 256 | }; | 267 | }; |
| 257 | }]); | 268 | }]); |
| 258 | 269 | ... | ... |
-
Please register or login to post a comment