Fix checkboxes with new angular version

pull/2/head
Michael Crosby 2014-01-07 09:18:38 -08:00
parent 172d32e276
commit aa1c15bcc0
5 changed files with 70 additions and 63 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
logs/* logs/*
!.gitkeep !.gitkeep
dockerui dockerui
*.esproj/*

View File

@ -7,6 +7,7 @@
margin: 0 auto; margin: 0 auto;
max-width: 1000px; max-width: 1000px;
} }
.container > hr { .container > hr {
margin: 60px 0; margin: 60px 0;
} }
@ -15,14 +16,17 @@
margin: 80px 0; margin: 80px 0;
text-align: center; text-align: center;
} }
.jumbotron h1 { .jumbotron h1 {
font-size: 100px; font-size: 100px;
line-height: 1; line-height: 1;
} }
.jumbotron .lead { .jumbotron .lead {
font-size: 24px; font-size: 24px;
line-height: 1.25; line-height: 1.25;
} }
.jumbotron .btn { .jumbotron .btn {
font-size: 21px; font-size: 21px;
padding: 14px 24px; padding: 14px 24px;
@ -31,6 +35,7 @@
.marketing { .marketing {
margin: 60px 0; margin: 60px 0;
} }
.marketing p + h4 { .marketing p + h4 {
margin-top: 28px; margin-top: 28px;
} }
@ -38,20 +43,24 @@
.navbar .navbar-inner { .navbar .navbar-inner {
padding: 0; padding: 0;
} }
.navbar .nav { .navbar .nav {
margin: 0; margin: 0;
} }
.navbar .nav li { .navbar .nav li {
display: table-cell; display: table-cell;
width: 1%; width: 1%;
float: none; float: none;
} }
.navbar .nav li a { .navbar .nav li a {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
border-left: 1px solid rgba(255,255,255,.75); border-left: 1px solid rgba(255,255,255,.75);
border-right: 1px solid rgba(0,0,0,.1); border-right: 1px solid rgba(0,0,0,.1);
} }
.navbar .nav li:first-child a { .navbar .nav li:first-child a {
border-left: 0; border-left: 0;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;

View File

@ -213,14 +213,15 @@ function ContainerController($scope, $routeParams, $location, Container, Message
// Controller for the list of containers // Controller for the list of containers
function ContainersController($scope, Container, Settings, Messages, ViewSpinner) { function ContainersController($scope, Container, Settings, Messages, ViewSpinner) {
$scope.displayAll = Settings.displayAll;
$scope.predicate = '-Created'; $scope.predicate = '-Created';
$scope.toggle = false; $scope.toggle = false;
$scope.displayAll = Settings.displayAll;
var update = function(data) { var update = function(data) {
ViewSpinner.spin(); ViewSpinner.spin();
Container.query(data, function(d) { Container.query(data, function(d) {
$scope.containers = d.map(function(item) { return new ContainerViewModel(item); }); $scope.containers = d.map(function(item) {
return new ContainerViewModel(item); });
ViewSpinner.stop(); ViewSpinner.stop();
}); });
}; };
@ -258,12 +259,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner
$scope.toggleGetAll = function() { $scope.toggleGetAll = function() {
Settings.displayAll = $scope.displayAll; Settings.displayAll = $scope.displayAll;
var data = {all: 0}; update({all: Settings.displayAll ? 1 : 0});
if ($scope.displayAll) {
data.all = 1;
}
update(data);
}; };
$scope.startAction = function() { $scope.startAction = function() {
@ -282,7 +278,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner
batch($scope.containers, Container.remove, "Removed"); batch($scope.containers, Container.remove, "Removed");
}; };
update({all: $scope.displayAll ? 1 : 0}); update({all: Settings.displayAll ? 1 : 0});
} }
// Controller for the list of images // Controller for the list of images

View File

@ -15,13 +15,14 @@
</ul> </ul>
<div class="pull-right"> <div class="pull-right">
<input type="checkbox" ng-model="displayAll" ng-click="toggleGetAll()"/> Display All <input type="checkbox" ng-model="displayAll"
ng-change="toggleGetAll()"/> Display All
</div> </div>
</div> </div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-model="toggle" ng-click="toggleSelectAll()" /> Action</th> <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
<th>Name</th> <th>Name</th>
<th>Image</th> <th>Image</th>
<th>Command</th> <th>Command</th>

View File

@ -14,7 +14,7 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-model="toggle" ng-click="toggleSelectAll()" /> Action</th> <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
<th>Id</th> <th>Id</th>
<th>Repository</th> <th>Repository</th>
<th>Created</th> <th>Created</th>