github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

style(container-details): review responsiveness for the join network section

pull/967/head
Anthony Lapenna 2017-06-29 16:04:49 +02:00
parent a161d25d48
commit 6609c2e928
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/container/container.html
View File

@ -294,14 +294,14 @@
<form class="form-horizontal"> <form class="form-horizontal">
<!-- network-input --> <!-- network-input -->
<div class="row"> <div class="row">
<label for="container_network" class="col-sm-3 col-lg-3 control-label text-left">Join a Network</label> <label for="container_network" class="col-sm-3 col-lg-2 control-label text-left">Join a Network</label>
<div class="col-sm-5 col-lg-5"> <div class="col-sm-5 col-lg-4">
<select class="form-control" ng-model="selectedNetwork" id="container_network"> <select class="form-control" ng-model="selectedNetwork" id="container_network">
<option selected disabled hidden value="">Select a network</option> <option selected disabled hidden value="">Select a network</option>
<option ng-repeat="net in availableNetworks" ng-value="net.Id">{{ net.Name }}</option> <option ng-repeat="net in availableNetworks" ng-value="net.Id">{{ net.Name }}</option>
</select> </select>
</div> </div>
<div class="col-sm-4 col-lg-4"> <div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" ng-disabled="!selectedNetwork" ng-click="containerJoinNetwork(container, selectedNetwork)">Join Network</button> <button type="button" class="btn btn-primary btn-sm" ng-disabled="!selectedNetwork" ng-click="containerJoinNetwork(container, selectedNetwork)">Join Network</button>
</div> </div>
</div> </div>

4
app/components/container/containerController.js
View File

@ -222,15 +222,13 @@ function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, Con
return network; return network;
} }
}); });
$scope.globalNetworkCount = networks.length;
networks.push({Name: 'bridge'}); networks.push({Name: 'bridge'});
networks.push({Name: 'host'}); networks.push({Name: 'host'});
networks.push({Name: 'none'}); networks.push({Name: 'none'});
} }
networks.push({Name: 'container'});
$scope.availableNetworks = networks; $scope.availableNetworks = networks;
if (!_.find(networks, {'Name': 'bridge'})) { if (!_.find(networks, {'Name': 'bridge'})) {
$scope.config.HostConfig.NetworkMode = 'nat'; networks.push({Name: 'nat'});
} }
}, function (e) { }, function (e) {
Notifications.error('Failure', e, 'Unable to retrieve networks'); Notifications.error('Failure', e, 'Unable to retrieve networks');