diff options
Diffstat (limited to 'vbd/gui/module/src/main/resources/vpp/views')
4 files changed, 42 insertions, 45 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 ab4d83dfb..91b9d0aa4 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,46 +1,56 @@ <div ng-controller="BridgeDomainsController"> - <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-y: 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['topology-id']}}">{{bd['topology-id']}}</md-option> + <div layout="row" style="height: 1000px; width: 100%"> + <div layout="column" style="height:100%; width:60%"> + <div ng-show="showOverlay" style="height: 100%; width: 100%"> + <h3>Overlay topology</h3> + <md-button class="md-raised" md-no-ink ng-click="toggleUnderlay()" style="width: 25%;" ng-disabled="!selectedBd['topology-id']">Show Underlay</md-button> + <div id="overlay-next-app" style="height: 50%; width: 100%"></div> + </div> + <div ng-show="!showOverlay" style="height: 100%; width: 100%"> + <h3>Underlay topology</h3> + <md-button class="md-raised" md-no-ink ng-click="toggleUnderlay()" style="width: 25%;" ng-disabled="!selectedBd['topology-id']">Show Overlay</md-button> + <div id="underlay-next-app" style="height: 50%; width: 100%"></div> + </div> + </div> + <div class="md-sidenav-left md-whiteframe-z2" style="height: 100%; width: 40%; background-color: #414042;"> + + <md-input-container style="margin-right: 5px;" layout="row"> + + <md-select ng-model='selectedBd' placeholder="Select BD" ng-change="bdChanged()" style="width: 100%;"> + <md-option ng-repeat="bd in bridgeDomainList" ng-value="bd">{{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 && 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-button class="md-raised" md-no-ink ng-click="removeBd()" style="width: 35%;" ng-if="selectedBd['topology-id'] && !selectedBd.node">Remove BD</md-button> + <!--<md-button class="md-raised" md-no-ink ng-click="reload()" style="width: 25%;">Reload</md-button>--> + + </md-input-container> - </md-input-container> - <table st-table="TableCtrl.displayedCollection" class="table" st-safe-src="TableCtrl.rowCollection"> + <div ng-controller="TableController as TableCtrl"> + <table st-table="interfaceDisplayList" class="table" st-safe-src="interfaceList"> <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="bridge-domain">Bridge Domain</th> + <th st-sort="assigned" class="interactive">Assigned</th> + <th st-sort="vppName" st-sort-default="true" class="interactive">Vpp</th> + <th st-sort="'tp-id'" class="interactive">Interface Name</th> + <th st-sort="vbdName" class="interactive">Bridge Domain</th> </tr> </thead> <tbody> - <tr ng-repeat="row in TableCtrl.displayedCollection | filter: filterRemoveVxlanIf"> + <tr ng-repeat="row in interfaceDisplayList | filter: filterRemoveVxlanIf"> <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> + <td>{{row['tp-id']}}</td> + <td>{{row.vbdName}}</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%;" ng-if="dataService.changedInterfaces.length">Deploy</md-button> - <!--</md-input-container>--> - </md-content> + </div> </div> </div> </div>
\ No newline at end of file diff --git a/vbd/gui/module/src/main/resources/vpp/views/index.tpl.html b/vbd/gui/module/src/main/resources/vpp/views/index.tpl.html index 72115cf7b..5e6d1094e 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/index.tpl.html +++ b/vbd/gui/module/src/main/resources/vpp/views/index.tpl.html @@ -8,24 +8,8 @@ </md-tab> <md-tab label="Bridge Domains" md-on-select="setMainView('bridgeDomains')"> <md-content class="md-padding"> - <section ng-if="mainView === 'bridgeDomains'" ng-include src="view_path+'bridge-domains.tpl.html'"></section> + <section ng-if="mainView === 'bridgeDomains'" ng-include src="view_path+'bridge-domains.tpl.html'" style="height:80%; overflow: hidden"></section> </md-content> </md-tab> </md-tabs> - - <!--<md-toolbar> - <div class="md-toolbar-tools float-left"> - <span flex></span> - <md-button ng-click="setMainView('inventory')">Inventory</md-button> - <span flex></span> - <md-button ng-click="setMainView('bridgeDomains')">Bridge Domains</md-button> - <span flex></span> - </div> - </md-toolbar> - - <div ng-view style="height: 100%"> - - - - </div>--> </div>
\ No newline at end of file diff --git a/vbd/gui/module/src/main/resources/vpp/views/inventory-detail.tpl.html b/vbd/gui/module/src/main/resources/vpp/views/inventory-detail.tpl.html index 9d08cf67d..a5a5dc5d7 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/inventory-detail.tpl.html +++ b/vbd/gui/module/src/main/resources/vpp/views/inventory-detail.tpl.html @@ -3,7 +3,7 @@ <!-- Topology --> <div class="md-whiteframe-z2" flex="60" layout-margin> <md-content layout-padding> - <h3>Topology</h3> + <h3>Vpp and Interfaces</h3> <div id="next-vpp-topo"></div> </md-content> </div> @@ -52,8 +52,8 @@ <th st-sort="name" class="interactive">Name</th> <th st-sort="oper-status" class="interactive" >Oper Status</th> <th st-sort="admin-status" class="interactive">Admin Status</th> - <th st-sort="v3po:vxlan.src" class="interactive">Source IP</th> - <th st-sort="v3po:vxlan.src" class="interactive">Destination IP</th> + <th st-sort="'v3po:vxlan.src'" class="interactive">Source IP</th> + <th st-sort="'v3po:vxlan.src'" class="interactive">Destination IP</th> </tr> </thead> <tbody> diff --git a/vbd/gui/module/src/main/resources/vpp/views/new-vpp-dialog.html b/vbd/gui/module/src/main/resources/vpp/views/new-vpp-dialog.html index bd502b31c..d8d2600f3 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/new-vpp-dialog.html +++ b/vbd/gui/module/src/main/resources/vpp/views/new-vpp-dialog.html @@ -58,9 +58,12 @@ <md-progress-linear md-mode="indeterminate" ng-show="NewVppDialogCtrl.waiting"></md-progress-linear> <md-dialog-actions layout="row"> <span flex></span> - <md-button ng-click="NewVppDialogCtrl.updateConfig();" style="margin-right:20px;" class="md-raised"> + <md-button ng-click="NewVppDialogCtrl.updateConfig();" style="margin-right:20px;" class="md-raised" type="submit"> <span>Mount</span> </md-button> + <md-button ng-click="NewVppDialogCtrl.close();" style="margin-right:20px;" class="md-raised" type="button"> + <span>Close</span> + </md-button> </md-dialog-actions> </form> </md-dialog>
\ No newline at end of file |