diff options
author | Daniel Malachovsky <daniel.malachovsky@pantheon.sk> | 2016-02-08 19:05:54 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2016-02-08 21:55:02 +0000 |
commit | 37c09259c1958fe5ed7c28bc24f593577070bbcb (patch) | |
tree | 19789c34c78a241a94fc55246a0fd412ed5f307d /vbd/gui/module/src/main/resources/vpp/views | |
parent | 1fe1660a989f6018115331e6a6c4b096ef088c82 (diff) |
Initial commit of vBd Manager functions.
- Bug Fixes for graphical manipulation. Fix req'd for unassigning pre-assigned.
- Fixed Graphical issues, interface, vpp and vBD manipulation
- Added REST functionality, GUI enhancements and squashed a few bugs.
- reworked assigning and unassigning IF to vBD
Change-Id: Ice13835699455439f6ab49a18facb49f7a16b7ef
Signed-off-by: Varun Seereeram <vseereer@cisco.com>
Signed-off-by: Daniel Malachovsky <daniel.malachovsky@pantheon.sk>
Diffstat (limited to 'vbd/gui/module/src/main/resources/vpp/views')
-rw-r--r-- | vbd/gui/module/src/main/resources/vpp/views/bridge-domains.tpl.html | 35 | ||||
-rw-r--r-- | vbd/gui/module/src/main/resources/vpp/views/new-bd-dialog.html | 2 |
2 files changed, 21 insertions, 16 deletions
diff --git a/vbd/gui/module/src/main/resources/vpp/views/bridge-domains.tpl.html b/vbd/gui/module/src/main/resources/vpp/views/bridge-domains.tpl.html index 263fc0949..806097346 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/bridge-domains.tpl.html +++ b/vbd/gui/module/src/main/resources/vpp/views/bridge-domains.tpl.html @@ -1,39 +1,44 @@ <div ng-controller="BridgeDomainsController"> - <div layout="row" layout-xs="column" style="height:100%"> - <div id="bridge-domains-next-app" style="height: 550px; width: 50%" flex></div> - <div class="md-sidenav-left md-whiteframe-z2" style="height: 550px" flex> + <div layout="row" layout-xs="column" style="height: 550px; width: 100%"> + <div id="bridge-domains-next-app" style="height: 550px; width: 60%"></div> + <div class="md-sidenav-left md-whiteframe-z2" style="height: 550px; background-color: #414042; overflow: scroll" flex> <md-content layout-padding ng-controller="TableController as TableCtrl"> <md-input-container style="margin-right: 5px;" layout="row"> <md-select ng-model='selectedBd.name' placeholder="Select BD" ng-change="bdChanged()" style="width: 100%;"> - <md-option ng-repeat="bd in bridgedomains" value="{{bd.name}}">{{bd.name}}</md-option> + <md-option ng-repeat="bd in bridgedomains" value="{{bd['topology-id']}}">{{bd['topology-id']}}</md-option> </md-select> <md-button class="md-raised" md-no-ink ng-click="addBd()" style="width: 25%;">Add BD</md-button> - <md-button class="md-raised" md-no-ink ng-click="removeBd()" style="width: 35%;" ng-if="dataService.injectedInterfaces.length===0 && dataService.selectedBd.name">Remove BD</md-button> + <md-button class="md-raised" md-no-ink ng-click="removeBd()" style="width: 35%;" ng-if="dataService.injectedInterfaces.length===0 && dataService.selectedBd.name && dataService.changedInterfaces.length===0">Remove BD</md-button> + <md-button class="md-raised" md-no-ink ng-click="reload()" style="width: 25%;">Reload</md-button> </md-input-container> - <table st-table="TableCtrl.displayedCollection" class="table table-striped" st-safe-src="TableCtrl.rowCollection"> + <table st-table="TableCtrl.displayedCollection" class="table" st-safe-src="TableCtrl.rowCollection"> <thead> <tr> <th>Assigned</th> + <th st-sort="vppName" st-sort-default="true">Vpp</th> <th st-sort="name" st-sort-default="true">Interface Name</th> - <th st-sort="description">Description</th> + <!--<th st-sort="description">Description</th>--> <th st-sort="bridge-domain">Bridge Domain</th> </tr> </thead> <tbody> <tr ng-repeat="row in TableCtrl.displayedCollection"> - <td> - <md-switch ng-model="row.assigned" aria-label="Assign Switch" ng-change="TableCtrl.updateAssignment(row);"> - </md-switch> - </td> - <td>{{row.label}}</td> - <td>{{row.description}}</td> - <td>{{row['v3po:l2']['bridge-domain']}}</td> + <div ng-hide="row.hidden"> + <td> + <md-switch ng-model="row.assigned" aria-label="Assign Switch" ng-change="TableCtrl.updateAssignment(row);"> + </md-switch> + </td> + <td>{{row.vppName}}</td> + <td>{{row.name}}</td> + <!--<td>{{row.description}}</td>--> + <td>{{row.vbd}}</td> + </div> </tr> </tbody> </table> <!--<md-input-container style="bottom: 10px">--> - <md-button class="md-raised" md-no-ink ng-click="deploy()" style="width: 94%;position: fixed;" ng-if="dataService.changedInterfaces.length">Deploy</md-button> + <md-button class="md-raised" md-no-ink ng-click="deploy()" style="width: 94%;" ng-if="dataService.changedInterfaces.length">Deploy</md-button> <!--</md-input-container>--> </md-content> </div> diff --git a/vbd/gui/module/src/main/resources/vpp/views/new-bd-dialog.html b/vbd/gui/module/src/main/resources/vpp/views/new-bd-dialog.html index fd04f8e84..41e6ad8a4 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/new-bd-dialog.html +++ b/vbd/gui/module/src/main/resources/vpp/views/new-bd-dialog.html @@ -7,7 +7,7 @@ </h2> <span flex></span> <md-button class="md-icon-button" ng-click="NewBdDialogCtrl.close()" aria-label="close button"> - <div class="glyphicon glyphicon-remove"></div> + <div>X</div> </md-button> </div> </md-toolbar> |