Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-03 04:45:21 +02:00
Code Issues Releases Activity

Merge branch 'master' into networks-volumes

Browse source
This commit is contained in:
Kevan Ahlquist 2016-01-10 19:34:03 -06:00
commit 00528edd7c
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/components/container/containerController.js
View file

@ -1,6 +1,6 @@
angular.module('container', [])
.controller('ContainerController', ['$scope', '$routeParams', '$location', 'Container', 'ContainerCommit', 'Messages', 'ViewSpinner',
function ($scope, $routeParams, $location, Container, ContainerCommit, Messages, ViewSpinner) {
.controller('ContainerController', ['$scope', '$routeParams', '$location', 'Container', 'ContainerCommit', 'Messages', 'ViewSpinner', '$timeout',
function ($scope, $routeParams, $location, Container, ContainerCommit, Messages, ViewSpinner, $timeout) {
$scope.changes = [];
$scope.edit = false;
@ -94,6 +94,7 @@ angular.module('container', [])
ViewSpinner.spin();
Container.remove({id: $routeParams.id}, function (d) {
update();
$location.path('/containers');
Messages.send("Container removed", $routeParams.id);
}, function (e) {
update();

2
app/components/dashboard/dashboard.html
View file

@ -7,7 +7,7 @@
<div class="jumbotron">
<h1>DockerUI</h1>
<p class="lead">The Linux container engine</p>
<p class="lead">The UI for Docker container engine</p>
<a class="btn btn-large btn-success" href="http://docker.io">Learn more.</a>
</div>
</div>

6
app/shared/services.js
View file

@ -228,6 +228,7 @@ angular.module('dockerui.services', ['ngResource'])
max = map[k];
}
}
var steps = Math.min(max, 10);
var dataset = {
fillColor: "rgba(151,187,205,0.5)",
strokeColor: "rgba(151,187,205,1)",
@ -240,10 +241,11 @@ angular.module('dockerui.services', ['ngResource'])
datasets: [dataset]
},
{
scaleStepWidth: 1,
scaleStepWidth: Math.ceil(max / steps),
pointDotRadius: 1,
scaleIntegersOnly: true,
scaleOverride: true,
scaleSteps: max
scaleSteps: steps
});
}
};