diff options
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 | 14 | ||||
| -rw-r--r-- | vbd/gui/module/src/main/resources/vpp/views/inventory-table.tpl.html | 55 |
2 files changed, 33 insertions, 36 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 d92873afe..263fc0949 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,16 +1,14 @@ <div ng-controller="BridgeDomainsController"> - <md-progress-linear md-mode="indeterminate" ng-if="BridgeDomainsController.dataService.loading"></md-progress-linear> - <div layout="row" layout-xs="column" style="height:100%"> - <div id="bridge-domains-next-app" style="height: 100%; width: 50%" flex></div> - <div class="md-sidenav-left md-whiteframe-z2" style="background-color: white" flex> + <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> <md-content layout-padding ng-controller="TableController as TableCtrl"> <md-input-container style="margin-right: 5px;" layout="row"> - <md-select ng-model='BridgeDomainsController.selectedBd.name' placeholder="Select BD" ng-change="BridgeDomainsController.bdChanged()" style="width: 100%;"> - <md-option ng-repeat="bd in BridgeDomainsController.bridgedomains" value="{{bd.name}}">{{bd.name}}</md-option> + <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-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="BridgeDomainsController.removeBd()" style="width: 35%;" ng-if="BridgeDomainsController.dataService.injectedInterfaces.length===0 && BridgeDomainsController.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">Remove BD</md-button> </md-input-container> <table st-table="TableCtrl.displayedCollection" class="table table-striped" st-safe-src="TableCtrl.rowCollection"> @@ -35,7 +33,7 @@ </tbody> </table> <!--<md-input-container style="bottom: 10px">--> - <md-button class="md-raised" md-no-ink ng-click="BridgeDomainsController.deploy()" style="width: 94%;position: fixed;" ng-if="BridgeDomainsController.dataService.changedInterfaces.length">Deploy</md-button> + <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-input-container>--> </md-content> </div> diff --git a/vbd/gui/module/src/main/resources/vpp/views/inventory-table.tpl.html b/vbd/gui/module/src/main/resources/vpp/views/inventory-table.tpl.html index 4f15332de..3335ad395 100644 --- a/vbd/gui/module/src/main/resources/vpp/views/inventory-table.tpl.html +++ b/vbd/gui/module/src/main/resources/vpp/views/inventory-table.tpl.html @@ -1,32 +1,31 @@ <div ng-controller="InventoryTableController"> <md-button ng-click="addVppShowForm()">Mount VPP</md-button> <md-button ng-click="getVppList()">Reload VPPs</md-button> - <!--FIXME: decide which element to use, if static, or ui-grid--> - <!--<table class="footable"> - <thead> - <tr> - <th>VPP Name</th> - <th>IP Address</th> - <th>Port</th> - <th>Connection Status</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <tr ng-repeat="vpp in vppList"> - <td>{{vpp.name}}</td> - <td>{{vpp.ipAddress}}</td> - <td>{{vpp.port}}</td> - <td>{{vpp.status}}</td> - <td> - <md-button ng-click="viewTopology(vpp)">View Topology</md-button> - <md-button ng-click="editVppShowForm(vpp)" ng-hide="vpp.status === 'connected'">Edit</md-button> - <md-button ng-click="deleteVpp(vpp)" >Delete</md-button> - </td> - </tr> - </tbody> - </table>--> - <div ng-controller="InventoryTableDefinitonController" class="black"> - <div ui-grid="gridOptions" ui-grid-expandable class="grid"></div> - </div> + + <md-content layout-padding> + <table st-table="displayVppList" st-safe-src="vppList" class="table table-striped"> + <thead> + <tr> + <th st-sort="name">VPP Name</th> + <th st-sort="ipAddress">IP Address</th> + <th st-sort="port">Port</th> + <th st-sort="status">Connection Status</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="vpp in displayVppList"> + <td>{{vpp.name}}</td> + <td>{{vpp.ipAddress}}</td> + <td>{{vpp.port}}</td> + <td>{{vpp.status}}</td> + <td> + <md-button ng-click="viewTopology(vpp)">View Topology</md-button> + <md-button ng-click="editVppShowForm(vpp)" ng-hide="vpp.status === 'connected'">Edit</md-button> + <md-button ng-click="deleteVpp(vpp)" >Delete</md-button> + </td> + </tr> + </tbody> + </table> + </md-content> </div>
\ No newline at end of file |