Committed by
Gerrit Code Review
Fix for ONOS-3678
Change-Id: I806f32c13df33f137d199618de0ad495833a5d0e
Showing
2 changed files
with
27 additions
and
4 deletions
... | @@ -13,6 +13,22 @@ | ... | @@ -13,6 +13,22 @@ |
13 | 13 | ||
14 | <div class="separator"></div> | 14 | <div class="separator"></div> |
15 | 15 | ||
16 | + <span ng-if="brief"> | ||
17 | + <div class="active" | ||
18 | + icon icon-id="plus" icon-size="42" | ||
19 | + tooltip tt-msg="detailTip" | ||
20 | + ng-click="briefToggle()"> </div> | ||
21 | + </span> | ||
22 | + | ||
23 | + <span ng-if="!brief"> | ||
24 | + <div class="active" | ||
25 | + icon icon-id="minus" icon-size="42" | ||
26 | + tooltip tt-msg="briefTip" | ||
27 | + ng-click="briefToggle()"> </div> | ||
28 | + </span> | ||
29 | + | ||
30 | + <div class="separator"></div> | ||
31 | + | ||
16 | <div class="active" | 32 | <div class="active" |
17 | icon icon-id="deviceTable" icon-size="42" | 33 | icon icon-id="deviceTable" icon-size="42" |
18 | tooltip tt-msg="deviceTip" | 34 | tooltip tt-msg="deviceTip" |
... | @@ -35,6 +51,7 @@ | ... | @@ -35,6 +51,7 @@ |
35 | icon icon-id="meterTable" icon-size="42" | 51 | icon icon-id="meterTable" icon-size="42" |
36 | tooltip tt-msg="meterTip" | 52 | tooltip tt-msg="meterTip" |
37 | ng-click="nav('meter')"></div> | 53 | ng-click="nav('meter')"></div> |
54 | + | ||
38 | </div> | 55 | </div> |
39 | </div> | 56 | </div> |
40 | 57 | ||
... | @@ -77,10 +94,10 @@ | ... | @@ -77,10 +94,10 @@ |
77 | <td class="right">{{flow.packets}}</td> | 94 | <td class="right">{{flow.packets}}</td> |
78 | <td class="right">{{flow.bytes}}</td> | 95 | <td class="right">{{flow.bytes}}</td> |
79 | </tr> | 96 | </tr> |
80 | - <tr row-id="{{flow.id}}"> | 97 | + <tr row-id="{{flow.id}}" ng-hide="brief"> |
81 | - <td class="selector" colspan="10">{{flow.selector}}</td> | 98 | + <td class="selector" colspan="10" >{{flow.selector}} </td> |
82 | </tr> | 99 | </tr> |
83 | - <tr row-id="{{flow.id}}" ng-repeat-end> | 100 | + <tr row-id="{{flow.id}}" ng-repeat-end ng-hide="brief"> |
84 | <td class="treatment" colspan="10">{{flow.treatment}}</td> | 101 | <td class="treatment" colspan="10">{{flow.treatment}}</td> |
85 | </tr> | 102 | </tr> |
86 | </table> | 103 | </table> | ... | ... |
... | @@ -41,7 +41,9 @@ | ... | @@ -41,7 +41,9 @@ |
41 | $scope.portTip = 'Show port view for this device'; | 41 | $scope.portTip = 'Show port view for this device'; |
42 | $scope.groupTip = 'Show group view for this device'; | 42 | $scope.groupTip = 'Show group view for this device'; |
43 | $scope.meterTip = 'Show meter view for selected device'; | 43 | $scope.meterTip = 'Show meter view for selected device'; |
44 | - | 44 | + $scope.briefTip = 'Switch to brief view'; |
45 | + $scope.detailTip = 'Switch to detailed view'; | ||
46 | + $scope.brief = true; | ||
45 | params = $location.search(); | 47 | params = $location.search(); |
46 | if (params.hasOwnProperty('devId')) { | 48 | if (params.hasOwnProperty('devId')) { |
47 | $scope.devId = params['devId']; | 49 | $scope.devId = params['devId']; |
... | @@ -59,6 +61,10 @@ | ... | @@ -59,6 +61,10 @@ |
59 | } | 61 | } |
60 | }; | 62 | }; |
61 | 63 | ||
64 | + $scope.briefToggle = function () { | ||
65 | + $scope.brief = !$scope.brief; | ||
66 | + }; | ||
67 | + | ||
62 | $log.log('OvFlowCtrl has been created'); | 68 | $log.log('OvFlowCtrl has been created'); |
63 | }]); | 69 | }]); |
64 | }()); | 70 | }()); | ... | ... |
-
Please register or login to post a comment